身份证上传日期Bug修复

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 11,
+      "versionCode": 12,
       "versionName": "1.3.4",
-      "outputFile": "jz_app_v1.3.4_release_0519.apk"
+      "outputFile": "jz_app_v1.3.4_release_0625.apk"
     }
   ]
 }

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

@@ -266,7 +266,7 @@ public class MyRetrofit implements ToastAction {
         //加密
 //        parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY));
         new MyRetrofit().getRetrofitGZ(code).create(Api.class)
-                .message2GZ(linkedTreeMap)
+                .message3GZ(linkedTreeMap)
                 .enqueue(new ConverterGZ<Result>(context, start, false, loadHint) {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -278,7 +278,7 @@ public class MyRetrofit implements ToastAction {
                     public void onError(String err, Result resp) {
                         super.onError(err, resp);
 //                        if (!"885".equals(code)){
-//                            toast(err);
+//                            toast(err);。
 //                        }
                         if ("请求超时".equals(err)) {
                             toast("请求超时");

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

@@ -81,8 +81,8 @@ public class IFCode {
     public static final String IFCODE21 = "21"; //变更个人用户信息
     public static final String IFCODE22 = "iaw/issue/user/userUpload"; //提交个人用户信息
     public static final String IFCODE23 = "iaw/app/issue/userSign/query"; //签约检测接口
-    public static final String IFCODE15 = "iaw/txOcr/idCardOcr";//"iaw/ocr/idCardOcr"; //OCR识别身份证
-    public static final String IFCODE16 = "iaw/txOcr/vehicleLicenseOcr";//"iaw/ocr/vehicleLicenseOcr"; //OCR识别行驶证
+    public static final String IFCODE15 = "iaw/ocr/idCardOcr"; //OCR识别身份证
+    public static final String IFCODE16 = "iaw/ocr/vehicleLicenseOcr"; //OCR识别行驶证
     public static final String IFCODE17 = "17"; //文件上传接口
     public static final String IFCODE18 = "iaw/issue/vehicle/vehicleUpload"; //提交车辆信息
     public static final String IFCODE30 = "30"; //获取所有的快递公司信息

app/src/main/java/com/huntersun/vkyes/etcopencard/project/bluetooth/BluetoothDialog.java

@@ -771,14 +771,14 @@ public class BluetoothDialog {
                 String[] cmds = cmdArray.clone();
                 if (cmdType.equals("10")) {
                     com.genvict.ble.sdk.manager.entity.ServiceStatus s = obuInterface.cardCommand(cmds);
+                    Log.e("执行结果", "指令" + JSONObject.toJSONString(cmdArray) + "结果::::" + JSONObject.toJSONString(s.getData()));
                     if (s.getCode() == 0) {
-                        Log.e("执行结果", "指令" + JSONObject.toJSONString(cmdArray) + "结果::::" + JSONObject.toJSONString(s.getData()));
                         callBack.performOnSuccess(JSONObject.parseArray(JSONObject.toJSONString(s.getData())).toArray(new String[0]));
                     }
                 } else {
                     com.genvict.ble.sdk.manager.entity.ServiceStatus s = obuInterface.esamCommand(cmds);
+                    Log.e("执行结果", "指令" + JSONObject.toJSONString(cmdArray) + "结果::::" + JSONObject.toJSONString(s.getData()));
                     if (s.getCode() == 0) {
-                        Log.e("执行结果", "指令" + JSONObject.toJSONString(cmdArray) + "结果::::" + JSONObject.toJSONString(s.getData()));
                         callBack.performOnSuccess(JSONObject.parseArray(JSONObject.toJSONString(s.getData())).toArray(new String[0]));
                     }
                 }

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

@@ -661,16 +661,22 @@ public class IdentityInformationUploadActivity extends AppActivity {
                     // 设置 null 表示不显示取消按钮
                     .setCancel(getString(R.string.common_cancel))
                     .setListener((dialog, year, month, day) -> {
-                        if (month < (calendar.get(Calendar.MONTH) + 1)) {
-                            toast("过期时间不能小于当前时间");
-                        } else {
-                            if (day < calendar.get(Calendar.DAY_OF_MONTH)) {
+                        if (year == calendar.get(Calendar.YEAR)){
+                            if (month < (calendar.get(Calendar.MONTH) + 1)) {
                                 toast("过期时间不能小于当前时间");
                             } else {
-                                TextView textView = (TextView) view;
-                                textView.setText(year + "-" + month + "-" + day);
+                                if (day < calendar.get(Calendar.DAY_OF_MONTH)) {
+                                    toast("过期时间不能小于当前时间");
+                                } else {
+                                    TextView textView = (TextView) view;
+                                    textView.setText(year+"" +(month>9 ? month : ("0"+month))+(day>9 ? day : ("0"+day)));
+                                }
                             }
+                        }else {
+                            TextView textView = (TextView) view;
+                            textView.setText(year+"" +(month>9 ? month : ("0"+month))+(day>9 ? day : ("0"+day)));
                         }
+
                     })
                     .show();
         }
@@ -953,8 +959,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
                         toast("证件已过有效期限");
                         return;
                     }
-                    setText(binding.text5, bizContent.getEnddate().substring(0, 4) + "-" + bizContent.getEnddate().substring(4, 6)
-                            + "-" + bizContent.getEnddate().substring(6, 8));
+                    setText(binding.text5, bizContent.getEnddate());
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -978,8 +983,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
                         toast("证件已过有效期限");
                         return;
                     }
-                    setText(binding.text8, bizContent.getEnddate().substring(0, 4) + "-" + bizContent.getEnddate().substring(4, 6)
-                            + "-" + bizContent.getEnddate().substring(6, 8));
+                    setText(binding.text8, bizContent.getEnddate());
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -1013,8 +1017,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
                         toast("证件已过有效期限");
                         return;
                     }
-                    setText(binding.text15, bizContent.getEnddate().substring(0, 4) + "-" + bizContent.getEnddate().substring(4, 6)
-                            + "-" + bizContent.getEnddate().substring(6, 8));
+                    setText(binding.text15, bizContent.getEnddate().substring(0, 4));
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/OrderUtils.java

@@ -928,46 +928,6 @@ public class OrderUtils {
                     @SuppressLint("LogNotTimber")
                     @Override
                     public void BluetoothLinkIsSuccessful(BoxManagers boxManagers) {
-//                        HashMap<String, String> params = new HashMap<>();
-//                        params.put("orderId", bizContent1.getOrderId());
-//                        MyRetrofit.newInstance(context, IFCode.IFCODE_CANCLE_BY_ORDER, params, new MyRetrofit.ReturnResult() {
-//                            @Override
-//                            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-//                                boolean cardId = TextUtils.isEmpty(bizContent1.getCardId());
-//                                String cardStatus = bizContent1.getCardStatus() == null ? "0" : bizContent1.getCardStatus();
-//                                boolean obuId = TextUtils.isEmpty(bizContent1.getObuId());
-//                                //0 未安装 11 已发行 -> 走激活  9 发行申请 -> 发行
-//                                String obuStatus = bizContent1.getObuStatus() == null ? "9" : bizContent1.getObuStatus();
-//                                //OBU状态为 -> 1 2 3 4 5 6 7(直接走激活) 且卡状态不为 0 9 99
-//                                //卡号 1 2 3 4 5 6(走申请)  //签号 0 11 7 8 9 99（反向直接走申请）
-//                                if (cardId && obuId) { //卡号为空
-//                                    cardOpeningApplication(bizContent1);
-//                                    //走卡发行
-//                                } else if (!cardId && "0".equals(cardStatus) && !obuId && "9".equals(obuStatus)) { //卡号不为空 且状态为 0 (申请)
-//                                    //走卡发行
-//                                    cardOpeningApplication(bizContent1);
-//                                } else if (cardId || "0".equals(cardStatus)) {
-//                                    cardOpeningApplication2(bizContent1);
-//                                } else if (obuId) { //签号为空
-//                                    //走OBU发行
-//                                    openingApplication(bizContent1);
-//                                } else if (!obuId && "9".equals(obuStatus)) { //签号不为空 且状态为 9 (申请)
-//                                    //走OBU发行
-//                                    openingApplication(bizContent1);
-//                                } else if (!cardId && !obuId && ("1".equals(obuStatus) || "11".equals(obuStatus) ||
-//                                        "0".equals(obuStatus))) {
-//                                    //走发行申请
-//                                    deviceActivation(bizContent1);
-//                                } else {
-//                                    cardOpeningApplication(bizContent1);
-//                                }
-//                            }
-//
-//                            @Override
-//                            public void onError(Response<Result> resp) {
-//
-//                            }
-//                        });
                         versionCheck("", "", "", "1", bizContent1);
                     }
 
@@ -983,27 +943,8 @@ public class OrderUtils {
      * 卡签版本校验
      */
     private void versionCheck(String transOrderId, String cmd, String cmdResult, String stepNo, ResultBean.BizContent bizContent1) {
-//        HashMap<String, String> params = new HashMap<>();
-//        params.put("transOrderId", transOrderId);
-//        params.put("cmd", cmd);
-//        params.put("cmdResult", cmdResult);
-//        params.put("stepNo", stepNo);
-//        MyRetrofit.newInstance(IFCode.IFCODE_VERSION_CHECK, params, new MyRetrofit.ReturnResult() {
-//            @Override
-//            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-//                if ("100".equals(bizContent.stepNo)) {
         activationCardAndObuApply("1", bizContent1.orderNo,-1);
-//                } else {
-//                    if ("CARD".equals(bizContent.cmdType)) {
-//                        String cmdResult = BluetoothWriteCardWriteTab.writeCard(bizContent.getCommand());
-//                        versionCheck(bizContent.transOrderId, bizContent.cmd, cmdResult, bizContent.stepNo, bizContent1);
-//                    } else {
-//                        ServiceStatus ss = MethodManager.sendApduEsam(bizContent.getCommand());
-//                        versionCheck(bizContent.transOrderId, bizContent.cmd, ss.getServiceInfo(), bizContent.stepNo, bizContent1);
-//                    }
-//                }
-//            }
-//        });
+
     }
 
     /**

app/src/main/res/layout-v2/fragment_home_four.xml

@@ -108,7 +108,7 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="visible"
+        android:visibility="invisible"
         android:layout_margin="@dimen/dp_20"
         android:id="@+id/btn_test"
         android:background="@color/green01"

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

@@ -74,7 +74,6 @@
                 android:background="@null"
                 android:hint="@string/common_phone_input_hint"
                 android:inputType="phone"
-                android:text="15329905570"
                 app:regexType="mobile" />
 
         </LinearLayout>
@@ -106,7 +105,6 @@
                 android:maxLength="20"
                 android:singleLine="true"
                 tools:text="Huting123*"
-                android:text="Ll11223344@"
                 android:visibility="visible" />
 
             <LinearLayout

common.gradle

@@ -9,9 +9,8 @@ android {
         // 目标适配版本
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdkVersion 30
-        versionName '1.3.4'
-        versionCode 11
-        //当前线上版本 103 5
+        versionName '1.3.5'
+        versionCode 13
     }
 
     // 支持 Java JDK 8