完成接入特瓦特

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.electric.chargingpile"
    android:versionCode="103"
    android:versionName="3.5.17">
    android:versionName="3.5.18">
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
@@ -74,6 +74,7 @@
    <!--适配Android R包可见性 结束-->
    <application
        android:extractNativeLibs="true"
        android:name=".application.MainApplication"
        android:allowBackup="true"
        android:icon="@drawable/icon626"

app/src/main/java/com/electric/chargingpile/activity/ChargingPileActivity.java

@@ -1,11 +1,14 @@
package com.electric.chargingpile.activity;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -16,18 +19,37 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.EmptyUtils;
import com.blankj.utilcode.util.LogUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.adapter.LicensePlateHistoryAdapter;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.constant.UrlConstants;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.AlertDialogTwo;
import com.electric.chargingpile.view.ConfirmChargingDialog;
import com.google.zxing.client.android.constant.ChargingConstants;
import com.king.keyboard.KingKeyboard;
import com.tencent.bugly.crashreport.CrashReport;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.net.URLEncoder;
import java.util.List;
import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
/**
 *  特瓦特充电 详情页
 * */
public class ChargingPileActivity extends AppCompatActivity {
public class ChargingPileActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
    private KingKeyboard kingKeyboard;
    private int beforeCount = 0;
@@ -40,7 +62,12 @@ public class ChargingPileActivity extends AppCompatActivity {
    private LinearLayout mKeyboardParent;
    private String pileId;
    private TextView tvCoding;
    private AlertDialogTwo alertDialog;
    private LoadingDialog loadingDialog;
    private static final int RC_TELL_PERM = 124;
    private static final int startInterface = 2;
    private static final String numType = "2";
    @Override
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
@@ -60,8 +87,11 @@ public class ChargingPileActivity extends AppCompatActivity {
        rootView = findViewById(R.id.rootView);
        rvHistory = findViewById(R.id.rvHistory);
        tvCoding = findViewById(R.id.tvCoding);
        alertDialog = new AlertDialogTwo(this);
        loadingDialog = new LoadingDialog(this);
        loadingDialog.setCanceledOnTouchOutside(false);
        tvCoding.setText("充电桩编码："+pileId);
    }
    private void initOnClick() {
@@ -75,8 +105,9 @@ public class ChargingPileActivity extends AppCompatActivity {
        mAdapter.setList();
        mDialog.setOnClickListener(v->{
            //todo 进入充电流程
            ProfileManager.getInstance().setLicensePlateHistory(mDialog.getLicensePlate());
            String licensePlate = mDialog.getLicensePlate();
            startCharging(licensePlate);
            ProfileManager.getInstance().setLicensePlateHistory(licensePlate);
            mAdapter.setList();
        });
@@ -86,6 +117,10 @@ public class ChargingPileActivity extends AppCompatActivity {
                Toast.makeText(this, "请输入车牌号", Toast.LENGTH_SHORT).show();
                return;
            }
            if (str.length() < 7){
                Toast.makeText(this, "请输入正确车牌号", Toast.LENGTH_SHORT).show();
                return;
            }
            mDialog.setLicensePlate(str);
            mDialog.show(getSupportFragmentManager());
@@ -93,14 +128,17 @@ public class ChargingPileActivity extends AppCompatActivity {
        });
        rootView.setOnClickListener(v->{
            kingKeyboard.hide();
            if (kingKeyboard.isShow())
                kingKeyboard.hide();
        });
    }
    private void registerKingKeyboard(){
        kingKeyboard = new KingKeyboard(this,mKeyboardParent);
        //然后将EditText注册到KingKeyboard即可
        kingKeyboard.setBringToFront(true);
        kingKeyboard.register(editText, KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE);
        editText.addTextChangedListener(new TextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -141,6 +179,196 @@ public class ChargingPileActivity extends AppCompatActivity {
        super.onDestroy();
        kingKeyboard.onDestroy();
    }
    private void startCharging(String result) {
        LogUtils.e(result);
        loadingDialog.show();
        OkHttpUtils.get().url(UrlConstants.START_CHARGING_URL)
                .addParams(com.electric.chargingpile.constant.ChargingConstants.FLAG, numType)
                .addParams(com.electric.chargingpile.constant.ChargingConstants.URL, URLEncoder.encode(pileId))
                .addParams(com.electric.chargingpile.constant.ChargingConstants.USERID, MainApplication.userId)
                .addParams(com.electric.chargingpile.constant.ChargingConstants.PWD, MainApplication.userPassword)
                .addParams(com.electric.chargingpile.constant.ChargingConstants.PLATE_NUM, result)
                .addParams("type", "1")
                .build().connTimeOut(30000).readTimeOut(30000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                ToastUtil.showToast(getApplicationContext(), "网络异常，请检查您的网络连接", Toast.LENGTH_SHORT);
                CrashReport.postCatchedException(e);
            }
            @Override
            public void onResponse(String response) {
                LogUtils.e(response);
                if (EmptyUtils.isNotEmpty(response)) {
                    dismissDialog();
                    handlingOperations(response, startInterface);
                }
            }
        });
    }
    private void handlingOperations(String response, int interfaceType) {
        String rtnCode = com.google.zxing.client.android.JsonUtils.getKeyResult(response, "rtnCode");
        String rtnMsg = com.google.zxing.client.android.JsonUtils.getKeyResult(response, "rtnMsg");
        switch (rtnCode) {
            case "01":
                if (interfaceType == startInterface) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    String orderid = JsonUtils.getKeyResult(data, "orderId");
                    Intent intent = new Intent(getApplicationContext(), TLDLoadingActivity.class);
                    intent.putExtra(com.electric.chargingpile.constant.ChargingConstants.ORDERID, orderid);
                    startActivity(intent);
                    finish();
                }
                break;
            case "304":
                alertDialog.builder()
                        .setMsg(rtnMsg)
                        .setPositiveButton("去充值", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                Intent intent = new Intent(getApplicationContext(), AccountRechargeActivity.class);
                                startActivity(intent);
                            }
                        })
//                        .setNegativeButton("开通免密支付", new View.OnClickListener() {
//                    @Override
//                    public void onClick(View v) {
//                        Intent intent = new Intent(getApplicationContext(),NonSecretSeettingActivity.class);
//                        Uri uri = Uri.parse("chongdianzhuang://");
//                        intent.setData(uri);
//                        startActivity(intent);
//                    }
//                })
                        .show();
                break;
            case "305":
                alertDialog.builder()
                        .setMsg(rtnMsg)
                        .setPositiveButton("联系客服", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                tellTask();
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                    }
                }).show();
                break;
            case "309":
                alertDialog.builder()
                        .setMsg(rtnMsg)
                        .setPositiveButton("联系客服", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                tellTask();
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                    }
                }).show();
                break;
            case "306":
                //跳转到充电详情界面
                String data306 = JsonUtils.getKeyResult(response, "data");
                String orderid = JsonUtils.getKeyResult(data306, "orderId");
                Intent intent306 = new Intent(getApplicationContext(), ChargingStatusActivity.class);
                intent306.putExtra(com.electric.chargingpile.constant.ChargingConstants.ORDERID, orderid);
                startActivity(intent306);
                finish();
                break;
            case "307":
                alertDialog.builder()
                        .setMsg(rtnMsg)
                        .setPositiveButton("去充值", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                Intent intent = new Intent(getApplicationContext(), AccountRechargeActivity.class);
                                startActivity(intent);
                            }
                        }).show();
                break;
            case "311":
                alertDialog.builder()
                        .setMsg(rtnMsg)
                        .setPositiveButton("开通免密支付", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                Intent intent = new Intent(getApplicationContext(), NonSecretSeettingActivity.class);
                                Uri uri = Uri.parse("chongdianzhuang://");
                                intent.setData(uri);
                                startActivity(intent);
                            }
                        }).show();
                break;
            case "1800":
                String data1800 = JsonUtils.getKeyResult(response, "data");
                String pileId = JsonUtils.getKeyResult(data1800, "pileId");
                Intent intent1800 = new Intent(getApplicationContext(), SelectPileActivity.class);
                intent1800.putExtra(com.electric.chargingpile.constant.ChargingConstants.ORDERID, pileId);
                startActivity(intent1800);
                break;
            case "1000":
                String data1000 = JsonUtils.getKeyResult(response, "data");
                String pileIds = JsonUtils.getKeyResult(data1000, "pileId");
                ChargingPileActivity.actionStart(this,pileIds);
                break;
            default:
                ToastUtil.showToast(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT);
                break;
        }
    }
    @AfterPermissionGranted(RC_TELL_PERM)
    public void tellTask() {
        if (hasTellPermission()) {
            // Have permission, do the thing!
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
            String telNum = "4008810405";
            Intent intent = new Intent();
            intent.setAction("android.intent.action.CALL");
            intent.addCategory("android.intent.category.DEFAULT");
            intent.setData(Uri.parse("tel:" + telNum));
            ChargingPileActivity.this.startActivity(intent);
        } else {
            LogUtils.e("@@@@@@@");
            // Ask for one permission
            EasyPermissions.requestPermissions(
                    this,
                    "该功能需要开启拨号权限，是否前往开启？",
                    RC_TELL_PERM,
                    Manifest.permission.CALL_PHONE);
        }
    }
    private boolean hasTellPermission() {
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
    }
    @Override
    public void onPermissionsDenied(int requestCode, List<String> perms) {
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
            new AppSettingsDialog.Builder(ChargingPileActivity.this).build().show();
        }
    }
    private void dismissDialog() {
        if (this != null && !isFinishing()) {
            if (loadingDialog.isShowing()) {
                loadingDialog.dismiss();
            }
        }
    }
    public static void actionStart(Context context,String pileId){

app/src/main/java/com/electric/chargingpile/activity/ChargingStatusActivity.java

@@ -51,6 +51,7 @@ import com.tencent.bugly.crashreport.CrashReport;
import com.umeng.analytics.MobclickAgent;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import com.zhy.http.okhttp.request.RequestCall;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
@@ -70,7 +71,7 @@ import okhttp3.Call;
public class ChargingStatusActivity extends Activity implements View.OnClickListener {
    private static final String TAG = "ChargingStatusActivity";
    private ImageView iv_charging, iv_back, iv_activity;
    private TextView tv_charging, tv_stop, tv_activity;
    private TextView tv_charging, tv_stop;
    private TextView tv_chongdianliang, tv_zhuang_num, tv_jindu, tv_dianya, tv_dianliu, tv_time, tv_cost, tv_help;
    String result, stubGroupId;
    CircleProgressBar bar;
@@ -116,6 +117,7 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
    private LinearLayout layoutCarCertificate;
    private ImageView imgA,imgV,imgProgrees;
    private TextView certifiedCarOwner;
    private TextView tv_overage;
    @Override
@@ -138,6 +140,7 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
        // start timer task
        setTimerTask();
        msgStatus();
        getUserIntegral();
    }
@@ -158,8 +161,6 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
                    String icon = JsonUtils.getKeyResult(response, "icon");
                    String url = JsonUtils.getKeyResult(response, "url");
                    if (status.equals("1")) {
//                        tv_activity.setVisibility(View.VISIBLE);
//                        tv_activity.setText(message);
                        Picasso.with(MainApplication.context)
                                .load(icon)
                                .into(iv_activity);
@@ -205,8 +206,6 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
        iv_activity = (ImageView) findViewById(R.id.iv_activity);
        iv_back.setOnClickListener(this);
        iv_activity.setOnClickListener(this);
        tv_activity = (TextView) findViewById(R.id.tv_activity);
        tv_activity.setOnClickListener(this);
        tv_help = findViewById(R.id.tv_help);
        tv_help.setOnClickListener(this);
@@ -226,6 +225,7 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
        tv_dianya = (TextView) findViewById(R.id.tv_dianya);
        tv_dianliu = (TextView) findViewById(R.id.tv_dianliu);
        tv_time = (TextView) findViewById(R.id.tv_time);
        tv_overage = (TextView) findViewById(R.id.tv_overage);
        layoutCarCertificate = findViewById(R.id.layoutCarCertificate);
        imgA = findViewById(R.id.imgA);
@@ -649,6 +649,48 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
        }
    }
    private void getUserIntegral() {
        String replace = null;
        try {
            long appTime1 = System.currentTimeMillis() / 1000;
            long updatetime = appTime1 - MainMapActivity.cha - 3;
            String token = String.valueOf(updatetime);
            String encode_token = DES3.encode(token);
            replace = URLEncoder.encode(encode_token);
        } catch (Exception e) {
            e.printStackTrace();
        }
        String url = MainApplication.url + "/zhannew/basic/web/index.php/member/get-score?id=" + MainApplication.userId +
                "&phone=" + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword) + "&token=" + replace;
        RequestCall call = OkHttpUtils.get().url(url).build();
        call.execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
            }
            @Override
            public void onResponse(String response) {
//                Log.e(TAG, "onResponse:getUserIntegral= "+response );
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if (null != rtnCode && rtnCode.equals("01")) {
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
                    String money = JsonUtils.getKeyResult(rtnMsg, "money");
                    if (null != money && !money.equals("")) {
                        tv_overage.setText(money);
                    }
                } else {
                    ProfileManager.getInstance().setUsername(getApplicationContext(), "");
                    MainApplication.userPhone = "";
                    Toast.makeText(getApplicationContext(), "登录已失效，请重新登录", Toast.LENGTH_SHORT).show();
                    startActivity(new Intent(getApplicationContext(), LoginActivity.class));
                }
            }
        });
    }
    private void chargingChangeStatus(String third_id) {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/kazuma/offline";
        OkHttpUtils.get().url(url)

app/src/main/java/com/electric/chargingpile/activity/ConfirmOrderActivity.java

@@ -59,6 +59,8 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
    private LoadingDialog mDialog;
    private int try_count=0;
    private int delayedSettlementCount=0;
    private RelativeLayout rl_number_plate;
    private TextView tv_num_plate;
    @Override
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
@@ -172,6 +174,8 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
        rl_end_info=findViewById(R.id.rl_end_info);
        tv_gocomment = findViewById(R.id.tv_gocomment);
        rl_number_plate = findViewById(R.id.rl_number_plate);
        tv_num_plate = findViewById(R.id.tv_num_plate);
        iv_back.setOnClickListener(this);
        layoutRed.setOnClickListener(this);
@@ -193,12 +197,14 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
            tv_charging_time.setText(mChargingBean.getTimeCharge());
            tv_charging_liang.setText(mChargingBean.getPower()+"度");
           /* if (TextUtils.isEmpty(mChargingBean.getEndInfo())) {
                rl_end_info.setVisibility(View.GONE);
            String plate_number = mChargingBean.getPlate_number();
            if (plate_number == null || plate_number.equals("")){
                rl_number_plate.setVisibility(View.GONE);
            }else{
                tv_tishi.setText(mChargingBean.getEndInfo());
                rl_end_info.setVisibility(View.VISIBLE);
            }*/
                rl_number_plate.setVisibility(View.VISIBLE);
                tv_num_plate.setText(plate_number);
            }
        }
    }

app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@@ -498,7 +498,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                if (key.length - 1 > 2) {
                                    permissionTask();
                                } else {
                                    dialogup();
//                                    dialogup();
                                    permissionTask();
                                }
                            }
@@ -3430,6 +3431,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private void dialogup_other() {
        int code = Integer.parseInt(now_versionCode);
        if (code - getVersionCode(getApplication()) > 0) {
//           if(true){
            alterDialog = new AlertDialogUpdate(MainMapActivity.this);
            alterDialog.builder()
@@ -3457,8 +3459,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
    }
    private void downLoadFile() {
        String url = "http://cdz.evcharge.cc/app/app.apk";
        showProgressWindow();
        ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
        OkHttpUtils.get().url("http://cdz.evcharge.cc/app/app.apk").build()

app/src/main/java/com/electric/chargingpile/activity/OderDetailsActivity.java

@@ -67,6 +67,9 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
    private LinearLayout red_paper_bag_bottom;
    private RelativeLayout rl_end_info;
    private String name;
    private TextView tv_num_plate;
    private RelativeLayout rl_number_plate;
    private String plate_number;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -89,6 +92,10 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
        tv_pinglun = (TextView) findViewById(R.id.tv_pinglun);
        tv_gocomment = (TextView) findViewById(R.id.tv_gocomment);
        red_paper_bag_bottom = findViewById(R.id.red_paper_bag_bottom);
        rl_number_plate = findViewById(R.id.rl_number_plate);
        tv_num_plate = findViewById(R.id.tv_num_plate);
        iv = (ImageView) findViewById(R.id.iv);
        tv_gocomment.setOnClickListener(this);
@@ -120,21 +127,23 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
        tv_tishi = (TextView) findViewById(R.id.tv_tishi);
        rl_end_info = (RelativeLayout) findViewById(R.id.rl_end_info);
//        if (ChargingStatusActivity.no == 0){
//            tv_tishi.setVisibility(View.GONE);
//        }else{
        if (end_info.equals("")) {
            rl_end_info.setVisibility(View.GONE);
        } else {
            rl_end_info.setVisibility(View.VISIBLE);
            tv_tishi.setText(end_info);
        }
//            tv_tishi.setVisibility(View.VISIBLE);
//            tv_tishi.setText(end_info);
//        }
        if (plate_number == null || plate_number.equals("")){
            rl_number_plate.setVisibility(View.GONE);
        }else{
            rl_number_plate.setVisibility(View.VISIBLE);
            tv_num_plate.setText(plate_number);
        }
        if (EmptyUtils.isNotEmpty(activeUrl)) {
//            ToastUtil.showToast(getApplicationContext(),activeUrl,Toast.LENGTH_LONG);
            new Handler().postDelayed(new Runnable() {
                @Override
                public void run() {
@@ -165,6 +174,8 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
        zhan_idc = chargingBean.getZhanID();
        order_id = chargingBean.getOrderId();
        out_order_id = chargingBean.getOutOrderId();
        plate_number = chargingBean.getPlate_number();
//        settlement = getIntent().getStringExtra("settlement");
        name = chargingBean.getZhanname();
        serviceCharge = chargingBean.getServiceMoney();

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -52,7 +52,6 @@ import org.jetbrains.annotations.NotNull;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
@@ -187,6 +186,9 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
        initImageLoader(getApplicationContext());
        try {
            if (BuildConfig.DEBUG){
                OkHttpUtils.getInstance().debug("hyc",true);
            }
            OkHttpUtils.getInstance().setCertificates(getAssets().open("ca.crt"));
            OkHttpUtils.getInstance().setCertificates();
        } catch (IOException e) {

app/src/main/java/com/electric/chargingpile/constant/ChargingConstants.java

@@ -6,5 +6,6 @@ public interface ChargingConstants {
    String URL = "url";
    String FLAG = "flag";
    String ORDERID = "orderid";
    String PLATE_NUM = "plate_num";
    String TYPE = "type";
}

app/src/main/java/com/electric/chargingpile/data/ChargingBean.java

@@ -44,6 +44,15 @@ public class ChargingBean implements Serializable {
    private String serviceMoney;
    private String totalMoney;
    private String redMoney;
    private String plate_number;
    public String getPlate_number() {
        return plate_number;
    }
    public void setPlate_number(String plate_number) {
        this.plate_number = plate_number;
    }
    public String getOrderId() {
        return orderId;

app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java

@@ -742,11 +742,10 @@ public class ProfileManager {
    public void setLicensePlateHistory(String str) {
        ArrayList<String> list = getLicensePlateHistory();
        list.remove(str); //除重
        if (list.size() >= 6){
            list.remove(list.size() -1 );
        }
        list.remove(str);
        list.add(0,str);
        PreferenceManager.getInstance(MainApplication.context).putString(KEY_LICENSE_PLATE_HISTORY, new Gson().toJson(list));
    }

app/src/main/java/com/electric/chargingpile/view/UpdateDialog.java

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

app/src/main/res/layout/activity_charging_pile.xml

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

app/src/main/res/layout/activity_charging_status.xml

@@ -231,16 +231,6 @@
                    app:wlv_waveColor="#3fffffff"
                    app:wlv_wave_background_Color="#00ffffff" />
                <!--<com.loonggg.circleprogressbarlibrary.view.CircleProgressBar-->
                <!--android:id="@+id/pb"-->
                <!--android:layout_width="143dp"-->
                <!--android:layout_height="143dp"-->
                <!--android:visibility="gone"-->
                <!--android:layout_centerInParent="true"-->
                <!--loonggg:bgProgressBarColor="#efefef"-->
                <!--loonggg:circleStrokeWidth="5dp" />-->
                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
@@ -347,10 +337,43 @@
                </RelativeLayout>
                <View
                    android:layout_width="0.5dp"
                    android:layout_height="match_parent"
                    android:background="@color/ui_6d" />
                <RelativeLayout
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_alignParentTop="true"
                        android:layout_centerHorizontal="true"
                        android:text="账户余额"
                        android:textColor="@color/ui_68"
                        android:textSize="12sp" />
                    <TextView
                        android:id="@+id/tv_overage"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_alignParentBottom="true"
                        android:layout_centerHorizontal="true"
                        android:layout_centerVertical="true"
                        android:text="--"
                        android:textColor="@color/ui_62"
                        android:textSize="21sp" />
                </RelativeLayout>
            </LinearLayout>
            <RelativeLayout
                android:paddingBottom="30dp"
                android:layout_width="match_parent"
                android:layout_height="match_parent">
                <LinearLayout
@@ -385,6 +408,7 @@
                </LinearLayout>
                <ImageView
                    tools:src="@drawable/ic_charging_pile"
                    tools:visibility="visible"
                    android:id="@+id/iv_activity"
                    android:layout_width="wrap_content"
@@ -396,20 +420,6 @@
                    android:visibility="gone" />
                <TextView
                    tools:visibility="visible"
                    android:id="@+id/tv_activity"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_below="@+id/tv_stop"
                    android:layout_centerHorizontal="true"
                    android:paddingTop="20dp"
                    android:paddingBottom="15dp"
                    android:text=""
                    android:textColor="#ffa900"
                    android:textSize="14sp"
                    android:visibility="visible" />
                <TextView
                    android:layout_centerHorizontal="true"
                    android:textStyle="bold"
                    android:id="@+id/tv_stop"

app/src/main/res/layout/activity_oder_details.xml

@@ -273,6 +273,34 @@
                android:textSize="14sp" />
        </RelativeLayout>
        <RelativeLayout
            tools:visibility="visible"
            android:visibility="gone"
            android:id="@+id/rl_number_plate"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="13dp">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_alignParentLeft="true"
                android:layout_marginLeft="15dp"
                android:text="充电车辆"
                android:textColor="@color/ui_68"
                android:textSize="14sp" />
            <TextView
                android:id="@+id/tv_num_plate"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_alignParentRight="true"
                android:layout_marginRight="15dp"
                tools:text="--"
                android:textColor="@color/ui_68"
                android:textSize="14sp" />
        </RelativeLayout>
    </LinearLayout>

app/src/main/res/layout/activity_submit_orders.xml

@@ -282,6 +282,35 @@
                android:textSize="14sp" />
        </RelativeLayout>
        <RelativeLayout
            tools:visibility="visible"
            android:visibility="gone"
            android:id="@+id/rl_number_plate"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="13dp">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_alignParentLeft="true"
                android:layout_marginLeft="15dp"
                android:text="充电车辆"
                android:textColor="@color/ui_68"
                android:textSize="14sp" />
            <TextView
                android:id="@+id/tv_num_plate"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_alignParentRight="true"
                android:layout_marginRight="15dp"
                tools:text="--"
                android:textColor="@color/ui_68"
                android:textSize="14sp" />
        </RelativeLayout>
    </LinearLayout>
    <TextView

app/src/main/res/layout/layout_update_dialog.xml

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