feat: 新增更换ETC信息填写

app/src/main/AndroidManifest.xml

@@ -492,6 +492,10 @@
             android:name=".project.ui.activity.after.ReplaceEtcStep4Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.ReplaceEtcStep5Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
 
         <!-- 设备注销 -->
         <activity
@@ -503,7 +507,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".project.ui.activity.after.LogoutEtcSuccessActivity"
+            android:name=".project.ui.activity.after.CommonDealSuccessActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcSuccessActivity.java → app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/CommonDealSuccessActivity.java

@@ -2,22 +2,22 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
 
 import android.view.View;
 
-import com.huntersun.vkyes.etcopencard.databinding.ActivityLogoutEtcSuccessBinding;
+import com.huntersun.vkyes.etcopencard.databinding.ActivityCommonDealSuccessBinding;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 
 /**
  * Date ：2023-03-16
- * Description：成功页面（通用）
+ * Description：业务处理成功页面（通用）
  */
-public class LogoutEtcSuccessActivity extends AppActivity {
-    private ActivityLogoutEtcSuccessBinding binding;
+public class CommonDealSuccessActivity extends AppActivity {
+    private ActivityCommonDealSuccessBinding binding;
 
     //0-注销成功 1-欠费补缴 2-余额补领  4-更换ETC设备成功  5-停用成功  6-启用成功
     private String from;
 
     @Override
     protected View getLayoutView() {
-        binding = ActivityLogoutEtcSuccessBinding.inflate(getLayoutInflater());
+        binding = ActivityCommonDealSuccessBinding.inflate(getLayoutInflater());
         return binding.getRoot();
     }
 
@@ -34,7 +34,7 @@ public class LogoutEtcSuccessActivity extends AppActivity {
             binding.tvMsg.setVisibility(View.VISIBLE);
             binding.tvMsg.setText("您的旧卡余额已成功转移至新卡中");
         }else if (from.equals("4")){
-            binding.tvHint.setText("申请成功");
+            binding.tvHint.setText("更换成功");
         }else if (from.equals("5")){
             binding.tvHint.setText("停用成功");
         }else if (from.equals("6")){

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcPayActivity.java

@@ -6,13 +6,10 @@ import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
-import com.huntersun.vky.obublelib.box.BoxManagers;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityLogoutEtcInfoConfirmBinding;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityLogoutEtcPayBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -126,7 +123,7 @@ public class LogoutEtcPayActivity extends AppActivity {
                         toast("支付成功!");
                         Bundle bundle = new Bundle();
                         bundle.putString("from","1");
-                        jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+                        jumpToPage(CommonDealSuccessActivity.class,bundle);
                         finish();
                         break;
                     case "PAYING": //支付中

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcReturnMoneyActivity.java

@@ -63,7 +63,7 @@ public class LogoutEtcReturnMoneyActivity extends AppActivity {
 
         Bundle bundle = new Bundle();
         bundle.putString("from","2");
-        jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+        jumpToPage(CommonDealSuccessActivity.class,bundle);
         finish();
     }
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcStep2Activity.java

@@ -1,17 +1,11 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
 
-import android.annotation.SuppressLint;
-import android.bluetooth.BluetoothAdapter;
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
-import com.blankj.utilcode.util.LogUtils;
 import com.google.gson.Gson;
-import com.hjq.base.BaseDialog;
-import com.huntersun.vky.obublelib.box.BoxManagers;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityLogoutEtcStep2Binding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -23,7 +17,6 @@ import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ReasonBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
-import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothDialog;
 import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothWriteCardWriteTab;
 import com.huntersun.vkyes.etcopencard.project.dialog.ReasonListDialog;
 import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
@@ -34,7 +27,6 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
 import com.huntersun.vkyes.etcopencard.src.other.CodeCountDown;
 import com.huntersun.vkyes.etcopencard.src.ui.activity.ImageSelectActivity;
-import com.huntersun.vkyes.etcopencard.src.ui.dialog.WaitDialog;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -406,7 +398,7 @@ public class LogoutEtcStep2Activity extends AppActivity {
                 hideDialog();
                 Bundle bundle = new Bundle();
                 bundle.putString("from","0");
-                jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+                jumpToPage(CommonDealSuccessActivity.class,bundle);
                 finish();
             }
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/PayTheArrearsStep3Activity.java

@@ -8,9 +8,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
 
-import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityLogoutEtcPayBinding;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityPayTheArrearsStep3Binding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -55,7 +53,7 @@ public class PayTheArrearsStep3Activity extends AppActivity {
                 //pay();
                 Bundle bundle = new Bundle();
                 bundle.putString("from","1");
-                jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+                jumpToPage(CommonDealSuccessActivity.class,bundle);
                 finish();
             }
         });
@@ -124,7 +122,7 @@ public class PayTheArrearsStep3Activity extends AppActivity {
                         toast("支付成功!");
                         Bundle bundle = new Bundle();
                         bundle.putString("from","1");
-                        jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+                        jumpToPage(CommonDealSuccessActivity.class,bundle);
                         finish();
                         break;
                     case "PAYING": //支付中

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/ReplaceEtcStep4Activity.java

@@ -4,13 +4,14 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
+import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityReplaceEtcStep4Binding;
 import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
-import com.huntersun.vkyes.etcopencard.project.api.bean.DotBean;
+import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ReasonBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
-import com.huntersun.vkyes.etcopencard.project.dialog.DotListDialog;
+import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
 import com.huntersun.vkyes.etcopencard.project.dialog.ReasonListDialog;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
@@ -20,9 +21,11 @@ import com.huntersun.vkyes.etcopencard.src.other.CodeCountDown;
 import java.util.HashMap;
 import java.util.Map;
 
+import retrofit2.Response;
+
 /**
  * Date ：2023-03-15
- * Description：更换ETC设备 最后一步 申请
+ * Description：更换ETC设备  申请
  */
 public class ReplaceEtcStep4Activity extends AppActivity {
     private ActivityReplaceEtcStep4Binding binding;
@@ -133,6 +136,18 @@ public class ReplaceEtcStep4Activity extends AppActivity {
         }
     }
 
+    /**
+     * 提示错误信息
+     * @param errorMsg
+     */
+    private void showErrorMsg(String errorMsg){
+        new ConfirmDialog.Builder(ReplaceEtcStep4Activity.this).setMsg(errorMsg, "无法更换","确定","", R.mipmap.icon_lotgout_etc_hint, 0,true)
+                .onClick(new ConfirmDialog.Result() {
+                    @Override
+                    public void confirm() {  }
+                }).show();
+    }
+
     /**
      * 验证用户信息并申请更换ETC
      */
@@ -145,6 +160,8 @@ public class ReplaceEtcStep4Activity extends AppActivity {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 hideDialog();
+
+                //申请更换
                 Map<String, String> params = new HashMap<>();
                 params.put("orderId", data.getOrderId());
                 params.put("applyType", applyType);
@@ -154,21 +171,24 @@ public class ReplaceEtcStep4Activity extends AppActivity {
                     public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                         hideDialog();
                         Bundle bundle = new Bundle();
-                        bundle.putString("from","4");
-                        jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+                        bundle.putString("json",json);
+                        jumpToPage(ReplaceEtcStep5Activity.class,bundle);
                         finish();
                     }
+
                     @Override
-                    public void onError() {
+                    public void onError(Response<Result> resp) {
                         MyRetrofit.ReturnResult.super.onError();
                         hideDialog();
+                        showErrorMsg(resp.body().errorMsg);
                     }
                 });
             }
             @Override
-            public void onError() {
+            public void onError(Response<Result> resp) {
                 MyRetrofit.ReturnResult.super.onError();
                 hideDialog();
+                showErrorMsg(resp.body().errorMsg);
             }
         });
     }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/ReplaceEtcStep5Activity.java

@@ -0,0 +1,45 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.alibaba.fastjson.JSON;
+import com.huntersun.vkyes.etcopencard.databinding.ActivityReplaceEtcStep5Binding;
+import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+ * Date ：2023-03-20
+ * Description：更换ETC设备 填写信息
+ */
+public class ReplaceEtcStep5Activity extends AppActivity {
+    private ActivityReplaceEtcStep5Binding binding;
+
+    private String json;
+    private ResultBean.BizContent data;
+
+    @Override
+    protected View getLayoutView() {
+        binding = ActivityReplaceEtcStep5Binding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        json = getIntent().getStringExtra("json");
+        if (!FunHelper.isEmpty(json)){
+            data = JSON.parseObject(json, ResultBean.BizContent.class);
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putString("from","4");
+        jumpToPage(CommonDealSuccessActivity.class,bundle);
+        finish();
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/StartStopEtcActivity.java

@@ -1,18 +1,10 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
 
-import android.annotation.SuppressLint;
-import android.bluetooth.BluetoothAdapter;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
-import com.alibaba.fastjson.JSON;
-import com.blankj.utilcode.util.LogUtils;
 import com.google.gson.Gson;
 import com.hjq.base.BaseDialog;
-import com.huntersun.vky.obublelib.box.BoxManagers;
-import com.huntersun.vkyes.etcopencard.R;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityReplaceEtcStep1Binding;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityStartStopEtcBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -22,17 +14,12 @@ import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
-import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothDialog;
 import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothWriteCardWriteTab;
-import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
 import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
 import com.huntersun.vkyes.etcopencard.project.tool.Utils;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
-import com.huntersun.vkyes.etcopencard.src.manager.ActivityManager;
-import com.huntersun.vkyes.etcopencard.src.ui.activity.LoginActivity;
-import com.huntersun.vkyes.etcopencard.src.ui.dialog.WaitDialog;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -150,7 +137,7 @@ public class StartStopEtcActivity extends AppActivity {
                         hideDialog();
                         Bundle bundle = new Bundle();
                         bundle.putString("from",operation == 1 ? "5" : "6");
-                        jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+                        jumpToPage(CommonDealSuccessActivity.class,bundle);
                         finish();
                     }
                     @Override

app/src/main/res/layout/activity_logout_etc_success.xml → app/src/main/res/layout/activity_common_deal_success.xml

@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         style="@style/blackTextStyleBold17"
         android:layout_marginTop="@dimen/dp_21"
-        android:text="注销成功"/>
+        android:text="办理成功"/>
     <TextView
         android:id="@+id/tvMsg"
         android:layout_width="wrap_content"

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>