Преглед на файлове

替换充电状态页面的UI

hy преди 3 години
родител
ревизия
93486b3df5

+ 20 - 2
app/src/main/java/com/electric/chargingpile/activity/ChargingStatusActivity.java

@ -1,6 +1,7 @@
1 1
package com.electric.chargingpile.activity;
2 2
3 3
4
import android.annotation.SuppressLint;
4 5
import android.app.Activity;
5 6
import android.app.AlertDialog;
6 7
import android.content.Context;
@ -101,6 +102,8 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
101 102
    };
102 103
    private RelativeLayout rl_circle;
103 104
    private LinearLayout layoutCarCertificate;
105
    private ImageView imgA,imgV,imgProgrees;
106
    private TextView certifiedCarOwner;
104 107
105 108
106 109
    @Override
@ -212,6 +215,12 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
212 215
        tv_dianliu = (TextView) findViewById(R.id.tv_dianliu);
213 216
        tv_time = (TextView) findViewById(R.id.tv_time);
214 217
        layoutCarCertificate = findViewById(R.id.layoutCarCertificate);
218
219
        imgA = findViewById(R.id.imgA);
220
        imgV = findViewById(R.id.imgV);
221
        imgProgrees = findViewById(R.id.imgProgrees);
222
        certifiedCarOwner = findViewById(R.id.certifiedCarOwner);
223
215 224
        tv_time.setOnClickListener(new View.OnClickListener() {
216 225
            @Override
217 226
            public void onClick(View v) {
@ -232,11 +241,20 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
232 241
            case 2:
233 242
            case 3: {
234 243
                rl_circle.setBackgroundResource(R.drawable.bg_charging_orange);
235
                tv_stop.setBackgroundResource(R.drawable.bg_tv_stop_orange);
244
                tv_stop.setBackgroundResource(R.drawable.bg_f08f4b_radius_10);
245
                tv_stop.setTextColor(Color.parseColor("#F08F4B"));
236 246
                tv_help.setTextColor(Color.parseColor("#030303"));
237
                Drawable drawable = getResources().getDrawable(R.drawable.icon_zhan_name_orange, null);
247
                @SuppressLint("UseCompatLoadingForDrawables") Drawable drawable = getResources().getDrawable(R.drawable.icon_zhan_name_orange, null);
238 248
                drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
239 249
                tv_zhuang_num.setCompoundDrawables(drawable, null, null, null);
250
251
                imgA.setImageResource(R.drawable.ic_dianliu_orange);
252
                imgV.setImageResource(R.drawable.ic_dianya_orange);
253
                imgProgrees.setImageResource(R.drawable.ic_jindu_orange);
254
255
                @SuppressLint("UseCompatLoadingForDrawables") Drawable certified = getResources().getDrawable(R.drawable.ic_certification_orange, null);
256
                certified.setBounds(0, 0, certified.getMinimumWidth(), certified.getMinimumHeight());
257
                certifiedCarOwner.setCompoundDrawables(certified, null, null, null);
240 258
            }
241 259
            break;
242 260
        }

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -966,7 +966,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
966 966
            }
967 967
        }, 2000);
968 968
969
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
969
        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
970 970
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
971 971
    }
972 972

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


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


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


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


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


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


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


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


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


+ 5 - 0
app/src/main/res/drawable/bg_3ec34c_radius10.xml

@ -0,0 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3
    <stroke android:color="@color/color_3ec34c" android:width="1dp"/>
4
    <corners android:radius="10dp"/>
5
</shape>

+ 5 - 0
app/src/main/res/drawable/bg_f08f4b_radius_10.xml

@ -0,0 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3
    <stroke android:color="@color/color_f08f4b" android:width="1dp"/>
4
    <corners android:radius="10dp"/>
5
</shape>

+ 5 - 0
app/src/main/res/drawable/bg_f9f9fb_radius14.xml

@ -0,0 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3
    <corners android:radius="14dp"/>
4
    <solid android:color="@color/color_f9f9fb"/>
5
</shape>

+ 118 - 68
app/src/main/res/layout/activity_charging_status.xml

@ -53,7 +53,7 @@
53 53
    <LinearLayout
54 54
        android:id="@+id/ll_charginginfo"
55 55
        android:layout_width="match_parent"
56
        android:layout_height="44dp"
56
        android:layout_height="72dp"
57 57
        android:layout_below="@+id/rl_circle"
58 58
        android:layout_marginLeft="12dp"
59 59
        android:layout_marginTop="26dp"
@ -61,92 +61,140 @@
61 61
        android:orientation="horizontal">
62 62
63 63
        <RelativeLayout
64
65
            android:background="@drawable/bg_f9f9fb_radius14"
64 66
            android:layout_width="0dp"
65 67
            android:layout_height="match_parent"
66 68
            android:layout_weight="1">
67
68
            <TextView
69
            <ImageView
70
                android:id="@+id/imgA"
71
                android:gravity="center_vertical"
72
                android:layout_marginStart="10dp"
73
                android:layout_centerVertical="true"
74
                android:src="@drawable/ic_dianliu"
69 75
                android:layout_width="wrap_content"
70
                android:layout_height="wrap_content"
71
                android:layout_alignParentTop="true"
72
                android:layout_centerHorizontal="true"
73
                android:layout_gravity="center"
74
                android:text="电流(安)"
75
                android:textColor="@color/ui_68"
76
                android:textSize="12sp" />
77
78
            <TextView
79
                android:id="@+id/tv_dianliu"
76
                android:layout_height="wrap_content"/>
77
            <LinearLayout
78
                android:layout_centerInParent="true"
79
                android:orientation="vertical"
80
                android:layout_alignParentEnd="true"
81
                android:layout_toEndOf="@+id/imgA"
80 82
                android:layout_width="wrap_content"
81
                android:layout_height="wrap_content"
82
                android:layout_alignParentBottom="true"
83
                android:layout_centerHorizontal="true"
84
                android:text="--"
85
                android:textColor="@color/ui_65"
86
                android:textSize="17sp" />
87
83
                android:layout_height="wrap_content">
84
85
                <TextView
86
                    android:gravity="center"
87
                    android:id="@+id/tv_dianliu"
88
                    android:layout_width="match_parent"
89
                    android:layout_height="wrap_content"
90
                    android:text="--"
91
                    android:textStyle="bold"
92
                    android:textColor="@color/color_0e0e0e"
93
                    android:textSize="18sp" />
94
                <TextView
95
                    android:layout_marginTop="8dp"
96
                    android:gravity="center"
97
                    android:layout_width="match_parent"
98
                    android:layout_height="wrap_content"
99
                    android:text="电流(安)"
100
                    android:textColor="@color/color_0e0e0e"
101
                    android:textSize="12sp" />
102
103
            </LinearLayout>
88 104
89 105
        </RelativeLayout>
90 106
91
        <View
92
            android:layout_width="0.5dp"
93
            android:layout_height="match_parent"
94
            android:background="@color/ui_6d" />
95 107
96 108
        <RelativeLayout
109
            android:background="@drawable/bg_f9f9fb_radius14"
110
            android:layout_marginEnd="10dp"
111
            android:layout_marginStart="10dp"
97 112
            android:layout_width="0dp"
98 113
            android:layout_height="match_parent"
99 114
            android:layout_weight="1">
100
101
            <TextView
115
            <ImageView
116
                android:id="@+id/imgV"
117
                android:gravity="center_vertical"
118
                android:layout_marginStart="10dp"
119
                android:layout_centerVertical="true"
120
                android:src="@drawable/ic_dianya"
102 121
                android:layout_width="wrap_content"
103
                android:layout_height="wrap_content"
104
                android:layout_alignParentTop="true"
105
                android:layout_centerHorizontal="true"
106
                android:text="电压(伏)"
107
                android:textColor="@color/ui_68"
108
                android:textSize="12sp" />
122
                android:layout_height="wrap_content"/>
109 123
110
            <TextView
111
                android:id="@+id/tv_dianya"
124
            <LinearLayout
125
                android:layout_centerInParent="true"
126
                android:layout_alignParentEnd="true"
127
                android:layout_toEndOf="@+id/imgV"
128
                android:orientation="vertical"
112 129
                android:layout_width="wrap_content"
113
                android:layout_height="wrap_content"
114
                android:layout_alignParentBottom="true"
115
                android:layout_centerHorizontal="true"
116
                android:text="--"
117
                android:textColor="@color/ui_65"
118
                android:textSize="17sp" />
130
                android:layout_height="wrap_content">
131
132
133
                <TextView
134
                    android:gravity="center"
135
                    android:id="@+id/tv_dianya"
136
                    android:layout_width="match_parent"
137
                    android:layout_height="wrap_content"
138
                    android:text="--"
139
                    android:textStyle="bold"
140
                    android:textColor="@color/color_0e0e0e"
141
                    android:textSize="18sp" />
142
                <TextView
143
                    android:layout_marginTop="8dp"
144
                    android:gravity="center"
145
                    android:layout_width="match_parent"
146
                    android:layout_height="wrap_content"
147
                    android:text="电压(伏)"
148
                    android:textColor="@color/color_0e0e0e"
149
                    android:textSize="12sp" />
150
151
            </LinearLayout>
119 152
120 153
        </RelativeLayout>
121 154
122
        <View
123
            android:layout_width="0.5dp"
124
            android:layout_height="match_parent"
125
            android:background="@color/ui_6d" />
126 155
127 156
        <RelativeLayout
157
            android:background="@drawable/bg_f9f9fb_radius14"
128 158
            android:layout_width="0dp"
129 159
            android:layout_height="match_parent"
130 160
            android:layout_weight="1">
131
132
            <TextView
161
            <ImageView
162
                android:id="@+id/imgProgrees"
163
                android:gravity="center_vertical"
164
                android:layout_marginStart="10dp"
165
                android:layout_centerVertical="true"
166
                android:src="@drawable/ic_jindu"
133 167
                android:layout_width="wrap_content"
134
                android:layout_height="wrap_content"
135
                android:layout_alignParentTop="true"
136
                android:layout_centerHorizontal="true"
137
                android:text="充电进程"
138
                android:textColor="@color/ui_68"
139
                android:textSize="12sp" />
168
                android:layout_height="wrap_content"/>
140 169
141
            <TextView
142
                android:id="@+id/tv_jindu"
170
            <LinearLayout
171
                android:layout_centerInParent="true"
172
                android:orientation="vertical"
173
                android:layout_alignParentEnd="true"
174
                android:layout_toEndOf="@+id/imgProgrees"
143 175
                android:layout_width="wrap_content"
144
                android:layout_height="wrap_content"
145
                android:layout_alignParentBottom="true"
146
                android:layout_centerHorizontal="true"
147
                android:text="--"
148
                android:textColor="@color/ui_65"
149
                android:textSize="17sp" />
176
                android:layout_height="wrap_content">
177
                <TextView
178
                    android:textStyle="bold"
179
                    android:gravity="center"
180
                    android:id="@+id/tv_jindu"
181
                    android:layout_width="match_parent"
182
                    android:layout_height="wrap_content"
183
                    android:text="--"
184
                    android:textColor="@color/color_0e0e0e"
185
                    android:textSize="18sp" />
186
187
188
                <TextView
189
                    android:layout_marginTop="8dp"
190
                    android:gravity="center"
191
                    android:layout_width="match_parent"
192
                    android:layout_height="wrap_content"
193
                    android:text="充电进程"
194
                    android:textColor="@color/color_0e0e0e"
195
                    android:textSize="12sp" />
196
197
            </LinearLayout>
150 198
151 199
        </RelativeLayout>
152 200
@ -298,6 +346,7 @@
298 346
        android:layout_width="match_parent"
299 347
        android:layout_height="match_parent">
300 348
        <LinearLayout
349
            tools:visibility="visible"
301 350
            android:visibility="gone"
302 351
            android:id="@+id/layoutCarCertificate"
303 352
            android:background="@drawable/bg_f9f9fb_radius5"
@ -310,6 +359,7 @@
310 359
            android:layout_width="wrap_content"
311 360
            android:layout_height="wrap_content">
312 361
            <TextView
362
                android:id="@+id/certifiedCarOwner"
313 363
                android:drawablePadding="12dp"
314 364
                android:drawableLeft="@drawable/ic_certification"
315 365
                android:layout_marginEnd="35dp"
@ -352,18 +402,18 @@
352 402
            android:visibility="visible" />
353 403
354 404
        <TextView
405
            android:layout_centerHorizontal="true"
406
            android:textStyle="bold"
355 407
            android:id="@+id/tv_stop"
356
            android:layout_width="match_parent"
357
            android:layout_height="40dp"
408
            android:layout_width="160dp"
409
            android:layout_height="42dp"
358 410
            android:layout_alignParentBottom="true"
359
            android:layout_marginLeft="15dp"
360
            android:layout_marginRight="15dp"
361
            android:layout_marginBottom="15dp"
362
            android:background="@drawable/bg_tv_stop_green"
411
            android:layout_marginBottom="94dp"
412
            android:background="@drawable/bg_3ec34c_radius10"
363 413
            android:gravity="center"
364 414
            android:text="结束充电"
365
            android:textColor="@color/white"
366
            android:textSize="16sp" />
415
            android:textColor="@color/color_3ec34c"
416
            android:textSize="18sp" />
367 417
    </RelativeLayout>
368 418
369 419
</LinearLayout>

+ 2 - 0
app/src/main/res/values/color.xml

@ -196,6 +196,8 @@
196 196
    <color name="color_f6f6f6">#F6F6F6</color>
197 197
    <color name="sv_black">#FF000000</color>
198 198
    <color name="sv_white">#FFFFFF</color>
199
    <color name="color_3ec34c">#3EC34C</color>
200
    <color name="color_f08f4b">#F08F4B</color>
199 201

200 202

201 203