diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index ff050d4..a9d3c3e 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -346,6 +346,7 @@ class IotCarePlanFR200 extends Component { ], }; } + bluetoothContainer: any = null; isFullScreen: boolean = false; // 不涉及渲染的页面变量 isRuning: any = true; // 设备默认运行中:fr200贴脸就会自动开始工作 @@ -468,12 +469,12 @@ class IotCarePlanFR200 extends Component { // 监听蓝牙连接状态改变 Taro.onBLEConnectionStateChange(this.listener); - let bluetoothContainer = new BluetoothContainer( + this.bluetoothContainer = new BluetoothContainer( this.props.bluetoothInfo, deviceToolKitInstance, this ); - bluetoothContainer.notifyBLECharacteristicValueChange(); + this.bluetoothContainer.notifyBLECharacteristicValueChange(); setTimeout(() => { this.handleWorkStatus(false, MODE_WORKING_ENUM.STANDBY); @@ -2463,7 +2464,7 @@ class IotCarePlanFR200 extends Component { showFullscreenBtn={false} onLoadedMetaData={this.GetVideosTime} /> - + {/* */} {errorTips && ( @@ -2477,30 +2478,22 @@ class IotCarePlanFR200 extends Component { )} - {ActiveModeItem.modeType !== "moistureTest" && ( - - - - 倒计时:{currentTime} - - - - - 档位: - - {ActiveModeItem.modeType === "led" - ? "-" - : currentGear} - - 档 - - - + + + + 倒计时:{currentTime} + + + + + 档位:{currentGear} - )} + + + {ModeList.length > 0 && ( @@ -2516,194 +2509,48 @@ class IotCarePlanFR200 extends Component { onModeLockOpen={this.onModeLockOpen} /> )} - {/* - */} - - - - - - - 当前模式已护理部分时间 - 是否保存护理记录 - - } - cancelButtonText="取消" - confirmButtonText="确认" - textAlgin="center" - close={this.closeTipsSave} - cancel={this.cancelTipsSave} - confirm={this.confirmTipsSave} - /> - - { - /*不需要做处理*/ - }} - /> - - {isConnectShow && ( - {}} - pairingChange={this.pairingChange} - upgradeFun={() => {}} - /> + + {/* */} + + + + + + + + {(ActiveModeItem.modeType === "maskPenetration" || + ActiveModeItem.modeType === "essence") && ( + )} - - 正在同步护理记录... - + {ActiveModeItem.modeType === "moistureTest" && ( + + )} - - - - - - - - - - 倒计时:{currentTime} - - - - - 档位:{currentGear}档 - - - - - - - {ModeList.length > 0 && ( - - )} - - {/* */} - - - - - - - {/* {(ActiveModeItem.modeType === "face" || - ActiveModeItem.modeType === "eyes") && } */} - - {(ActiveModeItem.modeType === "maskPenetration" || - ActiveModeItem.modeType === "essence") && ( - - )} - - {ActiveModeItem.modeType === "moistureTest" && ( - - )} - - - {/*