feature: 只差数据接收处理

app.js

@@ -8,8 +8,11 @@ import env from './utils/env.js';
 // const host = 'wxs://mqtt.test.radio1964.com';
 // const host = 'wxs://mqtt.ssl.keepradioon.net:8884'
 
+// const iosHost = 'wxs://mqtt.test.radio1964.com:8884';
+// const androidHost = 'wxs://mqtt.ssl.keepradioon.net:8884'
+
 const iosHost = 'wxs://mqtt.test.radio1964.com:8884';
-const androidHost = 'wxs://mqtt.ssl.keepradioon.net:8884'
+const androidHost = 'wxs://mqtt.test.radio1964.com:8884'
 App({
   globalData: {
     isRelease: false,

pages/index/index.js

@@ -82,7 +82,7 @@ Page({
       "connectType": 3,
       // "mac": "AIrSMArT_861210052356337",
       // "deviceId": "D0:31:10:86:AC:9A"
-      "mac": "AIrSMArT_861210052356337",
+      "name": "MW-X4（BZK）",
       "deviceId": "AIrSMArT_861210052356337"
     }],
     _willConnectBle: null,
@@ -343,7 +343,7 @@ Page({
   },
   // 回调
   mqttCallback(type, option) {
-    console.log("gadsfadsfadsfa==888===" + type + "====" + JSON.stringify(option));
+    console.log("gadsfadsfadsfa==999===" + type + "====" + JSON.stringify(option));
     var that = this;
     let payloads = null;
     if (option && option.payload) {
@@ -464,6 +464,7 @@ Page({
   onTapChannelIndex(e) {
     var that = this;
     var index = e.currentTarget.dataset.index;
+    console.log("gadsfadsfadsfa==111==" + index);
     lexin_jump.toChannelIndex(index, function (i) {
       that.setData({
         actionIndex: i,

utils/lexin/devices.js

@@ -14,6 +14,7 @@ const clientTypes = ["MW-2AX(WIFI)", "MW-2AX(WIFI-N)", "MW-2AX(A)",
   "MW-SR1(4G_WIFI)",
   "MW-SR1(4G_WIFI_MEIZU01)",
   "MW-Mate X(4G_WIFI)",
+  "MW-X4 (BZK)",
 ];
 
 module.exports = {

utils/lexin/jump.js

@@ -9,17 +9,19 @@ function toChannelIndex(index, callback) {
   const route_util = require('../route_util');
   const route_constant = require('../route_constant');
   var isLogin = pages[0].getIsLogin();
-  console.log("gadfqwwerqewrqr==11==" + isLogin);
+  console.log("gadsfadsfadsfa==222==");
   if (!isLogin) {
     route_util.jump(route_constant.login);
     return;
   }
 
+  console.log("gadsfadsfadsfa==333==");
   var actionIndex = pages[0].getActionIndex();
   if (actionIndex != null && index == actionIndex) {
     return;
   };
 
+  console.log("gadsfadsfadsfa==444==");
   var deviceList = pages[0].getDeviceList();
   var deviceListSelect = pages[0].getDeviceListSelect();
   if (deviceListSelect === null || deviceList.length <= deviceListSelect) {
@@ -30,8 +32,10 @@ function toChannelIndex(index, callback) {
     return;
   };
 
+  console.log("gadsfadsfadsfa==555==");
   callback(index);
 
+  console.log("gadsfadsfadsfa==666==");
   const app = getApp();
   const lexin_util = require('../lexin/util');
   var channelData = pages[0].getChannelData();
@@ -59,6 +63,8 @@ function toChannelIndex(index, callback) {
   //other: {"url":"","media_data":"","user_id":1,"timestamp":1734423952,"channel_id":4,"order":"","resource_from":"","songAlbumID":"","version":3,"is_debug":2}
   //deviceMacId: AIrSMArT_7cdfa1fd3af0
   var deviceMacId = lexin_util.getDeviceMacId(deviceId);
+  console.log("gadsfadsfadsfa==777==" + deviceMacId);
+  console.log("gadsfadsfadsfa==888==" + JSON.stringify(other));
   app.PubMsg({
     type: "play",
     DstDeviceName: deviceMacId,

utils/lexin/subscribe.js

@@ -33,7 +33,6 @@ function subscribeSingleDevice(device) {
 
 // 订阅在线设备
 function subscribeAllDevice() {
-  console.log("gadsfadsfadsfa==999===");
   const strings = require('../strings');
   var pages = getCurrentPages();
   var deviceList = pages[0].getDeviceList();
@@ -41,21 +40,15 @@ function subscribeAllDevice() {
     return;
   }
 
-  console.log("gadsfadsfadsfa==aaa===");
   const app = getApp();
   const lexin_util = require('../lexin/util');
   ///扫描所有在线Wifi设备
   for (var i = 0; i < deviceList.length; i++) {
     var device = deviceList[i];
-    console.log("gadsfadsfadsfa==bbb===" + JSON.stringify(device));
-    console.log("gadsfadsfadsfa==ffff==" + device.connectType);
-    // device.connectType = 3;
-    // device.deviceId = "AIrSMArT_861210052356337";
     if (device.connectType == 3) {
       var deviceId = device.deviceId;
       var mac = lexin_util.getMacByDeviceId(deviceId);
       var topic = `/AIrSMArT_${mac}/status/onoffline`;
-      console.log("gadsfadsfadsfa==ccc===" + mac + "===" + topic);
       app.subscribe(topic);
     }
   }

utils/lexin/util.js

@@ -8,16 +8,13 @@ module.exports = {
 
 ///获取设备mac相关 macId: deviceId.split(lexin_devices.leXinÏ)[1]
 function getMacBySplitDeviceId(splitDeviceId) {
-  console.log("gadsfadsfadsfa==mmm===" + splitDeviceId);
   if (splitDeviceId.length < 12) {
     return splitDeviceId;
   }
-  console.log("gadsfadsfadsfa==nnn===" + splitDeviceId);
   return splitDeviceId.slice(-12);
 };
 
 function getMacByDeviceId(deviceId) {
-  console.log("gadsfadsfadsfa==xxx===" + deviceId);
   const lexin_devices = require('../lexin/devices');
   var deviceIdLeXin = deviceId.split(lexin_devices.leXin);
   var deviceIdJunZheng1 = deviceId.split(lexin_devices.junZheng1);
@@ -34,7 +31,6 @@ function getMacByDeviceId(deviceId) {
   if (isLeXin) {
     return getMacBySplitDeviceId(deviceIdLeXin[1]);
   } else if ((isJunZheng1 && !isJunZheng3)) {
-    console.log("gadsfadsfadsfa==yyy===" + deviceId);
     return getMacBySplitDeviceId(deviceIdJunZheng1[1]);
   } else if ((isJunZheng2 && !isJunZheng3)) {
     return getMacBySplitDeviceId(deviceIdJunZheng2[1]);
@@ -70,15 +66,6 @@ function getDeviceMacId(deviceId) {
   } else {
     return "";
   }
-  if (isLeXin) {
-    return `${lexin_devices.junZheng1}${getMacBySplitDeviceId(deviceIdLeXin[1])}`
-  } else if ((isJunZheng1 && !isJunZheng3)) {
-    return `${lexin_devices.junZheng1}${getMacBySplitDeviceId(isJunZheng1[1])}`
-  } else if ((isJunZheng2 && !isJunZheng3)) {
-    return `${lexin_devices.junZheng1}${getMacBySplitDeviceId(isJunZheng2[1])}`
-  } else {
-    return "";
-  }
 };
 
 ///通过设备id获取mac地址