Переглянути джерело

feature: 优化UI,解决狂点出现连接wifi数据异常的问题

Damon 7 місяців тому
батько
коміт
8d3a4c66a0
3 змінених файлів з 961 додано та 887 видалено
  1. 69 22
      pages/index/index.js
  2. 170 156
      pages/index/index.wxml
  3. 722 709
      pages/index/index.wxss

+ 69 - 22
pages/index/index.js

@@ -25,6 +25,7 @@ import {
 
 Page({
   data: {
+    navBarHeight: app.globalData.navBarHeight,
     nvabarData: {
       showCapsule: 0, //是否显示左上角图标   1表示显示    0表示不显示
       title: 'OhPlay', //导航栏 中间的标题
@@ -72,6 +73,67 @@ Page({
     deviceMacId: null,
     deviceListSelect: null,
     deviceList: [],
+    // deviceList: [{
+    //   "connectType": 3,
+    //   "devName": "猫王小王子OTR-X",
+    //   "state": "online",
+    //   "name": "BLUFI_7cdfa1fcbb24",
+    //   "deviceId": "BLUFI_7cdfa1fcbb24",
+    //   "mac": "BLUFI_7cdfa1fcbb24",
+    //   "imageUrl": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100319641863705.png",
+    //   "ProdModel": "MW-2AX(WIFI-N)",
+    //   "offlineImg": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100323674404211.png"
+    // }, {
+    //   "connectType": 3,
+    //   "devName": "猫王小王子OTR-X",
+    //   "state": "online",
+    //   "name": "BLUFI_7cdfa1fcbb24",
+    //   "deviceId": "BLUFI_7cdfa1fcbb24",
+    //   "mac": "BLUFI_7cdfa1fcbb24",
+    //   "imageUrl": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100319641863705.png",
+    //   "ProdModel": "MW-2AX(WIFI-N)",
+    //   "offlineImg": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100323674404211.png"
+    // }, {
+    //   "connectType": 3,
+    //   "devName": "猫王小王子OTR-X",
+    //   "state": "online",
+    //   "name": "BLUFI_7cdfa1fcbb24",
+    //   "deviceId": "BLUFI_7cdfa1fcbb24",
+    //   "mac": "BLUFI_7cdfa1fcbb24",
+    //   "imageUrl": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100319641863705.png",
+    //   "ProdModel": "MW-2AX(WIFI-N)",
+    //   "offlineImg": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100323674404211.png"
+    // }, {
+    //   "connectType": 3,
+    //   "devName": "猫王小王子OTR-X",
+    //   "state": "online",
+    //   "name": "BLUFI_7cdfa1fcbb24",
+    //   "deviceId": "BLUFI_7cdfa1fcbb24",
+    //   "mac": "BLUFI_7cdfa1fcbb24",
+    //   "imageUrl": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100319641863705.png",
+    //   "ProdModel": "MW-2AX(WIFI-N)",
+    //   "offlineImg": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100323674404211.png"
+    // }, {
+    //   "connectType": 3,
+    //   "devName": "猫王小王子OTR-X",
+    //   "state": "online",
+    //   "name": "BLUFI_7cdfa1fcbb24",
+    //   "deviceId": "BLUFI_7cdfa1fcbb24",
+    //   "mac": "BLUFI_7cdfa1fcbb24",
+    //   "imageUrl": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100319641863705.png",
+    //   "ProdModel": "MW-2AX(WIFI-N)",
+    //   "offlineImg": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100323674404211.png"
+    // }, {
+    //   "connectType": 3,
+    //   "devName": "猫王小王子OTR-X",
+    //   "state": "online",
+    //   "name": "BLUFI_7cdfa1fcbb24",
+    //   "deviceId": "BLUFI_7cdfa1fcbb24",
+    //   "mac": "BLUFI_7cdfa1fcbb24",
+    //   "imageUrl": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100319641863705.png",
+    //   "ProdModel": "MW-2AX(WIFI-N)",
+    //   "offlineImg": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20230310100323674404211.png"
+    // }],
     connectDeviceIding: "",
   },
 
@@ -588,7 +650,6 @@ Page({
   addWifiDevice(device) {
     var that = this;
     var isOK = app.globalData.client && app.globalData.client.connected;
-    console.log("gadsfqwerqwr==00==" + app.globalData.client);
     if (!isOK) {
       app.connect();
       setTimeout(() => {
@@ -597,12 +658,9 @@ Page({
       return;
     };
 
-    console.log("gadsfqwerqwr==11==" + isOK);
     var deviceId = device.deviceId;
     var addDeviceList = lexin_add.addWifiDevice(device);
-    console.log("gadsfqwerqwr==22==" + addDeviceList.length);
     that.updateDeviceList(addDeviceList, false, false);
-    console.log("gadsfqwerqwr==333==" + that.data.deviceList.length);
 
     var indexPage = that.data.indexPage;
     that.setData({
@@ -615,24 +673,13 @@ Page({
 
   refreshCurrentDevice(device) {
     var that = this;
-    var deviceList = that.getDeviceList();
-    var selectIndex = null;
-    for (var i = 0; i < deviceList.length; i++) {
-      if (device.deviceId == deviceList[i].deviceId) {
-        selectIndex = i;
-        break;
-      }
-    }
-
-    if (selectIndex != null) {
-      var addDeviceList = lexin_add.addWifiDevice(device);
-      that.updateDeviceList(addDeviceList, false, false);
-      that.setData({
-        autoConnected: true,
-        deviceListSelect: selectIndex,
-        connectDeviceIding: "",
-      });
-    }
+    var addDeviceList = lexin_add.addWifiDevice(device);
+    that.updateDeviceList(addDeviceList, false, false);
+    that.setData({
+      autoConnected: true,
+      deviceListSelect: 0,
+      connectDeviceIding: "",
+    });
   },
 
   /// 手机关闭蓝牙,所有蓝牙设备离线

Різницю між файлами не показано, бо вона завелика
+ 170 - 156
pages/index/index.wxml


Різницю між файлами не показано, бо вона завелика
+ 722 - 709
pages/index/index.wxss