|
|
@@ -172,7 +172,7 @@ |
|
|
|
const tools = require("../../../static/etcUtil/tools.js"); |
|
|
|
const datas = require("../../../static/etcUtil/datas.js"); |
|
|
|
const bluetoothUtil = require("../../../static/etcUtil/index.js"); |
|
|
|
let jyApiEtc = require("../../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js"); //前装-金溢 |
|
|
|
// let jyApiEtc = require("../../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js"); //前装-金溢 |
|
|
|
const card = reactive({ |
|
|
|
cardNo: "", |
|
|
|
startTime: "", |
|
|
@@ -223,24 +223,24 @@ |
|
|
|
//执行0015文件 |
|
|
|
tools.showLoadingAlert("执行指令"); |
|
|
|
if (datas.getData("deviceName").includes("JY")) { |
|
|
|
jyApiEtc.getCardInfo(function(res) { |
|
|
|
if (res.code == '0') { |
|
|
|
var cardInfo = res.cardInfo; |
|
|
|
console.log("res.cardInfo", res.cardInfo) |
|
|
|
card.cardNo = cardInfo.cardId; |
|
|
|
card.startTime = cardInfo.signedDate; |
|
|
|
card.endTime = cardInfo.expiredDate; |
|
|
|
// message = "卡片方标识:" + cardInfo.provider + " 卡片类型:" + cardInfo.cardType + " 卡片版本号:" + |
|
|
|
// cardInfo.cardVersion + " 卡号:" + cardInfo.cardId + " 启用时间:" + |
|
|
|
// cardInfo.signedDate + " 到期时间:" + cardInfo.expiredDate + " 车牌号:" + cardInfo |
|
|
|
// .vehicleNumber + |
|
|
|
// " 用户类型:" + cardInfo.userType + " 车牌颜色:" + cardInfo.plateColor + " 车型:" + cardInfo |
|
|
|
// .vehicleModel; |
|
|
|
getObuId(); |
|
|
|
} else { |
|
|
|
tools.alertF("获取卡片信息失败" + res.code); |
|
|
|
} |
|
|
|
}) |
|
|
|
// jyApiEtc.getCardInfo(function(res) { |
|
|
|
// if (res.code == '0') { |
|
|
|
// var cardInfo = res.cardInfo; |
|
|
|
// console.log("res.cardInfo", res.cardInfo) |
|
|
|
// card.cardNo = cardInfo.cardId; |
|
|
|
// card.startTime = cardInfo.signedDate; |
|
|
|
// card.endTime = cardInfo.expiredDate; |
|
|
|
// // message = "卡片方标识:" + cardInfo.provider + " 卡片类型:" + cardInfo.cardType + " 卡片版本号:" + |
|
|
|
// // cardInfo.cardVersion + " 卡号:" + cardInfo.cardId + " 启用时间:" + |
|
|
|
// // cardInfo.signedDate + " 到期时间:" + cardInfo.expiredDate + " 车牌号:" + cardInfo |
|
|
|
// // .vehicleNumber + |
|
|
|
// // " 用户类型:" + cardInfo.userType + " 车牌颜色:" + cardInfo.plateColor + " 车型:" + cardInfo |
|
|
|
// // .vehicleModel; |
|
|
|
// getObuId(); |
|
|
|
// } else { |
|
|
|
// tools.alertF("获取卡片信息失败" + res.code); |
|
|
|
// } |
|
|
|
// }) |
|
|
|
} else { |
|
|
|
let cmdArr = [cmd.HOME_DIRECTORY, cmd.APPLICATION_DIRECTORY, cmd.CARD_KC]; |
|
|
|
console.log(cmdArr); |
|
|
@@ -361,16 +361,16 @@ |
|
|
|
const getObuId = () => { |
|
|
|
tools.showLoadingAlert("执行指令"); |
|
|
|
if (datas.getData("deviceName").includes("JY")) { |
|
|
|
jyApiEtc.getSystemInfo(function(res) { |
|
|
|
console.log("获取OBU===", res) |
|
|
|
if (res.code == 0) { |
|
|
|
obu.num = res.systemInfo.serialNumber |
|
|
|
obu.startTime = res.systemInfo.signedDate |
|
|
|
obu.endTime = res.systemInfo.expiredDate |
|
|
|
} else { |
|
|
|
tools.alertF("获取OBU信息失败"); |
|
|
|
} |
|
|
|
}); |
|
|
|
// jyApiEtc.getSystemInfo(function(res) { |
|
|
|
// console.log("获取OBU===", res) |
|
|
|
// if (res.code == 0) { |
|
|
|
// obu.num = res.systemInfo.serialNumber |
|
|
|
// obu.startTime = res.systemInfo.signedDate |
|
|
|
// obu.endTime = res.systemInfo.expiredDate |
|
|
|
// } else { |
|
|
|
// tools.alertF("获取OBU信息失败"); |
|
|
|
// } |
|
|
|
// }); |
|
|
|
} else { |
|
|
|
let cmdArr = [cmd.HOME_DIRECTORY, cmd.OBU_SYSTEM_FILE]; |
|
|
|
bluetoothUtil.transCmd(cmdArr, '20', function(res) { |