发箍固件升级完成，wl200测试中，目前缺失wl200固件包

package.json

@@ -37,7 +37,7 @@
   "dependencies": {
     "@antmjs/vantui": "^3.2.2",
     "@flossom-npm/iot-translater": "^1.0.8",
-    "@flossom-npm/iot-translater-we100": "^1.0.66",
+    "@flossom-npm/iot-translater-we100": "^1.1.1",
     "@reduxjs/toolkit": "^2.0.1",
     "@taroify/core": "^0.1.1-alpha.8",
     "@tarojs/components": "3.6.19",

src/components/bluetoot/connection/index.tsx

@@ -32,22 +32,30 @@ import {
   getofflineData,
   hex2int,
   getTimeCode,
+  isNeedToUpdate,
 } from "@/utils/util";
 const log = require("@/utils/log");
 import commandMap from "@/utils/commandMap";
 import { bleCommandSamples } from "./test";
 
 import { DeviceToolKit as DeviceToolKitWE100 } from "@flossom-npm/iot-translater-we100";
-const deviceToolKitInstanceWL200 = new DeviceToolKitWE100("WE100", "WL200");
+const deviceToolKitInstanceWL200 = new DeviceToolKitWE100("WL200", "WL200");
 deviceToolKitInstanceWL200.setDebug(true);
 
+// const _deviceToolKitInstanceWL200 = new DeviceToolKitWE100("WE100", "WL200");
+
 const deviceToolKitInstanceM01 = new DeviceToolKitWE100("WE100", "M01");
 deviceToolKitInstanceM01.setDebug(true);
 
 const deviceToolKitInstanceFR200 = new DeviceToolKitFR200("FR200");
 
 import { DeviceToolKit as DeviceToolKitFR200 } from "@flossom-npm/iot-translater";
-import { showModal, msg } from "@/utils/traoAPI";
+import {
+  showModal,
+  msg,
+  setStorageSync,
+  getStorageSync,
+} from "@/utils/traoAPI";
 
 // const { InstrumentTypeEnum, OtaDeviceTypeEnum } = app.globalData;
 import InstrumentTypeEnum from "../InstrumentTypeEnum";
@@ -72,10 +80,10 @@ let sendgetversionTimer: any = null;
 let sendGetVersionTimerNum = 0;
 
 let searchBluetootTimers: any = null; // 搜索蓝牙定时器
-let searchBluetootTimersNum = 0; // 搜索蓝牙秒数
+let searchBluetootTimersNum = 15; // 搜索蓝牙秒数 15秒
 
 let connectionTimer: any = null; // 连接蓝牙定时器
-let connectionTimerNum = 0;
+let connectionTimerNumber = 10000; // 连接蓝牙超时毫秒
 
 let sendPairingTimer: any = null; // 发送配对
 
@@ -106,6 +114,16 @@ class ConnectionBluetoot extends Component<any, any> {
       offlineDataindex: 0, //离线记录发送下标index
       versionInfo: {}, //版本号
       offlineDataList: [], //离线数据
+
+      prefix: "12CAA", // WL200蓝牙搜索前缀
+
+      // WL200匹配
+      tranType: [
+        "WE100", // 发箍
+        "WE200", // 发箍
+        "WL200", // 发箍
+        "12CAA", // 面罩前缀名
+      ],
     };
   }
 
@@ -122,6 +140,14 @@ class ConnectionBluetoot extends Component<any, any> {
 
   async initData() {}
 
+  isWL200() {
+    let currentDevicesName = getStorageSync("currentDevicesName");
+    if (currentDevicesName.indexOf("12CAA") > -1) {
+      return true;
+    }
+    return false;
+  }
+
   close() {
     clearInterval(sendPairingTimer);
     clearInterval(sendgetversionTimer);
@@ -267,7 +293,7 @@ class ConnectionBluetoot extends Component<any, any> {
               "searchBluetootTimersNum value => ",
               searchBluetootTimersNum
             );
-            if (searchBluetootTimersNum === 8) {
+            if (searchBluetootTimersNum === 15) {
               clearInterval(searchBluetootTimers);
               this.setState({
                 error: true,
@@ -289,43 +315,36 @@ class ConnectionBluetoot extends Component<any, any> {
   onBluetoothDeviceFound() {
     Taro.onBluetoothDeviceFound((item: any) => {
       console.log("蓝牙查找item", item, item.devices[0].name);
-      /*
-       * 这里增加判断，类型不同识别的设备名称不一样
-       * type1 FR200
-       * type2 WM100
-       * type3 we100
-       * type4 FR380
-       * */
-      // const tranType = {
-      //   1: "FR200",
-      //   3: "WE200", // WL200
-      //   4: "FR380",
-      //   5: "FR390",
-      //   6: "WE200", // M01
-      // };
-      // let type = this.props.yiqiInfo.model || "FR200";
-      let type = "WE200";
-      // this.props.yiqiInfo.model = type;
-      console.log("this.props.yiqiInfo.model", this.props.yiqiInfo.model);
       console.info("搜索到到蓝牙设备 value => ", item.devices[0]?.name);
+      console.log(">>>>>>>当前传入设备类型>>>>>", this.props.yiqiInfo.model);
+      // 先匹配到哪个连接哪个
+      let tranType = [
+        this.props.yiqiInfo.model, // 当前传入设备类型
+        ...this.state.tranType,
+      ];
       for (let i = 0; i < item.devices.length; i++) {
-        if (
+        let devicesName = item.devices[i].localName || item.devices[i].name;
-          item.devices[i].connectable &&
+        console.log("devicesName", devicesName);
-          (item.devices[i].localName
+        console.log("tranType", tranType);
-            ? item.devices[i].localName
+        // 是否匹配可连接设备
-            : item.devices[i].name
+        let isAvailable = tranType.some(
-          ).indexOf(`${type}`) !== -1
+          (item) => devicesName && devicesName.indexOf(item) > -1
-        ) {
+        );
-          console.log("连接的设备信息", item.devices[i], type);
+        console.log("isAvailable", isAvailable);
+        // 判断设备是否可连接
+        if (item.devices[i].connectable && isAvailable) {
+          // 缓存当前连接设备名 可能是发箍或面罩
+          setStorageSync("currentDevicesName", devicesName);
+          console.log("连接的设备信息", item.devices[i], devicesName);
+
           let params = {
             deviceId: item.devices[i].deviceId,
           };
-          this.props.setDeviceId(params);
+          this.props.setDeviceId(params); // 设置蓝牙连接设备ID
 
           setTimeout(() => {
             clearInterval(searchBluetootTimers);
             Taro.stopBluetoothDevicesDiscovery(); //停止搜索蓝牙
-            // app.globalData.deviceInfo.deviceId = item.devices[i].deviceId;
             this.createBLEConnection();
           }, 10);
           break;
@@ -343,10 +362,6 @@ class ConnectionBluetoot extends Component<any, any> {
     } catch (e) {}
     clearTimeout(connectionTimer);
     const { yiqiInfo: deviceInfo } = this.props;
-    console.log(
-      "this.props.bluetoothInfo.deviceId",
-      this.props.bluetoothInfo.deviceId
-    );
     /*********开始主动连接*******/
     createBLEConnection(this.props.bluetoothInfo.deviceId)
       .then((res) => {
@@ -362,7 +377,7 @@ class ConnectionBluetoot extends Component<any, any> {
                 if (overTimer) clearTimeout(overTimer);
                 this.failErrorCode(-1, "连接蓝牙失败，请重新开机后重试");
               }
-            }, 10000);
+            }, connectionTimerNumber);
           }
           this.getBLEDeviceServices(); //获取特征
         } else {
@@ -424,6 +439,7 @@ class ConnectionBluetoot extends Component<any, any> {
             console.log("onBLECharacteristicValueChange value => ", value);
             let str = ab2hex(value.value); //转为16进制字符串
             console.log("转为16进制字符串 str", str);
+
             let connectionStatus = [
               "FR200",
               "WL200",
@@ -434,27 +450,29 @@ class ConnectionBluetoot extends Component<any, any> {
 
             let jsonStatus: any = null;
             let querySubDeviceArrayBuffer;
+
             if (deviceInfo.model == "WL200") {
-              querySubDeviceArrayBuffer =
+              if (this.isWL200()) {
-                deviceToolKitInstanceWL200.toBleCommand(
+                jsonStatus = deviceToolKitInstanceWL200.toJsonStatus(
-                  bleCommandSamples.querySubDevice as any
+                  value.value
                 );
-              jsonStatus = deviceToolKitInstanceWL200.toJsonStatus(value.value);
+                querySubDeviceArrayBuffer =
-              // jsonStatus = deviceToolKitInstanceM01.toJsonStatus(value.value);
+                  deviceToolKitInstanceWL200.toBleCommand(
-              // querySubDeviceArrayBuffer = deviceToolKitInstanceM01.toBleCommand(
+                    bleCommandSamples.querySubDevice as any
-              //   bleCommandSamples.querySubDevice as any
+                  );
-              // ); // todo
+              } else {
+                jsonStatus = deviceToolKitInstanceM01.toJsonStatus(value.value);
+                querySubDeviceArrayBuffer =
+                  deviceToolKitInstanceM01.toBleCommand(
+                    bleCommandSamples.querySubDevice as any
+                  );
+              }
             } else if (deviceInfo.model == "M01") {
               jsonStatus = deviceToolKitInstanceM01.toJsonStatus(value.value);
               querySubDeviceArrayBuffer = deviceToolKitInstanceM01.toBleCommand(
                 bleCommandSamples.querySubDevice as any
               );
             }
-            // log.info(
-            //   commandMap.reciviedBLECommand,
-            //   `仪器模式: ${deviceInfo.model}`,
-            //   jsonStatus
-            // );
             console.log(
               commandMap.reciviedBLECommand,
               `仪器模式: ${deviceInfo.model}`,
@@ -487,7 +505,7 @@ class ConnectionBluetoot extends Component<any, any> {
                     }*/
                   }
                   break;
-                case "BleStatusSync":
+                case "BleStatusSync": // 设备连接状态
                   if (jsonStatus.connectMessage?.connectType == "CONNECTED") {
                     switch (jsonStatus.connectMessage?.deviceName) {
                       case OtaDeviceTypeEnum.WE100:
@@ -523,9 +541,24 @@ class ConnectionBluetoot extends Component<any, any> {
                     subDeviceConnectedStatus: true,
                     synchronousStatus: true,
                   });
-                  const deviceVersionNo = jsonStatus.versionNo;
+
-                  const latestVersionNo = deviceInfo.iot_versions;
+                  let currentDevicesName = getStorageSync("currentDevicesName");
-                  // const isNeedToUpdateBl =  isNeedToUpdate(deviceVersionNo, latestVersionNo)
+                  let deviceVersionNo = jsonStatus.versionNo;
+                  let latestVersionNo = deviceInfo.iotVersion;
+                  if (currentDevicesName.indexOf("12CAA") < -1) {
+                    latestVersionNo = deviceInfo.we200IotVersion;
+                  }
+                  const isNeedToUpdateBl = isNeedToUpdate(
+                    deviceVersionNo,
+                    latestVersionNo
+                  );
+                  console.log("deviceInfo", deviceInfo);
+                  console.log("isNeedToUpdateBl", isNeedToUpdateBl);
+                  if (isNeedToUpdateBl) {
+                    // 版本号需要更新，显示更新弹窗
+                    this.props.upgradeFun();
+                  }
+
                   // 判断是否需要升级
                   // M01和WL200 不需要在这里进行蓝牙更新
                   // if (isNeedToUpdateBl) {
@@ -551,9 +584,12 @@ class ConnectionBluetoot extends Component<any, any> {
                     hasSyncRecord: true,
                     synchronousStatus: true,
                   });
-                  console.log("offlineClockSummary value =>", jsonStatus);
+                  console.log(
-                  // this.triggerEvent("pairingChange", this.state);
+                    "离线汇总offlineClockSummary value =>",
-                  this.pairingChange(this.state);
+                    jsonStatus
+                  );
+                // this.triggerEvent("pairingChange", this.state);
+                // this.pairingChange(this.state);
                 // TODO 查询离线记录结果
                 default:
                   break;
@@ -629,25 +665,20 @@ class ConnectionBluetoot extends Component<any, any> {
         value: `dbf0a00300${ccrc8("dbf0a00300")}de`,
       });
     } else {
-      // const otaDeviceType = deviceInfo.type == instrumentTypeEnum.WL200 ? OtaDeviceTypeEnum.WL200 : OtaDeviceTypeEnum.WE100;
+      const otaDeviceType = this.isWL200()
-      // 通过发箍连  都用we100
+        ? OtaDeviceTypeEnum.WL200
-      const otaDeviceType =
+        : OtaDeviceTypeEnum.WE100;
-        deviceInfo.model == InstrumentTypeEnum.WL200
-          ? OtaDeviceTypeEnum.WE100
-          : OtaDeviceTypeEnum.WE100;
       const versionCommand = {
         commandType: "InfoQuery",
         infoQueryType: "versionInfo",
         otaDeviceType,
       };
-      // const value =
+      console.log("versionCommand", versionCommand);
-      //   deviceInfo.model == InstrumentTypeEnum.WL200
+
-      //     ? deviceToolKitInstanceM01.toBleCommand(versionCommand as any)
+      // 区分WL200 和 发箍
-      //     : deviceToolKitInstanceM01.toBleCommand(versionCommand as any);
+      const value = this.isWL200()
-      const value =
+        ? deviceToolKitInstanceWL200.toBleCommand(versionCommand as any)
-        deviceInfo.type == InstrumentTypeEnum.WL200
+        : deviceToolKitInstanceM01.toBleCommand(versionCommand as any);
-          ? deviceToolKitInstanceWL200.toBleCommand(versionCommand as any)
-          : deviceToolKitInstanceM01.toBleCommand(versionCommand as any);
       sendCommand({ value });
     }
   }
@@ -710,14 +741,20 @@ class ConnectionBluetoot extends Component<any, any> {
         );
         break;
       case InstrumentTypeEnum.WL200:
-        // console.log("WL200无法配对，只能用M01");
         console.log("正在发送WL200", bleCommandSamples.match);
-        // matchArrayBuffer = deviceToolKitInstanceWL200.toBleCommand(
+        let currentDevicesName = getStorageSync("currentDevicesName");
-        //   bleCommandSamples.match as any
+        // 区分面罩和发箍
-        // );
+        if (currentDevicesName.indexOf("12CAA") > -1) {
-        matchArrayBuffer = deviceToolKitInstanceM01.toBleCommand(
+          console.log("12CAA");
-          bleCommandSamples.match as any
+          matchArrayBuffer = deviceToolKitInstanceWL200.toBleCommand(
-        );
+            bleCommandSamples.match as any
+          );
+        } else {
+          matchArrayBuffer = deviceToolKitInstanceM01.toBleCommand(
+            bleCommandSamples.match as any
+          );
+        }
+
         break;
       case InstrumentTypeEnum.FR380:
         writeBLECharacteristicValue({
@@ -905,7 +942,8 @@ class ConnectionBluetoot extends Component<any, any> {
     isGetSubDeviceTimer = setInterval(() => {
       sendCommand({ value });
       isGetSubDeviceTimerNum += 1;
-      if (isGetSubDeviceTimerNum == 8) {
+      // 15秒超时
+      if (isGetSubDeviceTimerNum === 15) {
         this.closeQuerySubDevice();
         this.setState({
           error: true,
@@ -928,7 +966,6 @@ class ConnectionBluetoot extends Component<any, any> {
     isGetVersionTimer = setInterval(() => {
       if (this.state.hasVersionInfo) {
         if (isGetVersionTimer) clearTimeout(isGetVersionTimer);
-        // that.sendSyncRecording()
       } else {
         sendGetVersionTimerNum += 1;
         if (sendGetVersionTimerNum >= 10) {
@@ -937,8 +974,8 @@ class ConnectionBluetoot extends Component<any, any> {
           this.setState({
             connectionStatus: true,
           });
-          console.log("this.pairingChange", this.state);
+          console.log("超时未返回版本号 this.pairingChange", this.state);
-          this.pairingChange(this.state);
+          // this.pairingChange(this.state);
         } else {
           this.sendGetVersion();
         }
@@ -963,10 +1000,9 @@ class ConnectionBluetoot extends Component<any, any> {
       commandType: "InfoQuery",
       infoQueryType: "offlineClockSummary",
     };
-    const value =
+    const value = this.isWL200()
-      deviceInfo.model == InstrumentTypeEnum.WL200
+      ? deviceToolKitInstanceWL200.toBleCommand(versionCommand as any)
-        ? deviceToolKitInstanceWL200.toBleCommand(versionCommand as any)
+      : deviceToolKitInstanceM01.toBleCommand(versionCommand as any);
-        : deviceToolKitInstanceM01.toBleCommand(versionCommand as any);
     sendCommand({ value }).then();
     if (isGetSyncRecordingTimer) clearTimeout(isGetSyncRecordingTimer);
     isGetSyncRecordingTimer = setTimeout(() => {

src/components/bluetoot/update-wl200/index.tsx

@@ -40,8 +40,12 @@ import OtaDeviceTypeEnum from "../OtaDeviceTypeEnum";
 
 // 临时替代
 var log = console;
-var deviceToolKitInstance: any = null;
+
-deviceToolKitInstance = new DeviceToolKitWE100("WE100", "WL200");
+let deviceToolKitInstance: any = null;
+// WE200 M01 M02都是WE200
+let deviceToolKitInstanceM01 = new DeviceToolKitWE100("WE100", "M01");
+// WL200面罩
+let deviceToolKitInstanceWL200 = new DeviceToolKitWE100("WL200", "WL200");
 
 import "./index.less";
 
@@ -80,8 +84,24 @@ class UpdateIotWL200 extends Component<any, any> {
     this.initData();
   }
 
+  isWL200() {
+    let currentDevicesName = getStorageSync("currentDevicesName");
+    if (currentDevicesName.indexOf("12CAA") > -1) {
+      return true;
+    }
+    return false;
+  }
+
   async initData() {
     console.log("UpdateIotWL200");
+    if (this.isWL200()) {
+      console.log("WL200更新");
+      deviceToolKitInstance = deviceToolKitInstanceWL200;
+    } else {
+      console.log("WE100更新");
+      deviceToolKitInstance = deviceToolKitInstanceM01;
+    }
+
     let objStr = getStorageSync("instrument_detail");
     if (objStr) {
       let info = JSON.parse(objStr);
@@ -89,12 +109,6 @@ class UpdateIotWL200 extends Component<any, any> {
       this.setState({
         currentDevice: info,
       });
-
-      if (info.model == InstrumentTypeEnum.WL200) {
-        deviceToolKitInstance = new DeviceToolKitWE100("WE100", "WL200");
-      } else {
-        deviceToolKitInstance = new DeviceToolKitWE100("WE100", "M01");
-      }
     }
     setTimeout(() => {
       this.notifyBLECharacteristicValueChange();
@@ -134,22 +148,22 @@ class UpdateIotWL200 extends Component<any, any> {
    */
   startOTA() {
     this.resetOta();
-    const { currentDevice } = this.state;
     let jsoncmd = {
       commandType: "OTAStart",
       otaDeviceType: "",
       versionNo: this.$otaDataGroup.versionNo,
     };
     // 根据设备类型传 otaDeviceType
-    if (currentDevice.model == InstrumentTypeEnum.M01) {
+    if (this.isWL200()) {
-      jsoncmd.otaDeviceType = OtaDeviceTypeEnum.WE100;
-    } else {
       jsoncmd.otaDeviceType = OtaDeviceTypeEnum.WL200;
+    } else {
+      jsoncmd.otaDeviceType = OtaDeviceTypeEnum.WE100;
     }
-    // deviceToolKitInstance.setDebug(true)
+
+    console.log("startOTA jsoncmd", jsoncmd);
 
     //@ts-ignore
-    const value = deviceToolKitInstance.toBleCommand(jsoncmd);
+    const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
     console.log(jsoncmd);
     sendCommand({ value }).then((res) => {
       this.setState({
@@ -173,7 +187,7 @@ class UpdateIotWL200 extends Component<any, any> {
     };
     console.info("OTAPrepare json => ", jsoncmd);
     //@ts-ignore
-    const value = deviceToolKitInstance.toBleCommand(jsoncmd);
+    const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
     sendCommand({ value });
   }
   /**
@@ -194,7 +208,7 @@ class UpdateIotWL200 extends Component<any, any> {
     };
     console.info("OTAUpdating json => ", jsoncmd);
     //@ts-ignore
-    const value = deviceToolKitInstance.toBleCommand(jsoncmd);
+    const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
     sendCommand({ value });
   }
   /**
@@ -208,7 +222,7 @@ class UpdateIotWL200 extends Component<any, any> {
     clearInterval(this.$checkTimer);
     log.info("ota成功日志, 清除计时器");
     //@ts-ignore
-    const value = deviceToolKitInstance.toBleCommand(jsoncmd);
+    const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
     sendCommand({ value }).then((res) => {
       this.resetOta();
     });
@@ -231,7 +245,7 @@ class UpdateIotWL200 extends Component<any, any> {
       commandType: "OTAQuit",
     };
     //@ts-ignore
-    const value = deviceToolKitInstance.toBleCommand(jsoncmd);
+    const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
     sendCommand({ value })
       .then((res) => {
         this.resetOta();
@@ -357,7 +371,7 @@ class UpdateIotWL200 extends Component<any, any> {
       Taro.onBLECharacteristicValueChange((value) => {
         // let str = ab2hex(value.value); //转为16进制字符串
         //  console.log('返回',str)
-        const jsonStatus = deviceToolKitInstance.toJsonStatus(value.value);
+        const jsonStatus: any = deviceToolKitInstance.toJsonStatus(value.value);
         log.info("OTA页面设备响应数据打印==》", JSON.stringify(jsonStatus));
         console.info("onBLECharacteristicValueChange json => ", jsonStatus);
         this.$otaDataGroup.currentPackageNo = jsonStatus.currentPackageNo;
@@ -376,7 +390,7 @@ class UpdateIotWL200 extends Component<any, any> {
     this.$checkTimer = setInterval(() => {
       // 超过7s没有回包, 直接断开
       if (this.$otaDataGroup.countDown <= 0 && this.state.hadStartOta) {
-        if (this.state.currentDevice.model == InstrumentTypeEnum.M01) {
+        if (!this.isWL200()) {
           this.quitOTA("shutDownMaskTip");
         } else {
           this.quitOTA("updateTimeOut");
@@ -412,6 +426,7 @@ class UpdateIotWL200 extends Component<any, any> {
 
   render() {
     let { isShow } = this.props;
+    let { progressbar } = this.state;
     return (
       <Block>
         <PageMeta pageStyle={isShow ? "overflow: hidden;" : ""} />
@@ -437,11 +452,11 @@ class UpdateIotWL200 extends Component<any, any> {
               <View className={classnames("common-popup-content", "text-left")}>
                 <View className="progress">
                   <Progress
-                    percentage={0.01 * 100}
+                    percentage={progressbar}
                     strokeWidth="12"
                     color="linearGradient(to right, #eecda1, #ffe9c7) !important"
                   />
-                  <View className="percent"> {0.01 * 100}%</View>
+                  <View className="percent"> {progressbar}%</View>
                 </View>
                 <View className="progress-tips">注意事项：</View>
                 <View className="progress-tips">1.保持设备开机状态</View>

src/pages/index/index.tsx

@@ -25,10 +25,12 @@ import PopupBinding from "@/components/popup/popup-binding";
 
 import PopupSiteSwiper from "@/components/popup/popup-site-swiper";
 import PopupAlert from "@/components/popup/popup-alert";
+import PopupConfirm from "@/components/popup/popup-confirm";
 import type CustomTabBar from "@/custom-tab-bar";
 import Navbar from "@/components/navbar/navbar";
 
 import ConnectionBluetoot from "@/components/bluetoot/connection";
+import UpdateIotWL200 from "@/components/bluetoot/update-wl200/index";
 /** 自定义组件 **/
 
 import {
@@ -134,6 +136,10 @@ class Index extends Component<any, any> {
       connectInstrument: {},
       yiqiinfo: {},
       /* END  */
+
+      // 设备升级弹窗
+      isShowUpdateVersionTip: false, // 升级提示
+      isShowVersionUpgrading: false, // 升级中
     };
   }
 
@@ -650,96 +656,7 @@ class Index extends Component<any, any> {
       versionInfo,
     });
     let offlinelist: any = [];
-    offlineDataList.map((item, index) => {
-      let obj: any = {
-        clock_day: "",
-        status: 3,
-        second: 120,
-        screne_id: "",
-        screne_name: "离线打卡",
-        model_face_ward: 0,
-        model_face_use: 0,
-        model_face_type: "",
-        model_eye_ward: 0,
-        model_eye_use: 0,
-        model_eye_type: "",
-        instrument_id: this.state.connectInstrument.id,
-      };
-
-      //判断日期是否正常，如果不正常不处理 --- 脸部
-      if (
-        item.faceyear > 0 &&
-        item.faceyear <= 99 &&
-        item.facemonth >= 1 &&
-        item.facemonth <= 12 &&
-        item.faceday >= 1 &&
-        item.faceday <= 31
-      ) {
-        if (
-          item.facehour > 0 ||
-          (item.faceminutes > 0 && item.faceminutes < 60) ||
-          (item.faceseconds > 0 && item.faceseconds < 60)
-        ) {
-          //脸部离线记录有值
-          obj.model_face_use =
-            Number(item.facehour) * 60 * 60 +
-            Number(item.faceminutes) * 60 +
-            Number(item.faceseconds);
-          obj.model_face_ward = item.faceposition1;
-          obj.clock_day = `20${String(item.faceyear).padStart(2, "0")}-${String(
-            item.facemonth
-          ).padStart(2, "0")}-${String(item.faceday).padStart(2, "0")}`;
-        }
-      }
-      //判断日期是否正常，如果不正常不处理 --- 眼部
-      if (
-        item.eyeyear > 0 &&
-        item.eyeyear <= 99 &&
-        item.eyemonth >= 1 &&
-        item.eyemonth <= 12 &&
-        item.eyeday >= 1 &&
-        item.eyeday <= 31
-      ) {
-        if (
-          item.eyehour > 0 ||
-          (item.eyeminutes > 0 && item.eyeminutes < 60) ||
-          (item.eyeseconds > 0 && item.eyeseconds < 60)
-        ) {
-          //眼部离线记录有值
-          obj.model_eye_use =
-            Number(item.eyehour) * 60 * 60 +
-            Number(item.eyeminutes) * 60 +
-            Number(item.eyeseconds);
-          obj.model_eye_ward = item.eyeposition1;
-          obj.clock_day = `20${String(item.eyeyear).padStart(2, "0")}-${String(
-            item.eyemonth
-          ).padStart(2, "0")}-${String(item.eyeday).padStart(2, "0")}`;
-        }
-      }
 
-      obj.second = obj.model_face_use + obj.model_eye_use;
-
-      if (
-        item.faceyear > 0 &&
-        item.faceyear <= 99 &&
-        (item.facemonth == 1 || item.facemonth <= 12) &&
-        (item.faceday == 1 || item.faceday <= 31)
-      ) {
-        let dayTime = new Date(`${obj.clock_day.replace(/-/g, "/")}`).getTime(); //离线记录的日期
-        let now = new Date(
-          `${new Date().getFullYear()}/${String(
-            new Date().getMonth() + 1
-          ).padStart(2, "0")}/${String(new Date().getDate()).padStart(2, "0")}`
-        ).getTime(); //当前日期
-        /**
-         * 过滤7天前的离线记录
-         *
-         */
-        if (dayTime <= now && dayTime >= now - 24 * 60 * 60 * 1000 * 6) {
-          offlinelist.push(obj);
-        }
-      }
-    });
     console.log(offlinelist);
   };
 
@@ -752,8 +669,25 @@ class Index extends Component<any, any> {
   connectionConfirm = async () => {
     this.connectionClose();
   };
-
   /*蓝牙 END*/
+
+  /** iot版本升级 */
+  // 是否更新弹窗
+  upgradeFun = () => {
+    this.setState({ isShowUpdateVersionTip: true, isConnectShow: false });
+  };
+  cancelUpdateVersionTip = () => {
+    this.setState({ isShowUpdateVersionTip: false });
+  };
+  confirmUpdateVersionTip = () => {
+    // 开始升级
+    this.setState({
+      isShowUpdateVersionTip: false,
+      isShowVersionUpgrading: true,
+    });
+  };
+  /** iot版本升级 END */
+
   render() {
     let {
       calendarComplete,
@@ -777,6 +711,10 @@ class Index extends Component<any, any> {
       instrumentInfo,
       instrumentList,
 
+      // 升级弹窗
+      isShowUpdateVersionTip,
+      isShowVersionUpgrading,
+
       // 蓝牙连接
       isConnectShow,
       connectInstrument,
@@ -785,6 +723,26 @@ class Index extends Component<any, any> {
     return (
       <Block>
         <View catchMove>
+          {isShowVersionUpgrading && (
+            <UpdateIotWL200 isShow={isShowVersionUpgrading} />
+          )}
+          <PopupConfirm
+            isLarge
+            isClose
+            isShow={isShowUpdateVersionTip}
+            title="提示"
+            content={
+              <Block>
+                <View>检测到设备有升级请求</View>
+                <View>是否进行升级？</View>
+              </Block>
+            }
+            textAlgin="center"
+            cancelButtonText="取消"
+            confirmButtonText="确定"
+            close={this.cancelUpdateVersionTip}
+            confirm={this.confirmUpdateVersionTip}
+          />
           <PopupAlert
             isShow={isNotRegister}
             isClose={true}
@@ -868,6 +826,7 @@ class Index extends Component<any, any> {
             confirm={this.connectionConfirm}
             offlineChange={this.offlineChange}
             pairingChange={this.pairingChange}
+            upgradeFun={this.upgradeFun}
           />
         )}
         {/* <ConnectionBluetoot /> */}

src/pages/iotCarePlan/iotCarePlan.tsx

@@ -584,6 +584,8 @@ class IotCarePlan extends Component<any, any> {
       // });
     }
   };
+
+  // 蓝牙特征更改
   notifyBLECharacteristicValueChange = () => {
     console.log("notifyBLECharacteristicValueChange deviceInfo 参数为=>");
     const bluetoothInfo = this.props.bluetoothInfo;