qiubinghui
/
zhywpt-sp
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

修改bug

master
梁超 22 hours ago
parent
59ffb6fa6c
commit
057127e807
2 changed files with 243 additions and 87 deletions
Split View Show Diff Stats
  1. 238
    1
      static/etcUtil/index.js
  2. 5
    86
      subpackage/after-sale/activation/activate.vue

+ 238
- 1
static/etcUtil/index.js View File

@@ -389,6 +389,243 @@ function transCmd(cmdArr, type, func, callBack = null) {
break;
}
}

/**
* 透传
* type 10 写卡 20 写OBU
*/
function transCmdAfter(cmdArr, type, callBack = null) {
var connectPrefixName = datas.getData("connectPrefixName");
console.log('指令执行内容1', datas.getData("connectPrefixName"), cmdArr, type)
return new Promise((resolve, reject) => {
switch (connectPrefixName) {
case "ETC":
//-------------deviceName前装-科畅
console.log("datas.-----",datas.getData("deviceName"),datas.getData("deviceName").includes("KC"),datas.getData("deviceName").includes("K"))
let obj = ""
if (datas.getData("deviceName").includes("KC")|| datas.getData("deviceName").includes("K")) {
console.log('kc执行内容====', cmdArr, type)
obj=kcApi
} else if (datas.getData("deviceName").includes("JL")) {
obj=jlQZApi
} else if (datas.getData("deviceName").includes("WJ")) {
obj=wjApi9901
} else if (datas.getData("deviceName").includes("ATS")) {
obj=ArtcBleUtilApi
} else if (datas.getData("deviceName").includes("MC")) {
obj=mcApi9901
}else if (datas.getData("deviceName").includes("WQ")) {
obj=wqApi
}
obj.transCmd(cmdArr, type, function(res) {
console.log(datas.getData("deviceName")+'执行内容====11111', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
// else if (datas.getData("deviceName").includes("JY")) {
// jyApiEtc.transCmd(cmdArr, type, function(res) {
// console.log('JY执行内容====11111', res)
// if (res.code == 0) {
// resolve(res.data);
// } else {
// if (callBack != null) {
// callBack(res);
// } else {
// alertF(res.msg);
// }
// }
// });
// }
break;
case "WJ":
console.log('WJ执行内容====', cmdArr, type)
wjApi.transCmd(cmdArr, type, function(res) {
console.log('WJ执行内容====11111', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "JL":
console.log('JL执行内容====', cmdArr, type)
jlApi.transCmd(cmdArr, type, function(res) {
console.log('JL执行内容====11111', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "BY":
console.log('JL执行内容====', cmdArr, type)
jyApi.transCmd(cmdArr, type, function(res) {
console.log('JL执行内容====11111', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "BY":
console.log('JL执行内容====', cmdArr, type)
jyApi.transCmd(cmdArr, type, function(res) {
console.log('JL执行内容====11111', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res.msg);
} else {
alertF(res.msg);
}
}
});
break;
case "JY":
jyApi.transCmd(cmdArr, type, function(res) {
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "AT":
atApi.transCmd(cmdArr, type, function(res) {
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "JT":
jtApi.transCmd(cmdArr, type, function(res) {
console.log('指令执行结果：', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "WQ":
wqApi.transCmd(cmdArr, type, function(res) {
console.log('握奇执行结果：===========', res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "CG":
cgApi.transCmd(cmdArr, type, function(res) {
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "TD":
console.log('TD执行内容====', cmdArr, type)
tdApi.transCmd(cmdArr, type, function(res) {
console.log('TD执行内容====123', cmdArr, type,res)
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "ZZ":
zzApi.transCmd(cmdArr, type, function(res) {
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
case "MC":
mcApi.transCmd(cmdArr, type, function(res) {
if (res.code == 0) {
resolve(res.data);
} else {
if (callBack != null) {
callBack(res);
} else {
alertF(res.msg);
}
}
});
break;
default:
datas.setData("bluLinkStatus", false);
datas.setData("connectPrefixName", "");
if (callBack != null) {
callBack("没有找到设备"+connectPrefixName);
} else {
alertF("没有找到设备");
}
break;
}
});
}
/**
* 透传
* type 10 写卡 20 写OBU
@@ -406,7 +643,7 @@ function transCmdArrAfter(cmdArr, type) {
for (let i = 0; i < cmdArr.length; i++) {
const cmdStr = cmdArr[i]
console.log(i, cmdStr, 'cmdStr');
const itemDatas = await transCmd([cmdStr], type)
const itemDatas = await transCmdAfter([cmdStr], type)
datas[cmdStr] = itemDatas
}
console.log(datas, '----------执行结果---------', cmdArr, type);

+ 5
- 86
subpackage/after-sale/activation/activate.vue View File

@@ -378,96 +378,16 @@
if (!state.disabled) {
return;
}
// if (state.CardVersion == '48' || state.CardVersion == '49' || state.ObuVersion == '48' || state.ObuVersion == '49') {
if (state.CardVersion == '48' || state.CardVersion == '49' || state.ObuVersion == '48' || state.ObuVersion == '49') {
// 是48,49 先密钥升级再激活
// obuUpdate();
// obuUpgradeApply();
// } else {
obuUpdate();
} else {
// 不是48,49直接激活
activateQuqet()
// }
}

};
// async function obuUpgradeApply(){
// tools.showLoadingAlert('升级中');
// const applyData = {
// contractSN: obu.obuId, //OBU合同序列号 16位
// chipSn: state.ChipSn, //OBU晶片序列号 8位
// issueMode: 'UPG', //发行模式
// issueType: 'SCOBU', //发行发行类型
// cardVersion: state.CardVersion, //卡版本号
// obuVersion: state.ObuVersion //OBU版本号
// }
// const options = {
// type: 2,
// data: applyData,
// method: "POST",
// showLoading: false,
// }
// const applyResponse = await doApply4Upgrade(options);
// if (!applyResponse) return false;
// if (state.CardVersion == '48' || state.CardVersion == '49') {
// const updateEsDat = await upgradeCardOrObu('GEN_OBEIC_UPG', applyResponse);
// if (!updateEsDat) return false;
// }
// }
// async function upgradeCardOrObu(type, applyResponse){
// tools.showLoadingAlert('升级中');
// //获取发行脚本指令
// const getCommandsResult = await doGetCommands({
// cardNo: applyResponse.cardNo, //卡片序列号
// wareId: type, //OBU的物料代码 OBE-SAM通道 GEN_OBESAM_UPG OBE-IC通道 GEN_OBEIC_UPG
// issueSerialNo: applyResponse.issueSerialNo, //发行订单号
// });
// if (!getCommandsResult) return false;
// //指令解析
// const result = getCommandsResult.commands;
// const array = result.split(',');
// let cmdType = type == 'GEN_OBESAM_UPG' ? '20' : '10';
// console.log("commands:",result);
// // for (const element of array) {
// // console.log('updateEs', element, cmdType);
// // tools.showLoadingAlert('升级中');
// // // 让出主线程，确保UI更新
// // await new Promise(resolve => setTimeout(resolve, 0));
// // console.log("进来了", element.charAt(0), )
// // if (element.charAt(0) === 'D' || element.charAt(0) === 'R') {
// // await processDirectCommand(element, cmdType);
// // } else if (element.charAt(0) === 'K') {
// // await processKeyExchange(element, cmdType, applyData);
// // } else if (element.charAt(0) === 'E') {
// // await processExtAuth(element, cmdType, applyData);
// // } else if (element === 'SESAM') {
// // cmdType = '20';
// // } else {
// // cmdType = '10';
// // }
// // }
// // return true;
// }
// function doApply4Upgrade(params){
// return new Promise((resolve) => {
// const res = requestNew("/iaw/vfj/apply4Upgrade", params);
// console.log("apply4Upgrade response:",res);
// resolve(res.data);
// })
// }
// function doGetCommands(params){
// return new Promise((resolve) => {
// const res = requestNew("/iaw/vfj/getCommands", params);
// console.log("getCommands response:",res);
// resolve(res.data);
// })
// }

const activateQuqet = () => {
state.disabled = false
console.log('orderInfo参数', orderInfo, state.disabled)
@@ -952,6 +872,7 @@
stopHeartbeat();
}
async function obuUpdate() {
stopHeartbeat();
tools.showLoadingAlert('升级中');
//升级类OBU
const applyData = await apply4Upgrade({
@@ -976,8 +897,6 @@
issueSerialNo: applyData.issueSerialNo, //发行订单号
});
if (!upgradeDoneData) return false;
connectPrefixName = datas.getData("connectPrefixName");
console.log(connectPrefixName);
activateQuqet();
}


Write Preview
Loading…
Cancel
Save