添加注销账号功能，优化充电页button被虚拟按键遮挡

app/src/main/AndroidManifest.xml

@@ -321,6 +321,9 @@
            android:launchMode="singleTask"
            android:screenOrientation="portrait" />
        <activity
            android:name=".activity.LogOutActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name=".activity.ImageFile4Claim"
            android:label="@string/title_activity_image_file4_claim"
            android:screenOrientation="portrait" />

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

@@ -0,0 +1,228 @@
package com.electric.chargingpile.activity;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.ImageTools;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.view.StateDialog;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.net.URLEncoder;
import okhttp3.Call;
import pub.devrel.easypermissions.EasyPermissions;
public class LogOutActivity extends AppCompatActivity {
    private TextView text;
    private String state;
    private View unSubmittedLayout;
    private View unRegisterLayout;
    @Override
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_logout);
        BarColorUtil.initStatusBarColor(LogOutActivity.this);
        initView();
        initIntent();
    }
    private void initIntent() {
        state = getIntent().getStringExtra("state");
        if (state !=null && state.equals("1")){
            text.setText("不注销了");
            unSubmittedLayout.setVisibility(View.GONE);
            unRegisterLayout.setVisibility(View.VISIBLE);
        }else {
            text.setText("确定注销");
            unSubmittedLayout.setVisibility(View.VISIBLE);
            unRegisterLayout.setVisibility(View.GONE);
        }
    }
    private void initView() {
        findViewById(R.id.iv_back).setOnClickListener(v->{
            finish();
        });
        text = findViewById(R.id.text);
        unSubmittedLayout = findViewById(R.id.unRegisterLayout);
        unRegisterLayout = findViewById(R.id.unRegisterLayout);
        text.setOnClickListener(v->{
            if (state !=null && state.equals("1")){
                cancelLogout();
            }else{
                applyLogOutNet();
            }
        });
    }
    private void showDialog(String str){
        new StateDialog(this)
                .builder()
                .setImg(R.drawable.ic_logout_dialog2)
                .setCancelable(true)
                .setContent(str)
                .show();
    }
    /**
     * 申请注销
     * */
    private  void applyLogOutNet(){
        String url=MainApplication.url +"/zhannew/basic/web/index.php/userdel/add?phone="+ MainApplication.userPhone+"&password="+MainApplication.userPassword;
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
            }
            @SuppressLint("CommitPrefEdits")
            @Override
            public void onResponse(String response) {
                Log.e("onResponse applyLogOutNet", response);
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if (rtnCode.equals("01")){
                    try {
                        sendLoginStatus();
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    deleteUserInfo();
                    SharedPreferences sharedPreferences = getSharedPreferences("userInfo",
                            Activity.MODE_PRIVATE);
                    sharedPreferences.edit().clear();
                    startActivity(new Intent(LogOutActivity.this,MainMapActivity.class));
                }else{
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
                    showDialog(rtnMsg);
                }
            }
        });
    }
    /**
     * 取消注销
     * */
    private void cancelLogout(){
        String url=MainApplication.url +"/zhannew/basic/web/index.php/userdel/del?phone="+ MainApplication.userPhone+"&password="+MainApplication.userPassword;
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
            }
            @Override
            public void onResponse(String response) {
                Log.e("onResponse cancelLogout", response);
                String code = JsonUtils.getKeyResult(response, "code");
            }
        });
    }
    //发送用户退出状态接口
    private void sendLoginStatus() throws Exception {
        long appTime1 = System.currentTimeMillis() / 1000;
        Log.i("appTime(long)---", appTime1 + "");
        long updatetime = appTime1 - MainMapActivity.cha - 3;
        Log.i("updatetime(long)---", updatetime + "");
        Log.i("cha---", MainMapActivity.cha + "");
        String token = String.valueOf(updatetime);
        String encode_token = DES3.encode(token);
        String replace = URLEncoder.encode(encode_token, "UTF-8");
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/logout?phone="
                + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword, "UTF-8") + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
        Log.i("token解密：", DES3.decode(encode_token));
        OkHttpUtils.get()
                .url(url)
                .build()
                .execute(new StringCallback() {
                    @Override
                    public void onError(Call call, Exception e) {
                    }
                    @Override
                    public void onResponse(String response) {
                        Log.e("exitLogin===", response);
                    }
                });
    }
    private void deleteUserInfo() {
        //保存用户id
        MainApplication.userId = "";
        ProfileManager.getInstance().setUserid(getApplicationContext(), "");
        //保存用户昵称
        MainApplication.userNickname = "";
        ProfileManager.getInstance().setNickname(getApplicationContext(), "");
        //保存用户手机号
        MainApplication.userPhone = "";
        ProfileManager.getInstance().setUsername(getApplicationContext(), "");
        //保存用户头像
        MainApplication.userIcon = "";
        ProfileManager.getInstance().setUsericon(getApplicationContext(), "");
        //保存用户车型
        MainApplication.userCar = "";
        ProfileManager.getInstance().setUsercar(getApplicationContext(), "");
        //保存用户密码
        MainApplication.userPassword = "";
        //保存用户意向车型
        MainApplication.userCarIntentMode = "";
        ProfileManager.getInstance().setCarIntentModel(getApplicationContext(), "");
        ProfileManager.getInstance().setKeyUserpassword(getApplicationContext(), "");
        if (isPermissionOK()) {
            if (ImageTools.findPhotoFromSDCard(MainApplication.storePath, "user_icon")) {
                ImageTools.deletePhotoAtPathAndName(MainApplication.storePath, "user_icon");
            }
        }
        MainApplication.userCertifiedModel="";
    }
    private boolean isPermissionOK() {
        return EasyPermissions.hasPermissions(this,
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
                Manifest.permission.READ_EXTERNAL_STORAGE
        );
    }
    /**
     * @param state  0表示由UserCenterMoreActivity打开 1 表示从登录页面跳转过来
     * */
    public static void actionStart(Context context,String state){
        Intent intent = new Intent(context, LogOutActivity.class);
        intent.putExtra("state",state);
        context.startActivity(intent);
    }
}

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

@@ -936,7 +936,7 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
//                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
//                startActivity(i);
                Intent i = new Intent(getApplication(), MyWebViewActivity.class);
                i.putExtra("url", "https://cdz.evcharge.cc/zhannew/share/share-2.html");
                i.putExtra("url", "http://fans.d1ev.com/");
                startActivity(i);
                break;

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

@@ -182,6 +182,7 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
        rl_about = (RelativeLayout) findViewById(R.id.rl_about);
        rl_about.setOnClickListener(this);
        findViewById(R.id.rl_alter_password).setOnClickListener(this);
        findViewById(R.id.logOutLayout).setOnClickListener(this);
//        iv_fen = (ImageView) findViewById(R.id.imageView11);
@@ -402,6 +403,15 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
//                    }
//                }).show();
                break;
            case R.id.logOutLayout:
                if (!MainApplication.isLogin()) {
                    Toast.makeText(getApplication(), "请先登录", Toast.LENGTH_SHORT).show();
                    startActivity(new Intent(getApplication(), LoginActivity.class));
                }else{
                    LogOutActivity.actionStart(this,"0");
                }
                break;
        }
    }

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

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

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

@@ -0,0 +1,82 @@
package com.electric.chargingpile.view;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.Display;
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.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import com.electric.chargingpile.R;
import com.electric.chargingpile.util.DensityUtil;
public class StateDialog {
    private Context mContext;
    private Display mDisPlay;
    private Dialog mDialog;
    private TextView stateText;
    private ImageView stateImg;
    public StateDialog(Context context) {
        mContext = context;
        WindowManager windowManager = (WindowManager) context
                .getSystemService(Context.WINDOW_SERVICE);
        mDisPlay = windowManager.getDefaultDisplay();
    }
    public StateDialog builder() {
        // 获取Dialog布局
        View view = LayoutInflater.from(mContext).inflate(
                R.layout.dialog_state, null);
        // 获取自定义Dialog布局中的控件
        RelativeLayout stateLayout = (RelativeLayout) view.findViewById(R.id.stateLayout);
        stateText = view.findViewById(R.id.stateText);
        stateImg = view.findViewById(R.id.stateImg);
        mDialog = new Dialog(mContext, R.style.AlertDialogStyle);
        mDialog.setContentView(view);
        // 调整dialog背景大小
        stateLayout.setLayoutParams(new FrameLayout.LayoutParams(
                DensityUtil.dip2px(mContext,  268),
                DensityUtil.dip2px(mContext, 124)
        ));
        return this;
    }
    public StateDialog setContent(String str){
        if (stateText!=null){
            stateText.setText(str);
        }
        return this;
    }
    public StateDialog setImg(@DrawableRes int resId){
        if (stateImg!=null){
            stateImg.setImageResource(resId);
        }
        return this;
    }
    public StateDialog setCancelable(boolean cancel) {
        mDialog.setCancelable(cancel);
        mDialog.setCanceledOnTouchOutside(cancel);
        return this;
    }
    public void show() {
        mDialog.show();
    }
}

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

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
        <shape android:shape="rectangle">
            <solid android:color="@color/white" />
            <corners android:radius="6dp" />
        </shape>
    </item>
</selector>

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

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

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

@@ -50,370 +50,380 @@
    </RelativeLayout>
    <LinearLayout
        android:id="@+id/ll_charginginfo"
    <androidx.core.widget.NestedScrollView
        android:fillViewport="true"
        android:layout_width="match_parent"
        android:layout_height="72dp"
        android:layout_below="@+id/rl_circle"
        android:layout_marginLeft="12dp"
        android:layout_marginTop="26dp"
        android:layout_marginRight="12dp"
        android:orientation="horizontal">
        <RelativeLayout
            android:background="@drawable/bg_f9f9fb_radius14"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1">
            <ImageView
                android:id="@+id/imgA"
                android:gravity="center_vertical"
                android:layout_marginStart="10dp"
                android:layout_centerVertical="true"
                android:src="@drawable/ic_dianliu"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"/>
        android:layout_height="wrap_content">
        <LinearLayout
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="match_parent">
            <LinearLayout
                android:layout_centerInParent="true"
                android:orientation="vertical"
                android:layout_alignParentEnd="true"
                android:layout_toEndOf="@+id/imgA"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content">
                <TextView
                    android:gravity="center"
                    android:id="@+id/tv_dianliu"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="--"
                    android:textStyle="bold"
                    android:textColor="@color/color_0e0e0e"
                    android:textSize="18sp" />
                <TextView
                    android:layout_marginTop="8dp"
                    android:gravity="center"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="电流(安)"
                    android:textColor="@color/color_0e0e0e"
                    android:textSize="12sp" />
                android:id="@+id/ll_charginginfo"
                android:layout_width="match_parent"
                android:layout_height="72dp"
                android:layout_below="@+id/rl_circle"
                android:layout_marginLeft="12dp"
                android:layout_marginTop="26dp"
                android:layout_marginRight="12dpdp"
                android:orientation="horizontal">
                <RelativeLayout
                    android:background="@drawable/bg_f9f9fb_radius14"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">
                    <ImageView
                        android:id="@+id/imgA"
                        android:gravity="center_vertical"
                        android:layout_marginStart="10dp"
                        android:layout_centerVertical="true"
                        android:src="@drawable/ic_dianliu"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"/>
                    <LinearLayout
                        android:layout_centerInParent="true"
                        android:orientation="vertical"
                        android:layout_alignParentEnd="true"
                        android:layout_toEndOf="@+id/imgA"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content">
                        <TextView
                            android:gravity="center"
                            android:id="@+id/tv_dianliu"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:text="--"
                            android:textStyle="bold"
                            android:textColor="@color/color_0e0e0e"
                            android:textSize="18sp" />
                        <TextView
                            android:layout_marginTop="8dp"
                            android:gravity="center"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:text="电流(安)"
                            android:textColor="@color/color_0e0e0e"
                            android:textSize="12sp" />
                    </LinearLayout>
                </RelativeLayout>
                <RelativeLayout
                    android:background="@drawable/bg_f9f9fb_radius14"
                    android:layout_marginEnd="10dp"
                    android:layout_marginStart="10dp"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">
                    <ImageView
                        android:id="@+id/imgV"
                        android:gravity="center_vertical"
                        android:layout_marginStart="10dp"
                        android:layout_centerVertical="true"
                        android:src="@drawable/ic_dianya"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"/>
                    <LinearLayout
                        android:layout_centerInParent="true"
                        android:layout_alignParentEnd="true"
                        android:layout_toEndOf="@+id/imgV"
                        android:orientation="vertical"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content">
                        <TextView
                            android:gravity="center"
                            android:id="@+id/tv_dianya"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:text="--"
                            android:textStyle="bold"
                            android:textColor="@color/color_0e0e0e"
                            android:textSize="18sp" />
                        <TextView
                            android:layout_marginTop="8dp"
                            android:gravity="center"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:text="电压(伏)"
                            android:textColor="@color/color_0e0e0e"
                            android:textSize="12sp" />
                    </LinearLayout>
                </RelativeLayout>
                <RelativeLayout
                    android:background="@drawable/bg_f9f9fb_radius14"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">
                    <ImageView
                        android:id="@+id/imgProgrees"
                        android:gravity="center_vertical"
                        android:layout_marginStart="10dp"
                        android:layout_centerVertical="true"
                        android:src="@drawable/ic_jindu"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"/>
                    <LinearLayout
                        android:layout_centerInParent="true"
                        android:orientation="vertical"
                        android:layout_alignParentEnd="true"
                        android:layout_toEndOf="@+id/imgProgrees"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content">
                        <TextView
                            android:textStyle="bold"
                            android:gravity="center"
                            android:id="@+id/tv_jindu"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:text="--"
                            android:textColor="@color/color_0e0e0e"
                            android:textSize="18sp" />
                        <TextView
                            android:layout_marginTop="8dp"
                            android:gravity="center"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:text="充电进程"
                            android:textColor="@color/color_0e0e0e"
                            android:textSize="12sp" />
                    </LinearLayout>
                </RelativeLayout>
            </LinearLayout>
        </RelativeLayout>
        <RelativeLayout
            android:background="@drawable/bg_f9f9fb_radius14"
            android:layout_marginEnd="10dp"
            android:layout_marginStart="10dp"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1">
            <ImageView
                android:id="@+id/imgV"
                android:gravity="center_vertical"
                android:layout_marginStart="10dp"
                android:layout_centerVertical="true"
                android:src="@drawable/ic_dianya"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"/>
            <LinearLayout
                android:layout_centerInParent="true"
                android:layout_alignParentEnd="true"
                android:layout_toEndOf="@+id/imgV"
                android:orientation="vertical"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content">
                <TextView
                    android:gravity="center"
                    android:id="@+id/tv_dianya"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="--"
                    android:textStyle="bold"
                    android:textColor="@color/color_0e0e0e"
                    android:textSize="18sp" />
                <TextView
                    android:layout_marginTop="8dp"
                    android:gravity="center"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="电压(伏)"
                    android:textColor="@color/color_0e0e0e"
                    android:textSize="12sp" />
            </LinearLayout>
        </RelativeLayout>
        <RelativeLayout
            android:background="@drawable/bg_f9f9fb_radius14"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1">
            <ImageView
                android:id="@+id/imgProgrees"
                android:gravity="center_vertical"
                android:layout_marginStart="10dp"
                android:layout_centerVertical="true"
                android:src="@drawable/ic_jindu"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"/>
            <LinearLayout
                android:layout_centerInParent="true"
                android:orientation="vertical"
                android:layout_alignParentEnd="true"
                android:layout_toEndOf="@+id/imgProgrees"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content">
                <TextView
                    android:textStyle="bold"
                    android:gravity="center"
                    android:id="@+id/tv_jindu"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="--"
                    android:textColor="@color/color_0e0e0e"
                    android:textSize="18sp" />
               <RelativeLayout
                android:id="@+id/rl_circle"
                android:layout_width="172dp"
                android:layout_height="172dp"
                android:layout_centerHorizontal="true"
                android:layout_gravity="center_horizontal"
                android:layout_marginTop="40dp"
                android:background="@drawable/bg_charging">
                <TextView
                    android:layout_marginTop="8dp"
                    android:gravity="center"
                <me.itangqi.waveloadingview.WaveLoadingView
                    android:id="@+id/waveLoadingView"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    app:wlv_borderColor="#00ffffff"
                    app:wlv_borderWidth="1dp"
                    app:wlv_round_rectangle="false"
                    app:wlv_shapeType="circle"
                    app:wlv_titleCenterStrokeColor="@android:color/holo_blue_dark"
                    app:wlv_titleCenterStrokeWidth="3dp"
                    app:wlv_waveAmplitude="60"
                    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"
                    android:text="充电进程"
                    android:textColor="@color/color_0e0e0e"
                    android:textSize="12sp" />
            </LinearLayout>
        </RelativeLayout>
    </LinearLayout>
    <RelativeLayout
        android:id="@+id/rl_circle"
        android:layout_width="172dp"
        android:layout_height="172dp"
        android:layout_centerHorizontal="true"
        android:layout_gravity="center_horizontal"
        android:layout_marginTop="40dp"
        android:background="@drawable/bg_charging">
        <me.itangqi.waveloadingview.WaveLoadingView
            android:id="@+id/waveLoadingView"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            app:wlv_borderColor="#00ffffff"
            app:wlv_borderWidth="1dp"
            app:wlv_round_rectangle="false"
            app:wlv_shapeType="circle"
            app:wlv_titleCenterStrokeColor="@android:color/holo_blue_dark"
            app:wlv_titleCenterStrokeWidth="3dp"
            app:wlv_waveAmplitude="60"
            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"
            android:layout_centerInParent="true"
            android:orientation="vertical"
            android:visibility="visible">
                    android:layout_centerInParent="true"
                    android:orientation="vertical"
                    android:visibility="visible">
                    <TextView
                        android:id="@+id/tv_chongdianliang"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="center"
                        android:text=""
                        android:textColor="@color/white"
                        android:textSize="40sp" />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="center"
                        android:layout_marginTop="5dp"
                        android:text="充电量(度)"
                        android:textColor="@color/white"
                        android:textSize="12sp" />
                </LinearLayout>
            </RelativeLayout>
            <TextView
                android:id="@+id/tv_chongdianliang"
                android:id="@+id/tv_zhuang_num"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:layout_gravity="center_horizontal"
                android:layout_marginTop="33dp"
                android:drawableLeft="@drawable/icon_zhan_name"
                android:drawablePadding="8dp"
                android:gravity="center_vertical"
                android:text=""
                android:textColor="@color/white"
                android:textSize="40sp" />
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:layout_marginTop="5dp"
                android:text="充电量(度)"
                android:textColor="@color/white"
                android:textSize="12sp" />
        </LinearLayout>
    </RelativeLayout>
    <TextView
        android:id="@+id/tv_zhuang_num"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
        android:layout_marginTop="33dp"
        android:drawableLeft="@drawable/icon_zhan_name"
        android:drawablePadding="8dp"
        android:gravity="center_vertical"
        android:text=""
        android:textColor="@color/ui_62"
        android:textSize="18sp" />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="49dp"
        android:layout_marginTop="38dp"
        android:orientation="horizontal">
        <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_time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_alignParentBottom="true"
                android:layout_centerHorizontal="true"
                android:text="--"
                android:textColor="@color/ui_62"
                android:textSize="21sp" />
                android:textSize="18sp" />
        </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" />
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="49dp"
                android:layout_marginTop="38dp"
                android:orientation="horizontal">
                <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_time"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_alignParentBottom="true"
                        android:layout_centerHorizontal="true"
                        android:text="--"
                        android:textColor="@color/ui_62"
                        android:textSize="21sp" />
                </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_cost"
                        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>
            <TextView
                android:id="@+id/tv_cost"
                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" />
            </LinearLayout>
        </RelativeLayout>
    </LinearLayout>
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent">
                <LinearLayout
                    tools:visibility="visible"
                    android:visibility="gone"
                    android:id="@+id/layoutCarCertificate"
                    android:background="@drawable/bg_f9f9fb_radius5"
                    android:paddingBottom="3dp"
                    android:paddingTop="3dp"
                    android:paddingStart="13dp"
                    android:paddingEnd="13dp"
                    android:layout_marginTop="30dp"
                    android:layout_centerHorizontal="true"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content">
                    <TextView
                        android:id="@+id/certifiedCarOwner"
                        android:drawablePadding="12dp"
                        android:drawableLeft="@drawable/ic_certification"
                        android:layout_marginEnd="35dp"
                        android:gravity="center"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="认证车主有优惠哦～"
                        android:textColor="@color/color_0e0e0e"
                        android:textSize="14sp"
                        />
                    <ImageView
                        android:src="@drawable/right_cursor"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"/>
                </LinearLayout>
                <ImageView
                    tools:visibility="visible"
                    android:id="@+id/iv_activity"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_alignParentTop="true"
                    android:layout_alignParentRight="true"
                    android:layout_marginTop="21dp"
                    android:layout_marginRight="13dp"
                    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" />
    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent">
        <LinearLayout
            tools:visibility="visible"
            android:visibility="gone"
            android:id="@+id/layoutCarCertificate"
            android:background="@drawable/bg_f9f9fb_radius5"
            android:paddingBottom="3dp"
            android:paddingTop="3dp"
            android:paddingStart="13dp"
            android:paddingEnd="13dp"
            android:layout_marginTop="30dp"
            android:layout_centerHorizontal="true"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content">
            <TextView
                android:id="@+id/certifiedCarOwner"
                android:drawablePadding="12dp"
                android:drawableLeft="@drawable/ic_certification"
                android:layout_marginEnd="35dp"
                android:gravity="center"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:text="认证车主有优惠哦～"
                android:textColor="@color/color_0e0e0e"
                android:textSize="14sp"
                />
            <ImageView
                android:src="@drawable/right_cursor"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"/>
                <TextView
                    android:layout_centerHorizontal="true"
                    android:textStyle="bold"
                    android:id="@+id/tv_stop"
                    android:layout_width="160dp"
                    android:layout_height="42dp"
                    android:layout_alignParentBottom="true"
                    android:layout_marginBottom="94dp"
                    android:background="@drawable/bg_3ec34c_radius10"
                    android:gravity="center"
                    android:text="结束充电"
                    android:textColor="@color/color_3ec34c"
                    android:textSize="18sp" />
            </RelativeLayout>
        </LinearLayout>
        <ImageView
            tools:visibility="visible"
            android:id="@+id/iv_activity"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentTop="true"
            android:layout_alignParentRight="true"
            android:layout_marginTop="21dp"
            android:layout_marginRight="13dp"
            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"
            android:layout_width="160dp"
            android:layout_height="42dp"
            android:layout_alignParentBottom="true"
            android:layout_marginBottom="94dp"
            android:background="@drawable/bg_3ec34c_radius10"
            android:gravity="center"
            android:text="结束充电"
            android:textColor="@color/color_3ec34c"
            android:textSize="18sp" />
    </RelativeLayout>
    </androidx.core.widget.NestedScrollView>
</LinearLayout>

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

@@ -0,0 +1,224 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    xmlns:tools="http://schemas.android.com/tools"
    android:orientation="vertical"
    android:background="@color/color_f6f6f6"
    android:layout_height="match_parent">
    <com.zhy.autolayout.AutoRelativeLayout
        android:layout_width="fill_parent"
        android:layout_height="130px"
        android:background="@color/title_background">
        <TextView
            android:id="@+id/title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerInParent="true"
            android:text="注销"
            android:textColor="@color/ui_62"
            android:textSize="16sp" />
        <ImageView
            android:id="@+id/iv_back"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentLeft="true"
            android:layout_centerVertical="true"
            android:contentDescription="@null"
            android:paddingBottom="4dp"
            android:paddingLeft="44px"
            android:paddingRight="44px"
            android:paddingTop="4dp"
            android:src="@drawable/icon_lvback1119" />
    </com.zhy.autolayout.AutoRelativeLayout>
    <LinearLayout
        android:orientation="vertical"
        android:id="@+id/unSubmittedLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">
        <ImageView
            android:layout_marginTop="40dp"
            android:layout_gravity="center"
            android:src="@drawable/ic_logout_hint"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"/>
        <TextView
            android:layout_gravity="center"
            android:layout_marginTop="30dp"
            android:textStyle="bold"
            android:gravity="center"
            android:layout_marginEnd="60dp"
            android:layout_marginStart="60dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:text="非常遗憾不能继续为您服务\n感谢您的支持和陪伴"
            android:textColor="@color/color_0e0e0e"
            android:textSize="21sp"
            />
        <TextView
            android:layout_marginTop="20dp"
            android:layout_marginEnd="12dp"
            android:layout_marginStart="12dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:text="注销账号前我们需要确认以下是否有未完成或未结算，以保证您的帐号安全"
            android:textColor="#ff707070"
            android:textSize="12sp"
            />
        <LinearLayout
            android:background="@drawable/bg_radius_6_white"
            android:layout_marginTop="20dp"
            android:layout_marginEnd="12dp"
            android:layout_marginStart="12dp"
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">
            <LinearLayout
                android:padding="14dp"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TextView
                    android:layout_gravity="center_vertical"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="●"
                    android:textColor="@color/color_707070"
                    android:textSize="4sp"
                    />
                <TextView
                    android:layout_marginStart="6dp"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="您的账号当前没有正在充电的订单"
                    android:textColor="@color/color_707070"
                    android:textSize="12sp"
                    />
            </LinearLayout>
            <LinearLayout
                android:padding="14dp"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TextView
                    android:layout_gravity="center_vertical"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="●"
                    android:textColor="@color/color_707070"
                    android:textSize="4sp"
                    />
                <TextView
                    android:layout_marginStart="6dp"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="您的账号没有未结算的充电订单"
                    android:textColor="@color/color_707070"
                    android:textSize="12sp"
                    />
            </LinearLayout>
            <LinearLayout
                android:padding="14dp"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TextView
                    android:layout_gravity="center_vertical"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="●"
                    android:textColor="@color/color_707070"
                    android:textSize="4dp"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="6dp"
                    android:text="您的账号如果有余额请先完成退款或联系客服清空赠送金额"
                    android:textColor="@color/color_707070"
                    android:textSize="12sp" />
            </LinearLayout>
            <View
                android:background="@color/color_f5f6f7"
                android:layout_marginEnd="14dp"
                android:layout_marginStart="14dp"
                android:layout_width="match_parent"
                android:layout_height="1dp"/>
            <TextView
                android:padding="14dp"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="注销提交后冻结账号15天，15天后自动注销账号，将清除账号所有相关信息和记录。冻结期内不可使用APP功能，可取消注销。"
                android:textColor="#ff707070"
                android:textSize="12sp"
                />
        </LinearLayout>
    </LinearLayout>
    <LinearLayout
        tools:visibility="visible"
        android:visibility="gone"
        android:id="@+id/unRegisterLayout"
        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">
        <ImageView
            android:layout_marginTop="40dp"
            android:layout_gravity="center_horizontal"
            android:src="@drawable/ic_logout_hint2"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"/>
        <TextView
            android:layout_gravity="center"
            android:layout_marginTop="30dp"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="注销正在审核中…"
            android:textColor="@color/color_0e0e0e"
            android:textSize="21sp"
            />
        <TextView
            android:layout_marginTop="20dp"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            tools:text="提交时间：2021-8-16  17:00"
            android:textColor="@color/app_color_9b"
            android:textSize="12sp"
            />
        <TextView
            android:layout_marginTop="20dp"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            tools:text="审核中不能充值和开启充电，取消注销可继续使用"
            android:textColor="#ff0e0e0e"
            android:textSize="12sp"
            />
    </LinearLayout>
    <View
        android:layout_weight="1"
        android:layout_width="match_parent"
        android:layout_height="0dp"/>
    <TextView
        android:id="@+id/text"
        android:layout_marginBottom="40dp"
        android:layout_marginEnd="12dp"
        android:layout_marginStart="12dp"
        android:gravity="center"
        android:textColor="@color/white"
        android:text="退出登录"
        android:background="@drawable/bg_raduis_20_lvse"
        android:layout_width="match_parent"
        android:layout_height="40dp"/>
</LinearLayout>

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

@@ -42,10 +42,12 @@
        android:background="@color/ui_titleline"/>
    <com.zhy.autolayout.AutoLinearLayout
        android:layout_marginEnd="12dp"
        android:layout_marginStart="12dp"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="44px"
        android:background="@color/white"
        android:background="@drawable/bg_radius_6_white"
        android:orientation="vertical">
        <View
@@ -288,15 +290,59 @@
            android:background="@color/Line" />
    </com.zhy.autolayout.AutoLinearLayout>
    <LinearLayout
        android:id="@+id/logOutLayout"
        android:paddingBottom="20dp"
        android:paddingTop="20dp"
        android:layout_marginEnd="12dp"
        android:layout_marginStart="12dp"
        android:background="@drawable/bg_radius_6_white"
        android:layout_marginTop="15dp"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">
        <TextView
            android:layout_marginStart="14dp"
            android:layout_gravity="center_vertical"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="注销账号"
            android:textColor="@color/color_0e0e0e"
            android:textSize="14sp"
            />
        <View
            android:layout_weight="1"
            android:layout_gravity="center_vertical"
            android:layout_width="0dp"
            android:layout_height="1dp"/>
        <TextView
            android:layout_marginEnd="9dp"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            tools:text="正在审核中"
            android:textColor="@color/color_e32727"
            android:textSize="14sp"
            />
        <ImageView
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:contentDescription="@null"
            android:paddingRight="16dp"
            android:src="@drawable/icon_more2_0" />
    </LinearLayout>
    <com.zhy.autolayout.AutoRelativeLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent">
    <TextView
        android:layout_marginBottom="40dp"
        android:layout_marginEnd="12dp"
        android:layout_marginStart="12dp"
        android:id="@+id/tv_exit"
        android:layout_width="fill_parent"
        android:layout_height="127px"
        android:background="@color/lvse"
        android:layout_height="40dp"
        android:background="@drawable/bg_raduis_20_lvse"
        android:gravity="center"
        android:text="退出登录"
        android:textColor="@color/bg_row"
@@ -324,7 +370,6 @@
    </com.zhy.autolayout.AutoRelativeLayout>
</com.zhy.autolayout.AutoLinearLayout>

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

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    xmlns:tools="http://schemas.android.com/tools"
    tools:background="#f1f1"
    android:id="@+id/stateLayout"
    android:orientation="vertical"
    android:layout_height="match_parent">
    <LinearLayout
        android:gravity="center"
        android:orientation="vertical"
        android:layout_centerInParent="true"
        android:background="@drawable/bg_white_radius10"
        android:layout_width="268dp"
        android:layout_height="124dp">
        <ImageView
            android:id="@+id/stateImg"
            android:layout_marginTop="10dp"
            tools:src="@drawable/ic_logout_dialog"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"/>
        <TextView
            android:layout_marginTop="20dp"
            android:id="@+id/stateText"
            android:layout_marginBottom="10dp"
            android:layout_gravity="center"
            tools:text="请先退款或完成退款订单"
            android:textColor="@color/black"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"/>
    </LinearLayout>
</RelativeLayout>

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

@@ -200,6 +200,9 @@
    <color name="color_f08f4b">#F08F4B</color>
    <color name="color_ff333333">#ff333333</color>
    <color name="color_e32727">#ffe32727</color>
    <color name="color_707070">#ff707070</color>
    <color name="color_f5f6f7">#F5F6F7</color>