feature：更新小程序版本2.25.4，新增色值、文件

app.js

@@ -1,9 +1,9 @@
 // app.ts
 import mqtt from './utils/mqtt';
 //连接的服务器域名
-// const host = 'wxs://mqtt.test.radio1964.com';
+const host = 'wxs://mqtt.test.radio1964.com';
 // const host = 'wxs://mqtt.test.radio1964.com:8884';
-const host = 'wxs://mqtt.ssl.keepradioon.net:8884'
+// const host = 'wxs://mqtt.ssl.keepradioon.net:8884'
 App({
   globalData: {
     statusBarHeight: 0,
@@ -15,10 +15,12 @@ App({
     pwdData: "",
     userData: null,
     userInfo: null,
-    newDeviceId: null, 
+    newDeviceId: null,
     is_debug: 2, // 1 测试环境 // 2正式环境
     client: null,
     oneInitBluetooth: true,
+    // 设备列表，跟app同步字段
+    classifyProducts: [],
     //MQTT连接的配置
     options: {
       clientId: "wx_" + parseInt(Math.random() * 100 + 800, 10),
@@ -35,51 +37,51 @@ App({
   connect() {
     this.globalData.client = mqtt.connect(host, this.globalData.options);
     // 连接成功
-    this.globalData.client.on('connect', ()=> {
+    this.globalData.client.on('connect', () => {
       const pageinfo = getCurrentPages()[getCurrentPages().length - 1];
-      if(pageinfo.mqttCallback) {
+      if (pageinfo.mqttCallback) {
         pageinfo.mqttCallback("connect")
       };
-      
+
     });
     // 接收消息
-    this.globalData.client.on("message", function(topic, payload) {
+    this.globalData.client.on("message", function (topic, payload) {
       wx.hideLoading();
       const pageinfo = getCurrentPages()[getCurrentPages().length - 1];
       const thisPageIsIndex = getCurrentPages().length === 1;
-      if(pageinfo.mqttCallback) {
-        if(topic.indexOf("status/onoffline") !== -1) {
-          pageinfo.mqttCallback("message_onoffline", {topic, payload});
-          if(!thisPageIsIndex) {
-            getCurrentPages()[0].mqttCallback("message_onoffline", {topic, payload})
+      if (pageinfo.mqttCallback) {
+        if (topic.indexOf("status/onoffline") !== -1) {
+          pageinfo.mqttCallback("message_onoffline", { topic, payload });
+          if (!thisPageIsIndex) {
+            getCurrentPages()[0].mqttCallback("message_onoffline", { topic, payload })
           }
-        } else if(topic.indexOf("user/pub_response") !== -1) {
-          pageinfo.mqttCallback("message", {topic, payload});
+        } else if (topic.indexOf("user/pub_response") !== -1) {
+          pageinfo.mqttCallback("message", { topic, payload });
         }
       };
     });
     //服务器连接异常的回调
-    this.globalData.client.on("error", function(error) {
+    this.globalData.client.on("error", function (error) {
       console.log(" 服务器 error 的回调" + error)
       const pageinfo = getCurrentPages()[getCurrentPages().length - 1];
-      if(pageinfo.mqttCallback) {
+      if (pageinfo.mqttCallback) {
         pageinfo.mqttCallback("error")
       };
     })
 
     // 服务器重连
-    this.globalData.client.on("reconnect", function(errr) {
+    this.globalData.client.on("reconnect", function (errr) {
       console.log(" 服务器 reconnect的回调", errr);
       const pageinfo = getCurrentPages()[getCurrentPages().length - 1];
-      if(pageinfo.mqttCallback) {
+      if (pageinfo.mqttCallback) {
         pageinfo.mqttCallback("reconnect")
       };
     })
     //服务器断开连接
-    this.globalData.client.on("offline", function(errr) {
+    this.globalData.client.on("offline", function (errr) {
       console.log(" 服务器 offline的回调", errr)
       const pageinfo = getCurrentPages()[getCurrentPages().length - 1];
-      if(pageinfo.mqttCallback) {
+      if (pageinfo.mqttCallback) {
         pageinfo.mqttCallback("offline")
       };
     })
@@ -88,13 +90,13 @@ App({
 
 
   // 订阅主题
-  subscribe: function(topic, callback) {
+  subscribe: function (topic, callback) {
 
     if (this.globalData.client && this.globalData.client.connected) {
       //订阅主题
-      this.globalData.client.subscribe(topic, function(err, granted) {
+      this.globalData.client.subscribe(topic, function (err, granted) {
         if (!err) {
-          if(callback) {
+          if (callback) {
             callback();
           }
           console.log("订阅成功");
@@ -112,7 +114,7 @@ App({
     }
   },
   // 取消订阅
-  unsubscribe: function(Topic) {
+  unsubscribe: function (Topic) {
     if (this.globalData.client && this.globalData.client.connected) {
       this.globalData.client.unsubscribe(Topic);
     } else {
@@ -139,11 +141,11 @@ App({
       wx.showLoading({
         title: '请稍后',
       });
-      const data = {"DstDeviceName": option.DstDeviceName,"SrcDeviceName": `ALY_${this.globalData.userInfo.userId}`,"type": option.type};
-      if(option.other) {
+      const data = { "DstDeviceName": option.DstDeviceName, "SrcDeviceName": `ALY_${this.globalData.userInfo.userId}`, "type": option.type };
+      if (option.other) {
         data.other = option.other;
       };
-      this.globalData.client.publish(`/${option.DstDeviceName}/user/sub_control`, `${JSON.stringify(data)}`,(err) => {
+      this.globalData.client.publish(`/${option.DstDeviceName}/user/sub_control`, `${JSON.stringify(data)}`, (err) => {
         if (err) {
           console.log("发布消息失败");
         }
@@ -159,18 +161,18 @@ App({
   },
   onLaunch() {
     var _this = this;
-    wx.onAppHide(()=> {
-      if(_this.globalData.client && _this.globalData.client.connected){
+    wx.onAppHide(() => {
+      if (_this.globalData.client && _this.globalData.client.connected) {
         _this.globalData.client.end(true);
         _this.globalData.client.end(true);
         console.log("断开");
       };
     });
 
-    wx.onAppShow(()=> {
+    wx.onAppShow(() => {
       console.log("加载")
-      if(_this.globalData.userInfo !== null){
-        if(_this.globalData.client) {
+      if (_this.globalData.userInfo !== null) {
+        if (_this.globalData.client) {
           _this.globalData.client.end(true);
           _this.globalData.client.end(true);
         }
@@ -183,27 +185,27 @@ App({
     wx.getSystemInfo({
       success: (res) => {
         let custom = wx.getMenuButtonBoundingClientRect();
-       
+
         _this.globalData.navBarHeight = res.statusBarHeight + custom.height + (custom.top - res.statusBarHeight) * 2;
         _this.globalData.MenuButtonheight = custom.height;
         _this.globalData.MenuButtonTop = custom.top;
-        
+
       }
-      
+
     })
   },
   // 获取蓝牙权限
-  getBluetoothStatus(){
+  getBluetoothStatus() {
     const _this = this;
     wx.getSetting({
-      success (res) {
-        if(res.authSetting["scope.bluetooth"]) {
+      success(res) {
+        if (res.authSetting["scope.bluetooth"]) {
           _this.globalData.scopeBluetooth = true;
-        } else if(res.authSetting["scope.bluetooth"] === undefined) {
+        } else if (res.authSetting["scope.bluetooth"] === undefined) {
           _this.globalData.scopeBluetooth = false;
-          wx.authorize({ 
+          wx.authorize({
             scope: "scope.bluetooth",
-            complete () {
+            complete() {
               _this.getBluetoothStatus();
             }
           });
@@ -212,11 +214,11 @@ App({
           wx.showModal({
             title: '请打开系统蓝牙进行配网',
             content: '如已打开蓝牙仍然弹框，请尝试重启小程序',
-            success (res) {
+            success(res) {
               if (res.confirm) {
                 console.log('用户点击确定')
                 wx.openSetting({
-                  complete () {
+                  complete() {
                     // _this.getBluetoothStatus();
                   }
                 })
@@ -226,7 +228,7 @@ App({
             }
           })
         };
-        if(getCurrentPages()[getCurrentPages().length - 1].getBluetoothStatusCallck) {
+        if (getCurrentPages()[getCurrentPages().length - 1].getBluetoothStatusCallck) {
           getCurrentPages()[getCurrentPages().length - 1].getBluetoothStatusCallck(_this.globalData.scopeBluetooth);
         }
         // res.authSetting = {

app.json

@@ -13,7 +13,9 @@
     "pages/me/me",
     "pages/download/download",
     "pages/wakeList/wakeList",
-    "pages/aboutInfo/aboutInfo"
+    "pages/aboutInfo/aboutInfo",
+    "pages/deviceList/devices",
+    "pages/deviceConMode/index"
   ],
   "tabBar": {
     "borderStyle": "black",

app.wxss

@@ -1,3 +1,11 @@
+
+/* 字体颜色 */
+
+.main_green {
+  color: #A4D099;
+}
+
+ /* 以前连接设备的 */
 .deviceRoter .roterps {
   padding: 0 66rpx;
 }

project.config.json

@@ -1,9 +1,5 @@
 {
   "description": "项目配置文件",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
   "setting": {
     "bundle": false,
     "userConfirmedBundleSwitch": false,
@@ -24,8 +20,6 @@
     "nodeModules": false,
     "enhance": true,
     "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
     "showShadowRootInWxmlPanel": true,
     "packNpmManually": false,
     "enableEngineNative": false,
@@ -42,9 +36,6 @@
     "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.19.4",
-  "appid": "wx08f94a3e90881910",
-  "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
@@ -55,5 +46,11 @@
       "format": "expanded",
       "extension": ".wxss"
     }
-  ]
+  ],
+  "appid": "wx08f94a3e90881910",
+  "libVersion": "2.19.4",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  }
 }

project.private.config.json

@@ -17,5 +17,6 @@
         }
       ]
     }
-  }
+  },
+  "libVersion": "2.25.4"
 }