e nl-1 ol-1"> 6 6
    String URL = "url";
7 7
    String FLAG = "flag";
8 8
    String ORDERID = "orderid";
9
    String PLATE_NUM = "plate_num";
9 10
    String TYPE = "type";
10 11
}

+ 9 - 0
app/src/main/java/com/electric/chargingpile/data/ChargingBean.java

@ -44,6 +44,15 @@ public class ChargingBean implements Serializable {
44 44
    private String serviceMoney;
45 45
    private String totalMoney;
46 46
    private String redMoney;
47
    private String plate_number;
48
49
    public String getPlate_number() {
50
        return plate_number;
51
    }
52
53
    public void setPlate_number(String plate_number) {
54
        this.plate_number = plate_number;
55
    }
47 56
48 57
    public String getOrderId() {
49 58
        return orderId;

+ 1 - 2
app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java

@ -742,11 +742,10 @@ public class ProfileManager {
742 742

743 743
    public void setLicensePlateHistory(String str) {
744 744
        ArrayList<String> list = getLicensePlateHistory();
745
        list.remove(str); //除重
745 746
        if (list.size() >= 6){
746 747
            list.remove(list.size() -1 );
747 748
        }
748

749
        list.remove(str);
750 749
        list.add(0,str);
751 750
        PreferenceManager.getInstance(MainApplication.context).putString(KEY_LICENSE_PLATE_HISTORY, new Gson().toJson(list));
752 751
    }

+ 1 - 0
app/src/main/java/com/electric/chargingpile/view/UpdateDialog.java

@ -2,6 +2,7 @@ package com.electric.chargingpile.view;
2 2
3 3
import android.app.Dialog;
4 4
import android.content.Context;
5
import android.util.Log;
5 6
import android.view.Display;
6 7
import android.view.LayoutInflater;
7 8
import android.view.View;

+ 1 - 1
app/src/main/res/layout/activity_charging_pile.xml

@ -159,7 +159,7 @@
159 159
    </androidx.constraintlayout.widget.ConstraintLayout>
160 160
161 161
    <View
162
        android:layout_width="1dp"
162
        android:layout_width="match_parent"
163 163
        android:layout_height="0dp"
164 164
        android:layout_weight="1" />
165 165

+ 34 - 24
app/src/main/res/layout/activity_charging_status.xml

@ -231,16 +231,6 @@
231 231
                    app:wlv_waveColor="#3fffffff"
232 232
                    app:wlv_wave_background_Color="#00ffffff" />
233 233
234
235
                <!--<com.loonggg.circleprogressbarlibrary.view.CircleProgressBar-->
236
                <!--android:id="@+id/pb"-->
237
                <!--android:layout_width="143dp"-->
238
                <!--android:layout_height="143dp"-->
239
                <!--android:visibility="gone"-->
240
                <!--android:layout_centerInParent="true"-->
241
                <!--loonggg:bgProgressBarColor="#efefef"-->
242
                <!--loonggg:circleStrokeWidth="5dp" />-->
243
244 234
                <LinearLayout
245 235
                    android:layout_width="wrap_content"
246 236
                    android:layout_height="wrap_content"
@ -347,10 +337,43 @@
347 337
348 338
                </RelativeLayout>
349 339
340
                <View
341
                    android:layout_width="0.5dp"
342
                    android:layout_height="match_parent"
343
                    android:background="@color/ui_6d" />
344
345
                <RelativeLayout
346
                    android:layout_width="0dp"
347
                    android:layout_height="match_parent"
348
                    android:layout_weight="1">
349
350
                    <TextView
351
                        android:layout_width="wrap_content"
352
                        android:layout_height="wrap_content"
353
                        android:layout_alignParentTop="true"
354
                        android:layout_centerHorizontal="true"
355
                        android:text="账户余额"
356
                        android:textColor="@color/ui_68"
357
                        android:textSize="12sp" />
358
359
                    <TextView
360
                        android:id="@+id/tv_overage"
361
                        android:layout_width="wrap_content"
362
                        android:layout_height="wrap_content"
363
                        android:layout_alignParentBottom="true"
364
                        android:layout_centerHorizontal="true"
365
                        android:layout_centerVertical="true"
366
                        android:text="--"
367
                        android:textColor="@color/ui_62"
368
                        android:textSize="21sp" />
369
370
                </RelativeLayout>
371
350 372
            </LinearLayout>
351 373
352 374
353 375
            <RelativeLayout
376
                android:paddingBottom="30dp"
354 377
                android:layout_width="match_parent"
355 378
                android:layout_height="match_parent">
356 379
                <LinearLayout
@ -385,6 +408,7 @@
385 408
386 409
                </LinearLayout>
387 410
                <ImageView
411
                    tools:src="@drawable/ic_charging_pile"
388 412
                    tools:visibility="visible"
389 413
                    android:id="@+id/iv_activity"
390 414
                    android:layout_width="wrap_content"
@ -396,20 +420,6 @@
396 420
                    android:visibility="gone" />
397 421
398 422
                <TextView
399
                    tools:visibility="visible"
400
                    android:id="@+id/tv_activity"
401
                    android:layout_width="wrap_content"
402
                    android:layout_height="wrap_content"
403
                    android:layout_below="@+id/tv_stop"
404
                    android:layout_centerHorizontal="true"
405
                    android:paddingTop="20dp"
406
                    android:paddingBottom="15dp"
407
                    android:text=""
408
                    android:textColor="#ffa900"
409
                    android:textSize="14sp"
410
                    android:visibility="visible" />
411
412
                <TextView
413 423
                    android:layout_centerHorizontal="true"
414 424
                    android:textStyle="bold"
415 425
                    android:id="@+id/tv_stop"

+ 28 - 0
app/src/main/res/layout/activity_oder_details.xml

@ -273,6 +273,34 @@
273 273
                android:textSize="14sp" />
274 274
275 275
        </RelativeLayout>
276
        <RelativeLayout
277
            tools:visibility="visible"
278
            android:visibility="gone"
279
            android:id="@+id/rl_number_plate"
280
            android:layout_width="match_parent"
281
            android:layout_height="wrap_content"
282
            android:layout_marginTop="13dp">
283
284
            <TextView
285
                android:layout_width="wrap_content"
286
                android:layout_height="wrap_content"
287
                android:layout_alignParentLeft="true"
288
                android:layout_marginLeft="15dp"
289
                android:text="充电车辆"
290
                android:textColor="@color/ui_68"
291
                android:textSize="14sp" />
292
293
            <TextView
294
                android:id="@+id/tv_num_plate"
295
                android:layout_width="wrap_content"
296
                android:layout_height="wrap_content"
297
                android:layout_alignParentRight="true"
298
                android:layout_marginRight="15dp"
299
                tools:text="--"
300
                android:textColor="@color/ui_68"
301
                android:textSize="14sp" />
302
303
        </RelativeLayout>
276 304
277 305
278 306
    </LinearLayout>

+ 29 - 0
app/src/main/res/layout/activity_submit_orders.xml

@ -282,6 +282,35 @@
282 282
                android:textSize="14sp" />
283 283
284 284
        </RelativeLayout>
285
286
        <RelativeLayout
287
            tools:visibility="visible"
288
            android:visibility="gone"
289
            android:id="@+id/rl_number_plate"
290
            android:layout_width="match_parent"
291
            android:layout_height="wrap_content"
292
            android:layout_marginTop="13dp">
293
294
            <TextView
295
                android:layout_width="wrap_content"
296
                android:layout_height="wrap_content"
297
                android:layout_alignParentLeft="true"
298
                android:layout_marginLeft="15dp"
299
                android:text="充电车辆"
300
                android:textColor="@color/ui_68"
301
                android:textSize="14sp" />
302
303
            <TextView
304
                android:id="@+id/tv_num_plate"
305
                android:layout_width="wrap_content"
306
                android:layout_height="wrap_content"
307
                android:layout_alignParentRight="true"
308
                android:layout_marginRight="15dp"
309
                tools:text="--"
310
                android:textColor="@color/ui_68"
311
                android:textSize="14sp" />
312
313
        </RelativeLayout>
285 314
    </LinearLayout>
286 315
287 316
    <TextView

+ 2 - 2
app/src/main/res/layout/layout_update_dialog.xml

@ -21,9 +21,9 @@
21 21
    <com.qmuiteam.qmui.widget.QMUIProgressBar
22 22
        android:id="@+id/qMUIProgressBar"
23 23
        android:layout_width="match_parent"
24
        android:layout_height="16dp"
24
        android:layout_height="12dp"
25 25
        android:textColor="@color/lvse"
26
        android:textSize="16sp"
26
        android:textSize="12sp"
27 27
        android:layout_marginBottom="20dp"
28 28
        android:layout_marginLeft="16dp"
29 29
        android:layout_marginRight="16dp"

cdzApp - Gogs: Go Git Service

充电桩app代码

huyuguo 598eb725e7 引用第三方gradle 升级 7 vuotta sitten
..
src d2f405e921 add video play 7 vuotta sitten
.gitignore d2f405e921 add video play 7 vuotta sitten
build.gradle 598eb725e7 引用第三方gradle 升级 7 vuotta sitten
proguard-rules.pro d2f405e921 add video play 7 vuotta sitten