feat: 更换ETC设备

app/src/main/AndroidManifest.xml

@@ -75,7 +75,6 @@
         tools:ignore="AllowBackup,LockedOrientationActivity"
         tools:replace="android:allowBackup,android:supportsRtl,android:label"
         tools:targetApi="n">
-
         <!-- 表示当前已经适配了分区存储 -->
         <meta-data
             android:name="ScopedStorage"
@@ -232,36 +231,29 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" /> <!-- 车辆信息填写 -->
         <activity
-            android:name=".project.ui.activity.transfer.CutPaymentAccountChangeActivity"
+            android:name=".project.ui.activity.card.ValueToBookkeepingRefundActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:exported="false"><!-- 扣款账户变更 -->
+            android:exported="false">
         </activity>
-        <activity
-            android:name=".project.ui.activity.transfer.ETCTransferCarActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"></activity><!-- ETC过户 -->
-        <activity
-            android:name=".project.ui.activity.card.ValueToBookkeepingRefundActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait" /><!-- 储值卡转记账卡退费 -->
         <activity
             android:name=".project.ui.activity.card.ValueToBookkeepingExpireActivity"
-            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /><!-- 储值卡转记账卡过期 -->
+            android:screenOrientation="portrait"
+            android:exported="false">
+        </activity>
         <activity
             android:name=".project.ui.activity.card.ValueToBookkeepingVerifyActivity"
-            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /><!-- 储值卡转记账卡账号验证 -->
+            android:screenOrientation="portrait"
+            android:exported="false">
+        </activity>
         <activity
             android:name=".project.ui.activity.card.ValueToBookkeepingCardActivity"
-            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /><!-- 储值卡转记账卡基础信息 -->
+            android:screenOrientation="portrait"
+            android:exported="false">
+        </activity>
         <activity
             android:name=".project.ui.activity.evaluate.YwblEvaluateActivity"
             android:exported="false"
@@ -481,7 +473,9 @@
         <activity
             android:name=".project.ui.activity.order.OrderLogisticsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 更换ETC设备 -->
+            android:screenOrientation="portrait" />
+
+        <!-- 更换ETC设备 -->
         <activity
             android:name=".project.ui.activity.after.ReplaceEtcStep1Activity"
             android:launchMode="singleTop"
@@ -490,6 +484,53 @@
             android:name=".project.ui.activity.after.ReplaceEtcStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.ReplaceEtcStep3Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.ReplaceEtcStep4Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+
+        <!-- 设备注销 -->
+        <activity
+            android:name=".project.ui.activity.after.LogoutEtcStep1Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.LogoutEtcStep2Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.LogoutEtcSuccessActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+
+        <!--欠费补缴-->
+        <activity
+            android:name=".project.ui.activity.after.PayTheArrearsStep1Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.PayTheArrearsStep2Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.PayTheArrearsStep3Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+
+        <!--余额补领-->
+        <activity
+            android:name=".project.ui.activity.after.BalanceReplacementActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.after.LogoutEtcReturnMoneyActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+
     </application>
 
 </manifest>

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

@@ -128,5 +128,6 @@ public class IFCode {
     public static final String IFCODE167 = "167"; //订单申请换货
     public static final String IFCODE168 = "168"; //根据机构号获取服务网点信息
     public static final String IFCODE164 = "164"; //修改订单地址
-
+    public static final String IFCODE888 = "888"; //换卡签申请
+    public static final String IFCODE966 = "966"; //统一会员平台验证码校验接口
 }

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.LogUtils;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityReplaceEtcStep2Binding;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
@@ -39,8 +40,8 @@ public class ReplaceEtcStep2Activity extends AppActivity {
     }
 
     private void setDataToView(){
-        GlideApp.with(getActivity()).load(data.getPositiveImageUrl()) .into(binding.image1);
-        GlideApp.with(getActivity()).load(data.getNegativeImageUrl()) .into(binding.image2);
+        GlideApp.with(this).load(data.getPositiveImageUrl()).into(binding.image1);
+        GlideApp.with(this).load(data.getNegativeImageUrl()).into(binding.image2);
 
         binding.text1.setText(FunHelper.isEmpty(data.getCustomerName()) ? "" : data.getCustomerName());
         binding.text2.setText(FunHelper.isEmpty(data.getCustomerTel()) ? "" : data.getCustomerTel());
@@ -55,6 +56,7 @@ public class ReplaceEtcStep2Activity extends AppActivity {
             Bundle bundle = new Bundle();
             bundle.putString("json",json);
             jumpToPage(ReplaceEtcStep3Activity.class,bundle);
+            finish();
         }
     }
 

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

@@ -40,8 +40,8 @@ public class ReplaceEtcStep3Activity extends AppActivity {
     }
 
     private void setDataToView(){
-        GlideApp.with(getActivity()).load(data.vehPosImgUrl) .into(binding.image1);
-        GlideApp.with(getActivity()).load(data.vehNegImgUrl) .into(binding.image2);
+        GlideApp.with(this).load(data.vehPosImgUrl).into(binding.image1);
+        GlideApp.with(this).load(data.vehNegImgUrl).into(binding.image2);
         binding.text1.setText(FunHelper.isEmpty(data.getVehiclePlate()) ? "" : data.getVehiclePlate());
         binding.text2.setText(FunHelper.isEmpty(data.getVehicleType()) ? "" : data.getVehicleType());
         binding.text3.setText(FunHelper.isEmpty(data.getOwnerName()) ? "" : data.getOwnerName());
@@ -65,6 +65,7 @@ public class ReplaceEtcStep3Activity extends AppActivity {
             Bundle bundle = new Bundle();
             bundle.putString("json",json);
             jumpToPage(ReplaceEtcStep4Activity.class,bundle);
+            finish();
         }
     }
 

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

@@ -22,13 +22,17 @@ import java.util.Map;
  */
 public class ReplaceEtcStep4Activity extends AppActivity {
     private ActivityReplaceEtcStep4Binding binding;
+    public static final String EX_CARD = "EXCHANGE_CARD";
+    public static final String EX_OBU = "EXCHANGE_OBU";
+    public static final String EX_CARD_OBU = "EXCHANGE_ALL";
 
     //倒计时
     private CodeCountDown mCountDownTimerUtils;
 
     private int cardStatus = 2; //卡是否正常  2-不正常
     private int moneyStatus = 2; //钱是否正常 2-不正常
-    private int opeartion = 3; //1-更换卡  2-更换签  3-更换卡签
+    //EXCHANGE_CARD-换卡签-换卡 EXCHANGE_OBU -换卡签-换签  EXCHANGE_ALL-换卡签-换卡签
+    private String applyType = EX_CARD_OBU;
 
     private String json;
     private ResultBean.BizContent data;
@@ -46,15 +50,14 @@ public class ReplaceEtcStep4Activity extends AppActivity {
             data = JSON.parseObject(json,ResultBean.BizContent.class);
         }
 
-        binding.choiceCard1.setOnClickListener(this::ChoiceCardType);
+        /*binding.choiceCard1.setOnClickListener(this::ChoiceCardType);
         binding.card1.setOnClickListener(this::ChoiceCardType);
         binding.choiceCard2.setOnClickListener(this::ChoiceCardType);
-        binding.card2.setOnClickListener(this::ChoiceCardType);
-
-        binding.choiceMoney1.setOnClickListener(this::ChoiceMoneyType);
+        binding.card2.setOnClickListener(this::ChoiceCardType);*/
+        /*binding.choiceMoney1.setOnClickListener(this::ChoiceMoneyType);
         binding.money1.setOnClickListener(this::ChoiceMoneyType);
         binding.choiceMoney2.setOnClickListener(this::ChoiceMoneyType);
-        binding.money2.setOnClickListener(this::ChoiceMoneyType);
+        binding.money2.setOnClickListener(this::ChoiceMoneyType);*/
 
         binding.choiceCard.setOnClickListener(this::Choice);
         binding.card.setOnClickListener(this::Choice);
@@ -70,16 +73,27 @@ public class ReplaceEtcStep4Activity extends AppActivity {
 
         if (!FunHelper.isEmpty(data.getCardId()) && !FunHelper.isEmpty(data.getObuId())){
             binding.LLType.setVisibility(View.VISIBLE);
-            opeartion = 3;
+            applyType = EX_CARD_OBU;
         }else{
-            if (!FunHelper.isEmpty(data.getCardId())){
-                binding.LLCard.setVisibility(View.VISIBLE);
-                opeartion = 1;
-            }
-            if (!FunHelper.isEmpty(data.getObuId())){
-                binding.LLObu.setVisibility(View.VISIBLE);
-                opeartion = 2;
-            }
+            applyType = FunHelper.isEmpty(data.getCardId()) ? EX_OBU : EX_CARD;
+        }
+
+        if (!FunHelper.isEmpty(data.getCardId())){
+            binding.LLCard.setVisibility(View.VISIBLE);
+            binding.card1.setChecked(true);
+            binding.card2.setEnabled(false);
+        }else{
+            binding.card1.setChecked(false);
+            binding.card2.setEnabled(true);
+        }
+
+        if (!FunHelper.isEmpty(data.getObuId())){
+            binding.LLObu.setVisibility(View.VISIBLE);
+            binding.money1.setChecked(true);
+            binding.money2.setEnabled(false);
+        }else{
+            binding.money1.setChecked(false);
+            binding.money2.setEnabled(true);
         }
 
         binding.btnNext.setOnClickListener(this::initClick);
@@ -93,10 +107,7 @@ public class ReplaceEtcStep4Activity extends AppActivity {
                 toast("请输入验证码");
                 return;
             }
-            //toReplace();
-            Bundle bundle = new Bundle();
-            bundle.putString("from","4");
-            jumpToPage(LogoutEtcSuccessActivity.class,bundle);
+            checkUser();
 
         }else if (view == binding.mGetCodeBtn){
             sendCode();
@@ -104,28 +115,44 @@ public class ReplaceEtcStep4Activity extends AppActivity {
     }
 
     /**
-     * 校验
+     * 验证用户信息并申请更换ETC
      */
-    private void toReplace(){
-        showDialog("更换请求中...");
-        /*Map<String, String> params = new HashMap<>();
-        params.put("mobile", phone);
+    private void checkUser(){
+        showDialog("申请中...");
+        Map<String, String> params = new HashMap<>();
+        params.put("mobile", data.getCustomerTel());
+        params.put("code", FunHelper.getText(binding.etCode));
         MyRetrofit.newInstance(IFCode.IFCODE2, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 hideDialog();
-                toast("验证码发送成功！");
-                mCountDownTimerUtils = new CodeCountDown(ReplaceEtcStep2Activity.this, binding.mGetCodeBtn, 60000, 1000);
-                mCountDownTimerUtils.start();
+                Map<String, String> params = new HashMap<>();
+                params.put("orderId", data.getOrderId());
+                params.put("applyType", applyType);
+                params.put("applyRes", FunHelper.getText(binding.etReason));
+                MyRetrofit.newInstance(IFCode.IFCODE888, params, new MyRetrofit.ReturnResult() {
+                    @Override
+                    public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                        hideDialog();
+                        toast("申请成功！");
+                        finish();
+                    }
+                    @Override
+                    public void onError() {
+                        MyRetrofit.ReturnResult.super.onError();
+                        hideDialog();
+                    }
+                });
             }
             @Override
             public void onError() {
                 MyRetrofit.ReturnResult.super.onError();
                 hideDialog();
             }
-        });*/
+        });
     }
 
+
     /**
      * 发送验证码
      */
@@ -133,13 +160,12 @@ public class ReplaceEtcStep4Activity extends AppActivity {
         showDialog("发送中...");
         Map<String, String> params = new HashMap<>();
         params.put("mobile", data.getCustomerTel());
-        MyRetrofit.newInstance(IFCode.IFCODE2, params, new MyRetrofit.ReturnResult() {
+        MyRetrofit.newInstance(IFCode.IFCODE966, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                hideDialog();
-                toast("验证码发送成功！");
-                mCountDownTimerUtils = new CodeCountDown(ReplaceEtcStep4Activity.this, binding.mGetCodeBtn, 60000, 1000);
-                mCountDownTimerUtils.start();
+                Bundle bundle = new Bundle();
+                bundle.putString("from","4");
+                jumpToPage(LogoutEtcSuccessActivity.class,bundle);
             }
             @Override
             public void onError() {
@@ -179,13 +205,13 @@ public class ReplaceEtcStep4Activity extends AppActivity {
         binding.cardobu.setChecked(false);
         if (view == binding.choiceCard || view == binding.card) {
             binding.card.setChecked(true);
-            opeartion = 1;
+            applyType = EX_CARD;
         } else if (view == binding.choiceOBU  || view == binding.obu) {
             binding.obu.setChecked(true);
-            opeartion = 2;
+            applyType = EX_OBU;
         } else if (view == binding.choiceCardObu  || view == binding.cardobu) {
             binding.cardobu.setChecked(true);
-            opeartion = 3;
+            applyType = EX_CARD_OBU;
         }
     }
 

app/src/main/res/layout-v4/activity_replace_etc_step4.xml

@@ -46,6 +46,7 @@
                             android:layout_height="wrap_content"
                             android:background="@null"
                             android:checked="false"
+                            android:enabled="false"
                             app:buttonCompat="@drawable/checkbox_selector" />
 
                         <TextView
@@ -66,7 +67,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="@null"
-                            android:checked="true"
+                            android:enabled="false"
                             app:buttonCompat="@drawable/checkbox_selector" />
 
                         <TextView
@@ -104,6 +105,7 @@
                             android:layout_height="wrap_content"
                             android:background="@null"
                             android:checked="false"
+                            android:enabled="false"
                             app:buttonCompat="@drawable/checkbox_selector" />
 
                         <TextView
@@ -124,7 +126,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="@null"
-                            android:checked="true"
+                            android:enabled="false"
                             app:buttonCompat="@drawable/checkbox_selector" />
 
                         <TextView
@@ -231,6 +233,41 @@
                 </LinearLayout>
             </LinearLayout>
 
+            <TextView
+                style="@style/WrapWrap"
+                android:paddingLeft="@dimen/dp_15"
+                android:paddingTop="@dimen/dp_15"
+                android:paddingRight="@dimen/dp_15"
+                android:text="申请原因"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_16"
+                android:textStyle="bold" />
+            <com.ruffian.library.widget.RLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:corner_radius="@dimen/dp_10"
+                app:background_normal="@color/white"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:paddingLeft="@dimen/dp_15"
+                android:paddingBottom="@dimen/dp_15"
+                android:paddingRight="@dimen/dp_20"
+                android:orientation="vertical"
+                android:layout_marginTop="@dimen/dp_12">
+                <EditText
+                    android:id="@+id/etReason"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:layout_below="@+id/tv_hhyy_title"
+                    android:paddingTop="@dimen/dp_15"
+                    android:paddingLeft="@dimen/dp_7"
+                    android:gravity="left"
+                    android:maxLength="50"
+                    android:hint="请输入申请原因，限制50字以内"
+                    android:textColorHint="@color/text98"
+                    android:minHeight="@dimen/dp_100"
+                    style="@style/black02TextStyle14"/>
+            </com.ruffian.library.widget.RLinearLayout>
 
             <TextView
                 style="@style/WrapWrap"

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

@@ -12,7 +12,7 @@
         android:background="@color/white"
         app:leftIcon="@mipmap/back_black"
         app:lineVisible="false"
-        app:title="欠费补缴"
+        app:title="余额补领"
         app:titleColor="@color/black" />
 
     <!--搜索框-->