挂失/解挂查询接口

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

@@ -178,6 +178,7 @@ public class IFCode {
     public static final String IFCODE899 = "iaw/api/renewal/obuRenewal"; //签续期
     public static final String IFCODE_CHANGE_RENEW_TIME = "iaw/api/afterSale/renewal/cardRenewal/confirm";//更改后端卡签续期时间
 
+    public static final String IFCODE_LOSS_QUERY = "iaw/api/device/query";//挂失查询
     public static final String IFCODE892 = "892"; //卡签停用启用
     public static final String IFCODE896 = "896"; //卡签信息重写（设备升级）
     public static final String IFCODE862 = "862"; //卡PIN解锁

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

@@ -611,6 +611,8 @@ public class ResultBean<T> {
 
         public List<BizContent> otherModelList;//其他车辆
         public List<Companys> companys;//单位列表
+
+        public List<BizContent> cardObuInfos;
         public EnumListEntity dictTypeAndItem; //枚举值列表
         public long passTotal; //通行合计
         public long parkTotal; //停车合计

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityEquipmentLossReportStep1Binding;
 import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
+import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ydplatform.YDPlatformLoginActivity;
 import com.huntersun.vkyes.etcopencard.project.utils.ChannelsInterceptUtils;
@@ -39,7 +40,7 @@ public class EquipmentLossReportStep1Activity extends AppActivity {
     protected void initView() {
         binding.LLSearchResult.setVisibility(View.GONE);
         binding.LLBottom.setVisibility(View.GONE);
-        new SearchCarInfoUtils(Arrays.asList(1,6),getIntent().getStringExtra("vehiclePlate"), getIntent().getStringExtra("vehiclePlateColor"), this, new SearchCarInfoUtils.OnSearchResultClick() {
+        new SearchCarInfoUtils( this, IFCode.IFCODE_LOSS_QUERY, new SearchCarInfoUtils.OnSearchResultClick() {
             @Override
             public void onSearchResultSuccess(ResultBean.BizContent bizContent) {
                 curBizContent = bizContent;
@@ -116,13 +117,13 @@ public class EquipmentLossReportStep1Activity extends AppActivity {
         binding.LLObuInfo.setVisibility(View.GONE);
 
 //        binding.tvOrderId.setText(curBizContent.getOrderId());
-        binding.tvUserName.setText(FunHelper.isEmpty(curBizContent.getName()) ? "" : curBizContent.getName());
-        binding.tvCardType.setText(FunHelper.isEmpty(curBizContent.idType) ? "" : EnumBean.backValue(curBizContent.idType, EnumBean.ID_TYPE));
+        binding.tvUserName.setText(FunHelper.isEmpty(curBizContent.getCustomerName()) ? "" : curBizContent.getCustomerName());
+        binding.tvCardType.setText(FunHelper.isEmpty(curBizContent.customerIdType) ? "" : EnumBean.backValue(curBizContent.customerIdType, EnumBean.ID_TYPE));
 //        binding.tvCardNum.setText(FunHelper.isEmpty(curBizContent.getCustomerIdnum()) ? "" : curBizContent.getCustomerIdnum());
-        binding.tvCardNum.setText(FunHelper.isEmpty(curBizContent.idNum) ? "" : "**************" + curBizContent.idNum.substring(14));
+        binding.tvCardNum.setText(FunHelper.isEmpty(curBizContent.customerIdNum) ? "" : "**************" + curBizContent.customerIdNum.substring(14));
         binding.tvVehiclePlate.setText(FunHelper.isEmpty(curBizContent.getVehiclePlate()) ? "" : curBizContent.getVehiclePlate());
         binding.tvColor.setText(FunHelper.isEmpty(curBizContent.getVehiclePlateColorStr()) ? "" : curBizContent.getVehiclePlateColorStr());
-        binding.tvCarType.setText(FunHelper.isEmpty(curBizContent.getType()) ? "" : EnumBean.backValue(curBizContent.getType(), EnumBean.CAR_TYPE));
+        binding.tvCarType.setText(FunHelper.isEmpty(curBizContent.getVehicleType()) ? "" : EnumBean.backValue(curBizContent.getVehicleType(), EnumBean.CAR_TYPE));
 
         binding.btnStart.setEnabled(true);
         binding.btnStop.setEnabled(true);
@@ -134,25 +135,26 @@ public class EquipmentLossReportStep1Activity extends AppActivity {
             binding.btnStart.setEnabled(false);
             binding.btnStop.setEnabled(true);
         }*/
-        if ("6".equals(curBizContent.getCardStatus()) && "6".equals(curBizContent.getObuStatus())) {
+        ResultBean.BizContent cardObuContent = (ResultBean.BizContent) curBizContent.cardObuInfos.get(0);
+        if ("6".equals(cardObuContent.getCardStatus()) && "6".equals(cardObuContent.getObuStatus())) {
             binding.btnStop.setEnabled(false);
         }
-        if ("1".equals(curBizContent.getCardStatus()) && "1".equals(curBizContent.getObuStatus())) {
+        if ("1".equals(cardObuContent.getCardStatus()) && "1".equals(cardObuContent.getObuStatus())) {
             binding.btnStart.setEnabled(false);
         }
         //显示卡信息
-        if (!FunHelper.isEmpty(curBizContent.getCardId())) {
+        if (!FunHelper.isEmpty(cardObuContent.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.tvCardStatusInfo.setText(FunHelper.isEmpty(curBizContent.getCardStatus()) ? "卡状态：" : "卡状态：" + EnumBean.backValue(curBizContent.getCardStatus(), EnumBean.ETC_STATUS));
+            binding.tvCardIdInfo.setText(FunHelper.isEmpty(cardObuContent.getCardId()) ? "卡号：" : "卡号：" + cardObuContent.getCardId());
+            binding.tvCardTypeInfo.setText(FunHelper.isEmpty(cardObuContent.cardType) ? "卡类型：" : "卡类型：" + (cardObuContent.cardType.equals("2") ? "记账卡" : "储值卡"));
+            binding.tvCardStatusInfo.setText(FunHelper.isEmpty(cardObuContent.getCardStatus()) ? "卡状态：" : "卡状态：" + EnumBean.backValue(cardObuContent.getCardStatus(), EnumBean.ETC_STATUS));
         }
 
         //显示签信息
-        if (!FunHelper.isEmpty(curBizContent.getObuId())) {
+        if (!FunHelper.isEmpty(cardObuContent.getObuId())) {
             binding.LLObuInfo.setVisibility(View.VISIBLE);
-            binding.tvOBUIdInfo.setText(FunHelper.isEmpty(curBizContent.getObuId()) ? "OBU：" : "OBU：" + curBizContent.getObuId());
-            binding.tvOBUTypeInfo.setText(FunHelper.isEmpty(curBizContent.getObuStatus()) ? "OBU状态：" : "OBU状态：" + EnumBean.backValue(curBizContent.getObuStatus(), EnumBean.OBU_STATUS));
+            binding.tvOBUIdInfo.setText(FunHelper.isEmpty(cardObuContent.getObuId()) ? "OBU：" : "OBU：" + cardObuContent.getObuId());
+            binding.tvOBUTypeInfo.setText(FunHelper.isEmpty(cardObuContent.getObuStatus()) ? "OBU状态：" : "OBU状态：" + EnumBean.backValue(cardObuContent.getObuStatus(), EnumBean.OBU_STATUS));
         }
     }
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/SearchCarInfoUtils.java

@@ -398,6 +398,8 @@ public class SearchCarInfoUtils {
                         result = JSONArray.parseArray(data.get("result").toString(), ResultBean.BizContent.class);
                     } else if (data.get("renewalModelList")!=null) {
                         result = JSONArray.parseArray(data.get("renewalModelList").toString(), ResultBean.BizContent.class);
+                    } else {
+                        result.add( JSONObject.parseObject(resultBean.getData().toString(),ResultBean.BizContent.class));
                     }
 
                     if (result.size()>0){