feature: 处理设备详情界面数据的传递

pages/deviceDetail/detail.js

@@ -3,8 +3,13 @@
 const {
   BtHelper
 } = require('../../devices/bt_helper');
-const { deviceVersion } = require('../../request/deviceListRequest')
-import { EnumCmdEvent, CmdEvent } from '../../devices/cmd_key_event';
+const {
+  deviceVersion
+} = require('../../request/deviceListRequest')
+import {
+  EnumCmdEvent,
+  CmdEvent
+} from '../../devices/cmd_key_event';
 import EventManager from '../../utils/event_bus'
 import route_util from '../../utils/route_util';
 
@@ -85,7 +90,8 @@ Page({
   onLoad: function (options) {
     // let device = JSON.parse(options.param);
     console.log(getApp().globalData.mDeviceList.length)
-    let device = getApp().globalData.mDeviceList[0] ?? JSON.parse(options.param);
+    let device = JSON.parse(options.param);
+    // let device = getApp().globalData.mDeviceList[0] ?? JSON.parse(options.param);
     if (device.connectType != '1') {
       return
     }

pages/index/index.js

@@ -1016,6 +1016,7 @@ Page({
     finalList = finalList.concat(onLineWifiList);
     finalList = finalList.concat(onLineBlueList);
 
+    ///只需要蓝牙和wifi在线的
     let mDeviceList = []
     mDeviceList = mDeviceList.concat(onLineWifiList);
     mDeviceList = mDeviceList.concat(onLineBlueList);
@@ -1044,8 +1045,6 @@ Page({
     that.setData({
       deviceList: finalList
     });
-    console.log("更新设备列表：", finalList);
-    getApp().globalData.deviceList = finalList;
   },
 
   ///******************************* 可折叠 ********************************************///