调试EXB重新激活流程

wxminipro/miniprogram/pages/test/test.js

@@ -88,8 +88,7 @@
          "&openId=" + this.data.openId +
          "&accessToken=" + this.data.accessToken +
          "&obu=" + this.data.obu +
-         "&card=" + this.data.card +
-         "&devNameList=ETC-EB"
+         "&card=" + this.data.card
      })
    },
 
@@ -126,7 +125,8 @@
    tapExbActiveAgain() {
      let textCar = '苏PT1122_0'
      wx.navigateTo({
-       url: `plugin://issuer-plugin/exbActiveAgain?plateNum=${textCar}`,
+       url: `plugin://issuer-plugin/activeDeviceStep?isTruck=false&isAgain=true` +
+         "&devNameList=ETC-EB",
      })
    },
    tapExbSignProtocol() {

wxminipro/plugin/utils/active-tools/active-device-tools.js

@@ -425,16 +425,17 @@ async function _againObuIssueCheck() {
 
 // 重新激活
 
-async function _getAgainObuMac(randNum, callback) {
-  console.log("获取随机数", randNum)
+async function _getAgainObuMac(cmdRandNum, callback) {
+  console.log("获取随机数", cmdRandNum)
+  console.log(activeCode)
   let params = {
     // Flag: '0001',
     // ContractSN: activeCode.serialNumber,
     // Random: randNum
-    cardId: activeCode.cardId,
-    obuId: activeCode.obuId,
-    vehiclePlate: activeCode.vehiclePlate,
-    vehiclePlateColor: activeCode.vehiclePlateColor,
+    cardId: activeCode.faceCardNum,
+    obuId: activeCode.serialNumber,
+    vehiclePlate: activeCode.cardPlateNumber,
+    vehiclePlateColor: activeCode.cardPlateColor,
     vehicleType: activeCode.cardVehicleType,
     random: cmdRandNum
   }
@@ -443,7 +444,8 @@ async function _getAgainObuMac(randNum, callback) {
   console.log(resData);
   const {
     code,
-    data
+    data,
+    message,
   } = resData;
 
   if (code == 0) {
@@ -451,6 +453,7 @@ async function _getAgainObuMac(randNum, callback) {
     DevResult.data = data.APDU;
   } else {
     DevResult.code = 3;
+    DevResult.msg = message;
   }
   typeof callback === 'function' && callback(DevResult)
 }

wxminipro/plugin/utils/etc-sdk-tool/etc-sdk-tool.js

@@ -355,7 +355,7 @@ function _setInfoMethod(
             resolve(_transIccCmd(apdu, false))
           }
         } else {
-          result.msg = msg
+          result.msg = result.msg || msg
           resolve(result)
         }
       })