完成App内部更新

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.electric.chargingpile"
    android:versionCode="104"
    android:versionName="3.5.18">
    android:versionCode="105"
    android:versionName="3.5.19">
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
@@ -76,7 +76,6 @@
    <application
        android:extractNativeLibs="true"
        android:name=".application.MainApplication"
        android:allowBackup="true"
        android:icon="@drawable/icon626"
        android:label="@string/app_name"
        android:largeHeap="true"
@@ -84,6 +83,8 @@
        android:requestLegacyExternalStorage="true"
        android:resizeableActivity="true"
        android:theme="@style/AppTheme"
        tools:replace="android:allowBackup"
        android:allowBackup="false"
        tools:ignore="LockedOrientationActivity">
        <activity
            android:name=".activity.CarOwnerCertificateListActivity"

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

@@ -15,11 +15,13 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.Html;
import android.text.TextUtils;
import android.util.Base64;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -30,6 +32,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
import com.electric.chargingpile.BuildConfig;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.CarOwnerCertificateBean;
@@ -82,6 +85,8 @@ import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
import static android.text.Html.FROM_HTML_MODE_LEGACY;
/**
 * 车主认证
 */
@@ -99,7 +104,7 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
    private TextImageView driving_license_type_first;
    private TextImageView driving_license_type_second;
    private TextImageView driving_license_type_third;
    private TextView add_car_model_btn;
    private TextView add_car_model_btn,tvAuthorize;
    private LoadingDialog loadDialog;
    private ArrayList<CarBrandGroupEntity> groups;
    private CarModelEntity carModelEntity;
@@ -118,6 +123,7 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
    private EditText plate_num;
    private EditText engine_num;
    private EditText register_date;
    private CheckBox checkBox;
    private String drivingLicenseBase64Data;
    private Boolean edit;
@@ -160,6 +166,8 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
        });
        add_car_model_btn = findViewById(R.id.add_car_model_btn);
        checkBox = findViewById(R.id.checkBox);
        tvAuthorize = findViewById(R.id.tvAuthorize);
        car_model_constraint_layout = findViewById(R.id.car_model_constraint_layout);
        car_model_selected_constraint_layout = findViewById(R.id.car_model_selected_constraint_layout);
        add_car_model_btn.setOnClickListener(this);
@@ -245,6 +253,12 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
        } else {
            nav_title.setText("车主认证");
        }
        tvAuthorize.setText(Html.fromHtml("勾选后，即您同意<font color='#3EC34C'>《个人信息处理授权书》</font>并确认授权", FROM_HTML_MODE_LEGACY));
        tvAuthorize.setOnClickListener(v->{
            Intent intent = new Intent(getApplication(), MyWebViewActivity.class);
            intent.putExtra("url", "https://www.d1ev.com/special/change-map/authorization-agreement.html");
            startActivity(intent);
        });
    }
    private void brandListRequest(Boolean showLoading) {
@@ -552,6 +566,11 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
    }
    private void  addCarOwnerCertification() {
        if (!checkBox.isChecked()){
            ToastUtil.showToast(this, "请阅读授权协议并勾选确认", Toast.LENGTH_SHORT);
            return;
        }
        if (carModelEntity == null) {
            ToastUtil.showToast(this, "请添加车型", Toast.LENGTH_SHORT);
            return;

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

@@ -114,13 +114,10 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
        });
        LinearLayout join_car_friends_group = findViewById(R.id.join_car_friends_group);
        join_car_friends_group.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent i = new Intent(getApplication(), MyWebViewActivity.class);
                i.putExtra("url", "https://cdz.evcharge.cc/zhannew/share/share-2.html");
                startActivity(i);
            }
        join_car_friends_group.setOnClickListener(v -> {
            Intent i = new Intent(getApplication(), MyWebViewActivity.class);
            i.putExtra("url", " http://fans.d1ev.com");
            startActivity(i);
        });
    }

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

@@ -157,6 +157,7 @@ import com.zhy.autolayout.AutoLayout;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.FileCallBack;
import com.zhy.http.okhttp.callback.StringCallback;
import com.zhy.http.okhttp.request.RequestCall;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -496,12 +497,16 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                now_versionCode = JsonUtils.getKeyResult(android, "versionCode");
                                now_versionName = JsonUtils.getKeyResult(android, "versionName");
                                String[] key = now_versionName.split("\\.");
                                if (key.length - 1 > 2) {
                                int code = Integer.parseInt(now_versionCode);
                                if (code - getVersionCode(getApplication()) > 0) {
                                    permissionTask();
                                } else {
                                    dialogup();
//                                    permissionTask();
                                }
//                                if (key.length - 1 > 2) {
//                                permissionTask();
//                                } else {
//                                    dialogup();
//                                    permissionTask();
//                                }
                            }
                        }
@@ -719,6 +724,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private TextView tvNotification;
    private RelativeLayout layoutNotification;
    private boolean isShowNotification= false;
    private RequestCall downloadCall;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -3427,7 +3434,13 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private void showProgressWindow() {
        updateDialog = new UpdateDialog(MainMapActivity.this);
        updateDialog.builder().setMsg("").setCancelable(false).show();
        updateDialog.builder().setMsg("")
                .setBtnCancel(v->{
                    if (downloadCall!=null){
                        downloadCall.cancel();
                    }
                })
                .setCancelable(false).show();
    }
    private void dialogup_other() {
@@ -3439,32 +3452,25 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            alterDialog.builder()
                    .setTitle("更新提示 " + now_versionName)
                    .setMsg(title.trim())
                    .setPositiveButton("更新", new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                            showProgressWindow();
                            ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
                            downLoadFile();
                        }
                    }).setNegativeButton("退出", new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    SharedPreferences mySharedPreferences = getSharedPreferences("showdialog",
                            Activity.MODE_PRIVATE);
                    SharedPreferences.Editor editor1 = mySharedPreferences.edit();
                    editor1.clear();
                    finish();
                    ProfileManager.getInstance().setSearchAddress(getApplicationContext(), "");
                    Process.killProcess(Process.myPid());
                }
            }).setCancelable(false).show();
                    .setPositiveButton("更新", v -> {
                        ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
                        downLoadFile();
                    }).setNegativeButton("退出", v -> {
    //                    SharedPreferences mySharedPreferences = getSharedPreferences("showdialog",
    //                            Activity.MODE_PRIVATE);
    //                    SharedPreferences.Editor editor1 = mySharedPreferences.edit();
    //                    editor1.clear();
    //                    finish();
    //                    ProfileManager.getInstance().setSearchAddress(getApplicationContext(), "");
    //                    Process.killProcess(Process.myPid());
                    }).setCancelable(false).show();
        }
    }
    private void downLoadFile() {
        showProgressWindow();
        ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
        OkHttpUtils.get().url("http://cdz.evcharge.cc/app/app.apk").build()
                .execute(new FileCallBack(PhotoUtils.DOWNLOADS, "cdz_install") {
        downloadCall = OkHttpUtils.get().url("http://cdz.evcharge.cc/app/app.apk").build();
        downloadCall.execute(new FileCallBack(PhotoUtils.DOWNLOADS, "cdz_install") {
                    @Override
                    public void inProgress(final float progress, long total) {

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

@@ -11,10 +11,17 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.FileProvider;
import android.os.Process;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
@@ -32,6 +39,8 @@ import android.widget.TextView;
import android.widget.Toast;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.LogUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.manager.ProfileManager;
@@ -42,43 +51,59 @@ import com.electric.chargingpile.util.ImageTools;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.OkHttpUtil;
import com.electric.chargingpile.util.PhotoUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.AlertDialogUpdate;
import com.electric.chargingpile.view.UpdateDialog;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
import com.umeng.analytics.MobclickAgent;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.FileCallBack;
import com.zhy.http.okhttp.callback.StringCallback;
import com.zhy.http.okhttp.request.RequestCall;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;
import java.net.URLEncoder;
import java.security.MessageDigest;
import java.text.NumberFormat;
import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
public class UserCenterMoreActivity extends Activity implements View.OnClickListener {
    private static final String TAG = "UserCenterMoreActivity";
    private static final int RC_READ_EXTERNAL_PERM = 127;
    private RelativeLayout rl_recommend, rl_feedback, rl_about, rl_message, rl_update, rl_alter_password;
    private ImageView iv_back, iv_message, iv_fen;
    private String now_version, app_version;
    private TextView tv_exit;
    private String now_versionCode, now_versionName;
    private String now_versionCode, now_versionName,title;
    private android.view.animation.Animation animation;
    private ImageView point, iv_message_f;
    private LinearLayout logOutLayout;
    private Socket socket;
    private String Token = "";
    static String token = "";
    public static long cha;
    LoadingDialog dialog;
    Context context;
    private AlertDialogUpdate alterDialog;
    private UpdateDialog updateDialog;
    Dialog et_dialog;
    private Handler handler = new Handler() {
    private RequestCall downloadCall;
    private Handler handler = new Handler(Looper.getMainLooper()) {
        // 主线程通过这个方法处理消息
        @Override
        public void handleMessage(Message msg) {
@@ -117,6 +142,8 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
                            now_versionCode = JsonUtils.getKeyResult(android, "versionCode");
                            now_versionName = JsonUtils.getKeyResult(android, "versionName");
                            title = JsonUtils.getKeyResult(jsonArray.toJSONString(), "title");
                            title = title.replace("\\n", "\n");
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
@@ -131,7 +158,7 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
                        }
//
                        if (new_versionCode - getVersionCode(getApplication()) > 0) {
                            dialogup();
                            permissionTask();
                        } else {
                            Toast.makeText(UserCenterMoreActivity.this, "当前为最新版本" + now_versionName, Toast.LENGTH_SHORT).show();
                        }
@@ -160,7 +187,33 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
            }
        }
    };
    private LinearLayout logOutLayout;
    private Handler myHandler = new Handler(Looper.getMainLooper()) {
        @Override
        public void handleMessage(Message msg) {
            super.handleMessage(msg);
            switch (msg.what) {
                case 0x01:
                    Bundle data = msg.getData();
                    String format = data.getString("format");
                    String f = data.getString("progress");
                    String s = f.substring(0, f.indexOf("."));
//                    LogUtils.e(s);
                    updateDialog.updateMsg("当前已下载:" + format);
                    updateDialog.updateProgress(Integer.parseInt(s));
                    break;
            }
        }
    };
    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -169,6 +222,7 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
        BarColorUtil.initStatusBarColor(UserCenterMoreActivity.this);
        dialog = new LoadingDialog(this);
        dialog.setCanceledOnTouchOutside(false);
        context = this;
        initView();
    }
@@ -718,12 +772,8 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
                .setPositiveButton("要，马上要", new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                        Intent intent = new Intent();
                        intent.setAction("android.intent.action.VIEW");
                        intent.addCategory(Intent.CATEGORY_BROWSABLE);
                        Uri content_url = Uri.parse("http://cdz.evcharge.cc/app/app.apk");
                        intent.setData(content_url);
                        startActivity(Intent.createChooser(intent, "请选择浏览器"));
                        ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
                        downLoadFile();
                    }
                }).setNegativeButton("先退下", new View.OnClickListener() {
            @Override
@@ -850,8 +900,106 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
            }
        });
    }
    private void showProgressWindow() {
        updateDialog = new UpdateDialog(UserCenterMoreActivity.this);
        updateDialog.builder().setMsg("")
                .setBtnCancel(v->{
                    if (downloadCall!=null){
                        downloadCall.cancel();
                    }
                })
                .setCancelable(false).show();
    }
    private void downLoadFile() {
        showProgressWindow();
        ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
        downloadCall = OkHttpUtils.get().url("http://cdz.evcharge.cc/app/app.apk").build();
        downloadCall.execute(new FileCallBack(PhotoUtils.DOWNLOADS, "cdz_install") {
            @Override
            public void inProgress(final float progress, long total) {
                NumberFormat numberFormat = NumberFormat.getInstance();
                // 设置精确到小数点后2位
                numberFormat.setMaximumFractionDigits(2);
                String format = numberFormat.format(progress * 100);
                Message message = new Message();
                message.what = 0x01;
                Bundle bundle = new Bundle();
                bundle.putString("format", format + "%");
//                        LogUtils.e("当前：" + format);
                if (!format.contains(".")) {
                    bundle.putString("progress", format + ".");
                } else {
                    bundle.putString("progress", format);
                }
                message.setData(bundle);
                myHandler.sendMessage(message);
            }
            @Override
            public void onError(Call call, Exception e) {
                LogUtils.e(e.getMessage());
            }
            @Override
            public void onResponse(File response) {
                String path = getDatabasePath("zhan_list").getPath();
                com.blankj.utilcode.util.LogUtils.e(path);
                AppUtils.cleanAppData(path);
                Log.e("hyc","**------**"+response.getAbsolutePath());
                Log.e("hyc","**------**"+!response.exists());
                if (!response.exists()){
                    Toast.makeText(context, "文件不存在", Toast.LENGTH_SHORT).show();
                    return  ;
                }
                Intent intent = new Intent();
                intent.setAction(android.content.Intent.ACTION_VIEW);
                Uri uri;
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                    Uri contentUri = FileProvider.getUriForFile(context,
                            context.getApplicationContext().getPackageName() + ".provider",
                            response);
                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                    intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                    intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
                } else {
                    uri = Uri.fromFile(response);
                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                    intent.setDataAndType(uri, "application/vnd.android.package-archive");
                }
                context.startActivity(intent);
                android.os.Process.killProcess(android.os.Process.myPid());
            }
        });
    }
    @AfterPermissionGranted(RC_READ_EXTERNAL_PERM)
    public void permissionTask() {
        if (isPermissionOK()) {
            dialogup();
        } else {
            EasyPermissions.requestPermissions(
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
                    RC_READ_EXTERNAL_PERM,
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
                    Manifest.permission.READ_EXTERNAL_STORAGE);
        }
    }
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
    }
    @Override
    protected void onPause() {
        super.onPause();

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

@@ -8,7 +8,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.electric.chargingpile.R;
@@ -20,12 +22,13 @@ public class UpdateDialog {
    private android.app.Dialog dialog;
    private LinearLayout layout_bg;
    private TextView txt_msg;
    private ImageView imgCancel;
    private Display display;
    private boolean showTitle = false;
    private boolean showMsg = false;
    private boolean showPosBtn = false;
    private boolean showNegBtn = false;
    private QMUIProgressBar qmuiProgressBar;
    private ProgressBar qmuiProgressBar;
    public UpdateDialog(Context context) {
        this.context = context;
@@ -41,12 +44,13 @@ public class UpdateDialog {
        // 获取自定义Dialog布局中的控件
        layout_bg = view.findViewById(R.id.layout_bg);
        imgCancel = view.findViewById(R.id.imgCancel);
        txt_msg = (TextView) view.findViewById(R.id.txt_msg);
        txt_msg.setVisibility(View.GONE);
        qmuiProgressBar = view.findViewById(R.id.qMUIProgressBar);
        qmuiProgressBar.setMaxValue(100);
        qmuiProgressBar.setMax(100);
        // 定义Dialog布局和参数
        dialog = new Dialog(context, R.style.AlertDialogStyle);
@@ -54,7 +58,7 @@ public class UpdateDialog {
        // 调整dialog背景大小
        layout_bg.setLayoutParams(new FrameLayout.LayoutParams((int) (display
                .getWidth() * 0.85), LinearLayout.LayoutParams.WRAP_CONTENT));
                .getWidth() * 0.65), LinearLayout.LayoutParams.WRAP_CONTENT));
        return this;
    }
@@ -73,6 +77,15 @@ public class UpdateDialog {
        dialog.setCancelable(cancel);
        return this;
    }
    public UpdateDialog setBtnCancel(View.OnClickListener listener) {
        if (imgCancel!=null){
            imgCancel.setOnClickListener(v -> {
                listener.onClick(v);
                dialog.dismiss();
            });
        }
        return this;
    }
    private void setLayout() {
@@ -87,10 +100,13 @@ public class UpdateDialog {
    }
    public void updateMsg(String msg) {
        txt_msg.setText(msg);
    }
    public void updateProgress(int i) {
        qmuiProgressBar.setProgress(i);
        if (txt_msg!=null){
            txt_msg.setText(i+"%");
        }
    }
}

app/src/main/res/drawable/bg_car_owner_check.xml

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@drawable/ic_select_check_square" android:state_checked="true"/>
    <item android:drawable="@drawable/ic_no_check_square"  android:state_checked="false"/>
    <item android:drawable="@drawable/ic_no_check_square"/>
</selector>

app/src/main/res/drawable/progressbar_color.xml

@@ -0,0 +1,39 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
    <!-- 背景  gradient是渐变,corners定义的是圆角 -->
    <item android:id="@android:id/background"
        android:layout_width="wrap_content">
        <shape>
            <corners android:radius="10dp" />
            <solid android:color="#ECECEC" />
        </shape>
    </item>
    <!-- 第二条进度条颜色 -->
    <item android:id="@android:id/secondaryProgress">
        <clip>
            <shape>
                <corners android:radius="10dp" />
                <gradient
                    android:angle="90.0"
                    android:centerColor="#aadfdf"
                    android:centerY="0.45"
                    android:endColor="#aadfdf"
                    android:startColor="#aadfdf" />
            </shape>
        </clip>
    </item>
    <!-- 进度条 -->
    <item android:id="@android:id/progress">
        <clip>
            <shape>
                <corners android:radius="10dp" />
                <solid android:color="#3EC34C" />
            </shape>
        </clip>
    </item>
</layer-list>

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

@@ -47,7 +47,7 @@
        android:layout_height="0dp"
        android:orientation="vertical"
        android:scrollbars="none"
        app:layout_constraintBottom_toTopOf="@+id/submit_btn"
        app:layout_constraintBottom_toTopOf="@+id/layoutAuthorize"
        app:layout_constraintTop_toBottomOf="@+id/nav_bar">
        <androidx.constraintlayout.widget.ConstraintLayout
@@ -353,7 +353,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="10dp"
                android:layout_marginBottom="30dp"
                android:layout_marginBottom="60dp"
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.首次车主认证审核通过有充电满减和折扣红包\n6.红包自发放日起有效期为一个月"
                android:textColor="#0D1120"
                android:textSize="14sp"
@@ -361,7 +361,34 @@
                app:layout_constraintTop_toBottomOf="@+id/driving_license_type" />
        </androidx.constraintlayout.widget.ConstraintLayout>
    </ScrollView>
    <LinearLayout
        android:orientation="horizontal"
        android:gravity="center"
        android:layout_marginBottom="10dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        android:id="@+id/layoutAuthorize"
        app:layout_constraintBottom_toTopOf="@+id/submit_btn"
        android:layout_width="0dp"
        android:layout_height="wrap_content">
        <CheckBox
            android:padding="5dp"
            android:layout_gravity="center"
            android:gravity="center"
            style="@style/SquareCheckboxTheme"
            android:id="@+id/checkBox"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"/>
        <TextView
            android:gravity="center"
            android:id="@+id/tvAuthorize"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:text="勾选后，即您同意《个人信息处理授权书》并确认授权"
            android:textColor="#ff9b9b9b"
            android:textSize="12sp"
            />
    </LinearLayout>
    <Button
        android:id="@+id/submit_btn"
        android:layout_width="match_parent"

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

@@ -1,34 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/layout_bg"
    android:layout_width="match_parent"
    android:layout_height="200dp"
    android:layout_height="wrap_content"
    android:background="@drawable/offlinearrow_but_normal"
    android:orientation="vertical">
    <TextView
        android:id="@+id/txt_msg"
        android:gravity="center"
        android:text="下载中"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center|left"
        android:textColor="@color/ui_62"
        android:layout_marginLeft="16dp"
        android:layout_marginTop="16dp"
        android:layout_marginBottom="16dp"
        android:textColor="@color/color_0e0e0e"
        android:layout_marginTop="30dp"
        android:layout_marginBottom="20dp"
        android:textSize="16sp" />
    <com.qmuiteam.qmui.widget.QMUIProgressBar
    <ProgressBar
        style="?android:attr/progressBarStyleHorizontal"
        tools:progress="45"
        android:id="@+id/qMUIProgressBar"
        android:layout_width="match_parent"
        android:layout_height="12dp"
        android:textColor="@color/lvse"
        android:layout_height="10dp"
        android:progressDrawable="@drawable/progressbar_color"
        android:textSize="12sp"
        android:layout_marginBottom="20dp"
        android:layout_marginBottom="6dp"
        android:layout_marginLeft="16dp"
        android:layout_marginRight="16dp"
        app:qmui_background_color="@color/ui_68"
        app:qmui_progress_color="@color/lvse"
        app:qmui_type="type_rect"/>
       />
    <TextView
        android:id="@+id/txt_msg"
        tools:text="12"
        android:textColor="#3EC34C"
        android:textSize="14sp"
        android:layout_marginEnd="18dp"
        android:layout_gravity="end"
        android:layout_marginBottom="30dp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"/>
    <ImageView
        android:id="@+id/imgCancel"
        android:layout_marginBottom="30dp"
        android:layout_gravity="center"
        android:src="@drawable/ic_cancel_updata"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"/>
</LinearLayout>

app/src/main/res/values/styles.xml

@@ -377,4 +377,7 @@
    <style name="CustomCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
        <item name="android:button">@drawable/checkbox_style</item>
    </style>
    <style name="SquareCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
        <item name="android:button">@drawable/bg_car_owner_check</item>
    </style>
</resources>

autolayout/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.zhy.autolayout">
    <application android:allowBackup="true"
    <application android:allowBackup="false"
                 android:label="@string/app_name"
        >

zxing/src/main/AndroidManifest.xml

@@ -28,6 +28,7 @@
    <supports-screens android:xlargeScreens="true"
        android:largeScreens="true"
        android:normalScreens="true"
        android:allowBackup="false"
        android:smallScreens="true"
        android:anyDensity="true"/>

zxing/src/main/java/com/google/zxing/client/android/constant/UrlConstants.java

@@ -5,7 +5,8 @@ public interface UrlConstants {
//    String HOST_URL = "http://59.110.68.162/zhannew/basic/web/index.php/"; //测试链接
    String USER_CHARGING_CHECK_URL = HOST_URL + "api/charge/check-user";
    String START_CHARGING_URL = HOST_URL + "api/charge/start";
//    String START_CHARGING_URL = HOST_URL + "api/charge/start";
    String START_CHARGING_URL = HOST_URL + "api/charge/start2";
    String CHARGING_STATUS_URL = HOST_URL + "api/charge/query";
    String STOP_CHARGING_URL = HOST_URL + "api/charge/close";//关闭充电