|
@@ -2,7 +2,7 @@ const app = getApp();
|
|
|
let xBlufi = require("../../../utils/blufi/xBlufi.js");
|
|
|
import strings from '../../../utils/strings.js';
|
|
|
import lexin_devices from '../../../utils/lexin/devices';
|
|
|
-import junzheng_util from '../../../utils/junzheng/util';
|
|
|
+import junzhengUtil from '../../../utils/junzheng/util';
|
|
|
import routeUtil from '../../../utils/routeUtil.js';
|
|
|
import routePath from '../../../utils/routePath.js';
|
|
|
|
|
@@ -109,8 +109,8 @@ Page({
|
|
|
var devicesList = options.data.filter((v) => {
|
|
|
var name = v.name;
|
|
|
var isLexin = name.indexOf(lexin_devices.leXin) !== -1;
|
|
|
- var isJungzheng1 = junzheng_util.isJungzheng1(name);
|
|
|
- var isJungzheng2 = junzheng_util.isJungzheng2(name);
|
|
|
+ var isJungzheng1 = junzhengUtil.isJungzheng1(name);
|
|
|
+ var isJungzheng2 = junzhengUtil.isJungzheng2(name);
|
|
|
return isLexin || isJungzheng1 || isJungzheng2;
|
|
|
///2AXD
|
|
|
// return v.name == "AIrSMArT_d0311004155e";
|
|
@@ -205,8 +205,8 @@ Page({
|
|
|
|
|
|
var name = devicesList[0].name;
|
|
|
var deviceId = devicesList[0].deviceId;
|
|
|
- var isJungzheng1 = junzheng_util.isJungzheng1(name);
|
|
|
- var isJungzheng2 = junzheng_util.isJungzheng2(name);
|
|
|
+ var isJungzheng1 = junzhengUtil.isJungzheng1(name);
|
|
|
+ var isJungzheng2 = junzhengUtil.isJungzheng2(name);
|
|
|
|
|
|
if (isJungzheng1 || isJungzheng2) {
|
|
|
var param = 'deviceId=' + deviceId + '&name=' + name + "¶m=" + JSON.stringify(that.data.connectDevice)
|