CacheUtils.getInstance().put("levellabel", levellabel);
239
            MainApplication.level_one = JsonUtils.getKeyResult(levellabel, "1");
240
            MainApplication.level_two = JsonUtils.getKeyResult(levellabel, "2");
241
            MainApplication.level_three = JsonUtils.getKeyResult(levellabel, "3");
242
            MainApplication.level_four = JsonUtils.getKeyResult(levellabel, "4");
243
            MainApplication.level_five = JsonUtils.getKeyResult(levellabel, "5");
244
        }
245
234 246
        if (MainApplication.huodonglabel.equals("")) {
235 247
            tv_huodong.setVisibility(View.GONE);
236 248
        }

+ 2 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@ -77,8 +77,8 @@ public class MainApplication extends MultiDexApplication {
77 77
    public static String firstPoint = "";
78 78
    public static Boolean firstSsyd;
79 79
    public static String password = "";
80
    public static String url = "http://59.110.68.162";// 充电桩测试环境
81
//        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
80
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
81
        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
82 82
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
83 83
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
84 84
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";

+ 3 - 0
app/src/main/java/com/electric/chargingpile/view/HongBaoDialog.java

@ -83,4 +83,7 @@ public class HongBaoDialog {
83 83
        dialog.show();
84 84
    }
85 85
86
    public void dismiss() {
87
        dialog.dismiss();
88
    }
86 89
}

+ 76 - 0
app/src/main/java/com/electric/chargingpile/view/HongBaoResultDialog.java

@ -0,0 +1,76 @@
1
package com.electric.chargingpile.view;
2
3
import android.content.Context;
4
import android.view.Display;
5
import android.view.LayoutInflater;
6
import android.view.View;
7
import android.view.WindowManager;
8
import android.widget.FrameLayout;
9
import android.widget.ImageView;
10
import android.widget.LinearLayout;
11
import android.widget.TextView;
12
13
import com.electric.chargingpile.R;
14
15
/**
16
 * Created by demon on 2017/5/25.
17
 */
18
19
public class HongBaoResultDialog {
20
    private Context context;
21
    private android.app.Dialog dialog;
22
    private Display display;
23
    private ImageView dialog_close;
24
    private LinearLayout dialog_bg;
25
26
    public HongBaoResultDialog(Context context) {
27
        this.context = context;
28
        WindowManager windowManager = (WindowManager) context
29
                .getSystemService(Context.WINDOW_SERVICE);
30
        display = windowManager.getDefaultDisplay();
31
    }
32
33
    public HongBaoResultDialog builder() {
34
        // 获取Dialog布局
35
        View view = LayoutInflater.from(context).inflate(
36
                R.layout.dialog_hongbao_result, null);
37
38
        // 获取自定义Dialog布局中的控件
39
        dialog_bg = (LinearLayout) view.findViewById(R.id.dialog_bg);
40
        dialog_close = (ImageView) view.findViewById(R.id.dialog_close);
41
42
        // 定义Dialog布局和参数
43
        dialog = new android.app.Dialog(context, R.style.AlertDialogStyle);
44
        dialog.setContentView(view);
45
46
        // 调整dialog背景大小
47
        dialog_bg.setLayoutParams(new FrameLayout.LayoutParams((int) (display
48
                .getWidth() * 0.85), LinearLayout.LayoutParams.WRAP_CONTENT));
49
50
        return this;
51
    }
52
53
    public HongBaoResultDialog setCancelable(boolean cancel) {
54
        dialog.setCancelable(cancel);
55
        dialog.setCanceledOnTouchOutside(cancel);
56
        return this;
57
    }
58
59
    public void show() {
60
        dialog_close.setOnClickListener(new View.OnClickListener() {
61
            @Override
62
            public void onClick(View view) {
63
                try {
64
                    dialog.dismiss();
65
                } catch (Exception e) {
66
                    e.printStackTrace();
67
                }
68
            }
69
        });
70
        dialog.show();
71
    }
72
73
    public void dismiss() {
74
        dialog.dismiss();
75
    }
76
}

BIN
app/src/main/res/drawable-xxhdpi/icon_hongbao_result.png


+ 3 - 11
app/src/main/res/layout/activity_charging_comment.xml

@ -145,14 +145,13 @@
145 145
                android:layout_height="wrap_content">
146 146
147 147
                <TextView
148
                    android:id="@+id/tv_huodong"
148 149
                    android:layout_width="wrap_content"
149 150
                    android:layout_height="wrap_content"
150
                    android:layout_centerVertical="true"
151
                    android:textColor="@color/ui_62"
152
                    android:textSize="14sp"
153 151
                    android:layout_marginLeft="15dp"
154 152
                    android:text="活动标签"
155
                    android:id="@+id/tv_huodong"/>
153
                    android:textColor="@color/ui_62"
154
                    android:textSize="14sp" />
156 155
157 156
                <com.zhy.view.flowlayout.TagFlowLayout
158 157
                    android:id="@+id/id_flowlayout_activity"
@ -300,11 +299,4 @@
300 299
301 300
    </RelativeLayout>
302 301
303
304
305
306
307
308
309
310 302
</com.zhy.autolayout.AutoRelativeLayout>

+ 14 - 5
app/src/main/res/layout/dialog_hongbao.xml

@ -17,19 +17,28 @@
17 17
            android:layout_gravity="center_horizontal"
18 18
            android:textSize="18sp"
19 19
            android:textColor="@color/ui_62"
20
            android:text="恭喜您获得红包!"
20
            android:text="分享领红包"
21 21
            android:layout_marginTop="45dp"/>
22 22
23 23
        <TextView
24 24
            android:layout_width="wrap_content"
25 25
            android:layout_height="wrap_content"
26 26
            android:layout_gravity="center_horizontal"
27
            android:layout_marginTop="10dp"
28
            android:layout_marginBottom="5dp"
27 29
            android:gravity="center_horizontal"
28
            android:textSize="15sp"
30
            android:text="分享红包给其他小伙伴吧"
29 31
            android:textColor="@color/ui_65"
30
            android:text="分享红包给小伙伴一起抢"
31
            android:layout_marginTop="10dp"
32
            android:layout_marginBottom="37dp"/>
32
            android:textSize="15sp" />
33
        <TextView
34
            android:layout_width="wrap_content"
35
            android:layout_height="wrap_content"
36
            android:layout_gravity="center_horizontal"
37
            android:layout_marginBottom="37dp"
38
            android:gravity="center_horizontal"
39
            android:text="分享成功后您可自动领取随机红包哦"
40
            android:textColor="@color/ui_65"
41
            android:textSize="15sp" />
33 42
34 43
        <ImageView
35 44
            android:layout_width="wrap_content"

+ 30 - 0
app/src/main/res/layout/dialog_hongbao_result.xml

@ -0,0 +1,30 @@
1
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2
    xmlns:tools="http://schemas.android.com/tools"
3
    android:id="@+id/dialog_bg"
4
    android:layout_width="match_parent"
5
    android:layout_height="match_parent"
6
    android:orientation="vertical">
7
8
    <LinearLayout
9
        android:id="@+id/dialog_layout"
10
        android:layout_width="290dp"
11
        android:layout_height="290dp"
12
        android:layout_gravity="center_horizontal"
13
        android:gravity="center"
14
        android:orientation="vertical">
15
16
        <ImageView
17
            android:layout_width="wrap_content"
18
            android:layout_height="wrap_content"
19
            android:src="@drawable/icon_hongbao_result" />
20
    </LinearLayout>
21
22
    <ImageView
23
        android:id="@+id/dialog_close"
24
        android:layout_width="wrap_content"
25
        android:layout_height="wrap_content"
26
        android:layout_gravity="center_horizontal"
27
        android:layout_marginTop="44dp"
28
        android:src="@drawable/icon_dialog_close" />
29
30
</LinearLayout>

图片更新 · 52210fe616 - Gogs: Go Git Service
huyuguo vor 7 Jahren
Ursprung
Commit
52210fe616

+ 2 - 2
app/src/main/java/com/electric/chargingpile/fragment/ChatPhotoFragment.java

@ -69,8 +69,8 @@ public class ChatPhotoFragment extends Fragment {
69 69
70 70
        Picasso.with(getContext())
71 71
                .load(url)
72
                .placeholder(R.drawable.icon_face2_0)
73
                .error(R.drawable.icon_face2_0)
72
                .placeholder(R.drawable.photo_loading_icon)
73
                .error(R.drawable.photo_loading_icon)
74 74
                .into(photoView);
75 75
//        photoView.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
76 76
//            @Override

BIN
app/src/main/res/drawable-hdpi/photo_loading_icon.png


BIN
app/src/main/res/drawable-mdpi/photo_loading_icon.png


BIN
app/src/main/res/drawable-xhdpi/photo_loading_icon.png


BIN
app/src/main/res/drawable-xxhdpi/photo_loading_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/photo_loading_icon.png