注销 - 调整储值卡的判断方式

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

@@ -59,7 +59,7 @@ public class LogoutEtcStep1Activity extends AppActivity {
 
     @Override
     protected void initView() {
-        setTitle("ETC注销1");
+        setTitle("ETC注销");
         binding.LLSearchResult.setVisibility(View.GONE);
         
         // 初始化搜索工具
@@ -419,10 +419,13 @@ public class LogoutEtcStep1Activity extends AppActivity {
         // 使用现有的车辆信息查询接口
         Map<String, String> params = new HashMap<>();
         params.put("vehicleId", plateNum + "_" + colorNum);
+
+        LogUtils.i(this.getClass().getSimpleName(), "获取车辆详细信息 请求参数: " + new Gson().toJson(params));
         
         MyRetrofit.newInstanceGZ(this, IFCode.IFCODE154, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                LogUtils.i(this.getClass().getSimpleName(), "获取车辆详细信息 响应数据: " + new Gson().toJson(resultBean));
                 if (bizContent != null && !FunHelper.isEmpty(bizContent.vehicles)) {
                     vehicles = (ResultBean.BizContent) bizContent.vehicles.get(0);
                     // 获取用户信息
@@ -616,7 +619,7 @@ public class LogoutEtcStep1Activity extends AppActivity {
         if (!FunHelper.isEmpty(curBizContent.getCardId())) {
             binding.LLCardInfo.setVisibility(View.VISIBLE);
             binding.tvCardIdInfo.setText(FunHelper.isEmpty(curBizContent.getCardId()) ? "卡号：" : "卡号：" + curBizContent.getCardId());
-            binding.tvCardTypeInfo.setText(FunHelper.isEmpty(curBizContent.getIsValueCard()) ? "卡类型：" : "卡类型：" + (curBizContent.getIsValueCard().equals("2") ? "记账卡" : "储值卡"));
+            binding.tvCardTypeInfo.setText(FunHelper.isEmpty(curBizContent.getIsValueCard()) ? "卡类型：" : "卡类型：" + (curBizContent.getIsValueCard().equals("CHARGE_CARD") ? "记账卡" : "储值卡"));
             binding.tvCardStatusInfo.setText(FunHelper.isEmpty(curBizContent.getCardStatus()) ? "卡状态：" : "卡状态：" + EnumBean.backValue(curBizContent.getCardStatus(), EnumBean.ETC_STATUS));
         }
 

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

@@ -239,7 +239,7 @@ public class LogoutEtcStep2Activity extends AppActivity {
     private void gotoNextPage() {
         Log.e("isDamage",isDamage+"");
         LogUtils.i(this.getClass().getSimpleName(), "当前参数 : " + JSONObject.toJSONString(curBizContent));
-        if ("23".equals(curBizContent.getCardId().substring(8,10))){//记账卡
+        if ("CHARGE_CARD".equals(curBizContent.getIsValueCard())){//记账卡
             Intent intent = new Intent(LogoutEtcStep2Activity.this,LogoutEtcStep3Activity.class);
             intent.putExtra("content", JSONObject.toJSONString(curBizContent));
             intent.putExtra("hasCard",hasCard);