feature: 适配乐鑫和君正wifi配网mqtt处理

app.js

@@ -219,6 +219,7 @@ App({
       //订阅主题
       // err:null
       // granted:[{"topic":"/AIrSMArT_861210052355545/status/onoffline","qos":0}]
+      console.log("gadfsqwerqewqrqr==222==" + topic);
       that.globalData.client.subscribe(topic, function (err, granted) {
         if (!err) {
           if (callback) {
@@ -280,7 +281,7 @@ App({
       var publish = `/${DstDeviceName}/user/sub_control`;
       // {"type":"get_dev_info","DstDeviceName":"AIrSMArT_7cdfa1fd3af0","SrcDeviceName":"ALY_933625"}
       var dataString = `${JSON.stringify(data)}`;
-      console.log("gadfsqwerqewqrqr====" + dataString);
+      console.log("gadfsqwerqewqrqr==111==" + dataString);
       that.globalData.client.publish(publish, dataString, (err) => {
         if (err) {
           console.log("发布消息失败");

pages/deviceConnect2/deviceConnect2.js

@@ -105,12 +105,12 @@ Page({
         // 搜索到蓝牙
         if (options.result) {
           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);
-            // return isLexin || isJungzheng1 || isJungzheng2;
-            return v.name == "AIrSMArT_861210052356337";
+            var name = v.name;
+            var isLexin = name.indexOf(lexin_devices.leXin) !== -1;
+            var isJungzheng1 = junzheng_util.isJungzheng1(name);
+            var isJungzheng2 = junzheng_util.isJungzheng2(name);
+            return isLexin || isJungzheng1 || isJungzheng2;
+            // return v.name == "AIrSMArT_861210052356337";
           });
 
           if (!strings.isEmpty(devicesList)) {

utils/lexin/jump.js

@@ -36,17 +36,19 @@ function toChannelIndex(index, callback) {
   var channelData = pages[0].getChannelData();
 
   // `${deviceUid}`
-  var deviceUid = `${app.globalData.userInfo.deviceUid}`;
+  var userId = `${app.globalData.userInfo.userId}`;
   var timestamp = Math.round(new Date() / 1000);
   var channel_id = channelData[index].channelNum;
   var is_debug = app.globalData.is_debug;
 
   var deviceId = deviceList[deviceListSelect].deviceId;
   /// 933625
+  console.log("gadfadsfqewrq==111=" + userId);
+  console.log("gadfadsfqewrq==222=" + JSON.stringify(app.globalData.userInfo));
   const other = {
     "url": "",
     "media_data": "",
-    "user_id": "933625",
+    "user_id": userId,
     "timestamp": timestamp,
     "channel_id": channel_id,
     "order": "",