完成注销功能

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

@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
@@ -23,6 +24,7 @@ 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.util.ToastUtil;
import com.electric.chargingpile.view.StateDialog;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
@@ -34,7 +36,7 @@ import pub.devrel.easypermissions.EasyPermissions;
public class LogOutActivity extends AppCompatActivity {
    private TextView text;
    private TextView text,addTimeText;
    private String state;
    private View unSubmittedLayout;
    private View unRegisterLayout;
@@ -46,7 +48,7 @@ public class LogOutActivity extends AppCompatActivity {
        BarColorUtil.initStatusBarColor(LogOutActivity.this);
        initView();
        initIntent();
        quiryState();
    }
    private void initIntent() {
@@ -64,11 +66,16 @@ public class LogOutActivity extends AppCompatActivity {
    private void initView() {
        findViewById(R.id.iv_back).setOnClickListener(v->{
            if (state !=null && state.equals("1")){
                signOut();
            }
            finish();
        });
        text = findViewById(R.id.text);
        unSubmittedLayout = findViewById(R.id.unRegisterLayout);
        addTimeText = findViewById(R.id.addTime);
        unSubmittedLayout = findViewById(R.id.unSubmittedLayout);
        unRegisterLayout = findViewById(R.id.unRegisterLayout);
        text.setOnClickListener(v->{
            if (state !=null && state.equals("1")){
@@ -107,17 +114,7 @@ public class LogOutActivity extends AppCompatActivity {
                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));
                    signOut();
                }else{
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
                    showDialog(rtnMsg);
@@ -128,6 +125,20 @@ public class LogOutActivity extends AppCompatActivity {
    }
    private void signOut() {
        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));
    }
    /**
     * 取消注销
     * */
@@ -142,7 +153,42 @@ public class LogOutActivity extends AppCompatActivity {
            @Override
            public void onResponse(String response) {
                Log.e("onResponse cancelLogout", response);
                String code = JsonUtils.getKeyResult(response, "code");
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if (rtnCode.equals("01")){
                    finish();
                }else{
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
                    ToastUtil.showToast(LogOutActivity.this,rtnMsg, Toast.LENGTH_SHORT);
                }
            }
        });
    }
    /**
     * 查询是否注销
     * */
    private void quiryState(){
        String url=MainApplication.url +"/zhannew/basic/web/index.php/userdel/get?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 quiryState", response);
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if (rtnCode.equals("01")){
                    String data = JsonUtils.getKeyResult(response, "data");
                    String addTime = JsonUtils.getKeyResult(data, "addTime");
                    String status = JsonUtils.getKeyResult(data, "status");
                    addTimeText.setText(addTime);
                }else{
//                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
//                    ToastUtil.showToast(LogOutActivity.this,rtnMsg, Toast.LENGTH_SHORT);
                }
            }
        });
@@ -217,6 +263,18 @@ public class LogOutActivity extends AppCompatActivity {
        );
    }
    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_BACK){
            if (state !=null && state.equals("1")){
                signOut();
                return true;
            }
        }
        return super.onKeyDown(keyCode, event);
    }
    /**
     * @param state  0表示由UserCenterMoreActivity打开 1 表示从登录页面跳转过来
     * */

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

@@ -316,11 +316,7 @@ public class LoginActivity extends Activity implements View.OnClickListener {
                        saveUserInfo(data);
                        MobclickAgent.onProfileSignIn(MainApplication.userId);
                        showTextToast("登录成功");
                        setResult(RESULT_SUCCESS);
                        ProfileManager.getInstance().setCount(getApplicationContext(), 0);
                        MainApplication.count = 0;
                        finish();
                        quiryState();
                    } else if ("03".equals(rtnCode)) {
                        showTextToast("登录超时，请重新登录");
                    } else if ("02".equals(rtnCode)) {
@@ -335,6 +331,38 @@ public class LoginActivity extends Activity implements View.OnClickListener {
        }
    }
    /**
     * 查询是否注销
     *
     **/
    private void quiryState(){
        String url=MainApplication.url +"/zhannew/basic/web/index.php/userdel/get?phone="+ MainApplication.userPhone+"&password="+MainApplication.userPassword;
        OkHttpUtils.get().url(url).build().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) {
                Log.e("onResponse quiryState", response);
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if (rtnCode.equals("01")){
                    LogOutActivity.actionStart(LoginActivity.this,"1");
                    finish();
                }else{
                    setResult(RESULT_SUCCESS);
                    ProfileManager.getInstance().setCount(getApplicationContext(), 0);
                    MainApplication.count = 0;
                    finish();
                }
            }
        });
    }
    private void saveUserInfo(String info) {
        String userid = JsonUtils.getKeyResult(info, "userid");
        String nickname = JsonUtils.getKeyResult(info, "nickname");

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

@@ -35,6 +35,7 @@
    </com.zhy.autolayout.AutoRelativeLayout>
    <LinearLayout
        android:orientation="vertical"
        android:id="@+id/unSubmittedLayout"
        android:layout_width="match_parent"
@@ -165,7 +166,6 @@
    </LinearLayout>
    <LinearLayout
        tools:visibility="visible"
        android:visibility="gone"
        android:id="@+id/unRegisterLayout"
        android:orientation="vertical"
@@ -188,6 +188,7 @@
            />
        <TextView
            android:id="@+id/addTime"
            android:layout_marginTop="20dp"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
@@ -197,11 +198,24 @@
            android:textSize="12sp"
            />
        <TextView
            android:layout_marginEnd="20dp"
            android:layout_marginStart="20dp"
            android:layout_marginTop="20dp"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="您的账号已提交注销申请，账号将冻结15天，冻结期内可登录APP撤销申请，不可使用APP功能，将在15天后正式注销账号，清除账号相关信息。"
            android:textColor="#ff0e0e0e"
            android:textSize="12sp"
            />
        <TextView
            android:layout_marginEnd="20dp"
            android:layout_marginStart="20dp"
            android:layout_marginTop="20dp"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            tools:text="审核中不能充值和开启充电，取消注销可继续使用"
            android:text="账号正式注销后，再次注册APP将为新注册账号，已注销的账号信息无法找回。"
            android:textColor="#ff0e0e0e"
            android:textSize="12sp"
            />