feat: 更换ETC设备逻辑修改

app/src/main/AndroidManifest.xml

@@ -609,5 +609,11 @@
             android:name=".project.ui.activity.after.PetCardToAccountCardStep5Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+
+        <!--设备升级-->
+        <activity
+            android:name=".project.ui.activity.after.EquipmentUpgradeActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

@@ -49,7 +49,8 @@ public class MyRetrofit {
      * 回显地址：222.85.144.89:19002/xxxxxx
      */
 //    private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
-    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
+//    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
+    private final String BaseUrl = "http://192.168.101.145:6001/ifzt/api/";
     private final String FileUrl = "http://222.85.144.89:19003/ifzt/api/"; //文件服务
     private final String appId = "admin001";
     private final String IFCODE = "";

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java

@@ -143,4 +143,6 @@ public class IFCode {
     public static final String IFCODE93 = "93"; //储值卡转记账卡申请接口
     public static final String IFCODE95 = "95"; //储值卡转记账卡填写信息接口
     public static final String IFCODE96 = "96"; //储值卡转记账卡审核接口
+
+    public static final String IFCODE500 = "500"; //查询售后订单信息
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java

@@ -241,11 +241,11 @@ public class ResultBean<T> {
         public String vehPosImgUrl; //行驶证正面
         public String vehNegImgUrl; //行驶证反面
         public String applyId; //申请单编号
+        public String status; //申请单状态 APPLY-申请中 AUDIT-审核中 CANCEL-已取消 END-结束
         public String applyType; //申请单类型
         public String damageMode; //0-人为损坏 1-自然损坏
         public List<BizContent> list; //申请单列表（更换ETC时使用）
 
-
         private String appId = "52030131";
         private boolean init;
         private List<Products> products;
@@ -295,7 +295,6 @@ public class ResultBean<T> {
         private String nation;
         private String respCode;
         private String respMessage;
-        private String status;
         private String statusDesc;
         private String plate_a;
         private String vehicle;

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

@@ -0,0 +1,20 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
+
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+ * Date ：2023-03-22
+ * Description：设备升级
+ */
+public class EquipmentUpgradeActivity extends AppActivity {
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+}

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

@@ -43,7 +43,7 @@ public class ReplaceEtcStep4Activity extends AppActivity {
     private String json;
     private ResultBean.BizContent data;
     private ResultBean.BizContent applyData;
-    private boolean haveApplyInfo; //有申请单信息
+    private boolean haveApplyInfo; //有申请中信息
 
     @Override
     protected View getLayoutView() {
@@ -81,7 +81,7 @@ public class ReplaceEtcStep4Activity extends AppActivity {
      * 设置信息展示
      */
     private void setDataToView(){
-       if (applyData != null && !FunHelper.isEmpty(applyData.applyId)){
+       if (applyData != null && !applyData.status.equals("CANCEL")){//只有已取消的申请单才能编辑信息
            haveApplyInfo = true;
            damageMode = FunHelper.isEmpty(applyData.damageMode) ? -1 : Integer.parseInt(applyData.damageMode);
            applyType = applyData.applyType;
@@ -109,6 +109,11 @@ public class ReplaceEtcStep4Activity extends AppActivity {
         binding.people.setEnabled(!haveApplyInfo);
         binding.btnCancel.setVisibility(haveApplyInfo ? View.VISIBLE : View.GONE);
         binding.btnNext.setEnabled(haveApplyInfo ? false : true);
+        if (!haveApplyInfo || applyData.status.equals("APPLY")){//申请中或者已取消的可以进行下一步
+            binding.btnNext.setEnabled(true);
+        }else{
+            binding.btnNext.setEnabled(false);
+        }
 
         if (applyType.equals(EX_CARD)){
             binding.card.setChecked(true);
@@ -125,7 +130,11 @@ public class ReplaceEtcStep4Activity extends AppActivity {
 
         //有申请单，提示信息
         if (haveApplyInfo){
-            showErrorMsg("");
+           if (applyData.status.equals("APPLY")){//申请中
+               showApplyIngDialog();
+           }else{//审核中或者已结束
+               haveApplyDialog();
+           }
         }
     }
 
@@ -134,25 +143,55 @@ public class ReplaceEtcStep4Activity extends AppActivity {
      * @param errorMsg
      */
     private void showErrorMsg(String errorMsg){
-        String msg = haveApplyInfo ? "已存在更换的订单，是否撤销重新申请？" : errorMsg;
-        String title = haveApplyInfo ? "订单重复" : "无法更换";
-        String cancelTxt = haveApplyInfo ? "取消" : "";
-        String confirmTxt = haveApplyInfo ? "撤销申请单" : "确定";
-        new ConfirmDialog.Builder(ReplaceEtcStep4Activity.this).setMsg(msg, title,confirmTxt,cancelTxt, R.mipmap.icon_lotgout_etc_hint, 0,!haveApplyInfo)
+        new ConfirmDialog.Builder(ReplaceEtcStep4Activity.this).setMsg(errorMsg, "无法更换","确定","", R.mipmap.icon_lotgout_etc_hint, 0,true)
+                .onClick(new ConfirmDialog.Result() {
+                    @Override
+                    public void confirm() { }
+                }).show();
+    }
+
+    /**
+     * 申请中的弹窗
+     */
+    private void showApplyIngDialog(){
+        new ConfirmDialog.Builder(ReplaceEtcStep4Activity.this).setMsg("存在申请中的订单，请点击继续申请或者撤销重新申请", "订单重复","继续申请","撤销申请", R.mipmap.icon_lotgout_etc_hint, 0,false)
                 .onClick(new ConfirmDialog.Result() {
                     @Override
                     public void confirm() {
-                        if (haveApplyInfo){
-                            if (FunHelper.isEmpty(FunHelper.getText(binding.etCode))){
-                                toast("请输入验证码");
-                                return;
-                            }
-                            checkUser(true);
-                        }
+                        gotoNextPage(applyData.getId());
+                    }
+
+                    @Override
+                    public void cancel() {
+                        doCancelApply();
                     }
                 }).show();
     }
 
+    /**
+     * 已申请的弹窗
+     */
+    private void haveApplyDialog(){
+        new ConfirmDialog.Builder(ReplaceEtcStep4Activity.this).setMsg("存在已申请的订单，是否撤销重新申请？", "订单重复","撤销重新申请","取消", R.mipmap.icon_lotgout_etc_hint, 0,false)
+                .onClick(new ConfirmDialog.Result() {
+                    @Override
+                    public void confirm() {
+                        doCancelApply();
+                    }
+                }).show();
+    }
+
+    /**
+     * 撤销申请
+     */
+    private void doCancelApply(){
+        if (FunHelper.isEmpty(FunHelper.getText(binding.etCode))){
+            toast("请输入验证码");
+            return;
+        }
+        checkUser(true);
+    }
+
     /**
      * 跳转下个界面
      * @param id
@@ -305,7 +344,6 @@ public class ReplaceEtcStep4Activity extends AppActivity {
                 toast("请选择更换类型");
                 return;
             }
-
             if (damageMode == -1){
                 toast("请选择设备损坏方式");
                 return;
@@ -318,12 +356,8 @@ public class ReplaceEtcStep4Activity extends AppActivity {
 
         }else if (view == binding.mGetCodeBtn){//获取验证码
             sendCode();
-        }if (view == binding.btnCancel){//下一步
-            if (FunHelper.isEmpty(FunHelper.getText(binding.etCode))){
-                toast("请输入验证码");
-                return;
-            }
-            checkUser(true);
+        }if (view == binding.btnCancel){//撤销申请
+            doCancelApply();
         }
     }
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

@@ -18,6 +18,7 @@ import com.huntersun.vkyes.etcopencard.project.ui.activity.MainActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.BalanceReplacementActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.DevicePendingActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.EquipmentLossReportActivity;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.after.EquipmentUpgradeActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.LogoutEtcStep1Activity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.PayTheArrearsStep1Activity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.PetCardToAccountCardStep1Activity;
@@ -48,22 +49,22 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
     private final Object[][] menu = {
             {R.mipmap.card2, "发货管理"},
             {R.mipmap.card3, "充值圈存"},
-            {R.mipmap.card8, "设备激活"},
             {R.mipmap.card1, "卡签信息查询"},
             {R.mipmap.card5, "卡签挂失/解挂"},
             {R.mipmap.card6, "卡签挂起/解挂"},
             {R.mipmap.card4, "卡签注销"},
             {R.mipmap.card10, "更换卡签"},
-            {R.mipmap.card15, "审核管理"},
+            {R.mipmap.card9, "储值卡转记账卡"},
+            {R.mipmap.card13, "卡签续期"},
+            {R.mipmap.card14, "设备升级"},
             {R.mipmap.card10, "欠费补缴"},
             {R.mipmap.card10, "余额补领"},
-            {R.mipmap.card9, "储值卡转记账卡"},
             {R.mipmap.card7, "满意度评价"},
-            {R.mipmap.card13, "卡签续期"},
+            {R.mipmap.card8, "设备激活"},
+            {R.mipmap.card15, "审核管理"},
 
             {R.mipmap.card11, "卡Pin码解锁"},
             {R.mipmap.card12, "卡签停用启用"},
-            {R.mipmap.card14, "设备升级"},
             {R.mipmap.card16, "ETC过户"},
             {R.mipmap.card17, "签约账户变更"},
             {R.mipmap.card18, "发票管理"},
@@ -195,6 +196,9 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
                         case "卡签续期":
                             jumpToPage(RenewCardObuActivity.class);
                             break;
+                        case "设备升级":
+                            jumpToPage(EquipmentUpgradeActivity.class);
+                            break;
                         default:
                             new Utils().showMessDialog(getActivity(), "功能正在开发中...");
                             break;

app/src/main/res/layout/activity_equipment_upgrade.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>