From 22b030211362b4b20954871f96c64a9883b36135 Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Tue, 26 Mar 2024 18:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=84=8F=E5=A4=96=E5=A4=9A?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/moduleIOT/pages/iotCarePlan/FR200.tsx | 267 +++++-----------------
 1 file changed, 57 insertions(+), 210 deletions(-)

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<any, any> {
       ],
     };
   }
+  bluetoothContainer: any = null;
   isFullScreen: boolean = false;
   // 不涉及渲染的页面变量
   isRuning: any = true; // 设备默认运行中：fr200贴脸就会自动开始工作
@@ -468,12 +469,12 @@ class IotCarePlanFR200 extends Component<any, any> {
 
     // 监听蓝牙连接状态改变
     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<any, any> {
                       showFullscreenBtn={false}
                       onLoadedMetaData={this.GetVideosTime}
                     />
-
+                    {/* <button onClick={this.executePromises}>点击按钮</button> */}
                     {errorTips && (
                       <Block>
                         <View className="msg-tips">
@@ -2477,30 +2478,22 @@ class IotCarePlanFR200 extends Component<any, any> {
                     )}
                   </View>
 
-                  {ActiveModeItem.modeType !== "moistureTest" && (
-                    <View className="fr200-iot-device">
-                      <View className="item">
-                        <Text className="device-time">
-                          倒计时：<Text className="time">{currentTime}</Text>
-                        </Text>
-                      </View>
-                      <View className="line" />
-                      <View className="item">
-                        档位：
-                        <Text className="gear">
-                          {ActiveModeItem.modeType === "led"
-                            ? "-"
-                            : currentGear}
-                        </Text>
-                        档
-                      </View>
-                      <View className="line" />
-                      <ElectricityView
-                        Electricity={Electricity}
-                        DeviceConnectStatus={DeviceConnectStatus}
-                      />
+                  <View className="fr200-iot-device">
+                    <View className="item">
+                      <Text className="device-time">
+                        倒计时：<Text className="time">{currentTime}</Text>
+                      </Text>
+                    </View>
+                    <View className="line" />
+                    <View className="item">
+                      档位：<Text className="gear">{currentGear}</Text>档
                     </View>
-                  )}
+                    <View className="line" />
+                    <ElectricityView
+                      Electricity={Electricity}
+                      DeviceConnectStatus={DeviceConnectStatus}
+                    />
+                  </View>
                 </View>
 
                 {ModeList.length > 0 && (
@@ -2516,194 +2509,48 @@ class IotCarePlanFR200 extends Component<any, any> {
                     onModeLockOpen={this.onModeLockOpen}
                   />
                 )}
-                {/* <button onClick={this.look.bind(this)}>显示echarts </button>
-            <button onClick={this.updata.bind(this)}>添加数据 </button> */}
-
-                <PopupAlert
-                  isShow={isNotEnoughTime}
-                  isClose
-                  title="提示"
-                  content="您的本次护理时间不足，请重新护理"
-                  confirmButtonText="确认"
-                  textAlgin="center"
-                  close={this.closeNotEnoughTime}
-                  confirm={this.closeNotEnoughTime}
-                />
-
-                <PopupAlert
-                  isShow={isShowErrorTipsText}
-                  isClose
-                  zIndex={10020}
-                  myClassName="level-up"
-                  title="提示"
-                  content={errorTipsText}
-                  confirmButtonText="知道了"
-                  textAlgin="center"
-                  close={this.closeErrorTipsText}
-                  confirm={this.closeErrorTipsText}
-                />
-
-                <PopupConfirm
-                  isShow={isShowTipsSave}
-                  isClose
-                  zIndex={10020}
-                  myClassName="level-up"
-                  title="提示"
-                  content={
-                    <Block>
-                      <View>当前模式已护理部分时间</View>
-                      <View>是否保存护理记录</View>
-                    </Block>
-                  }
-                  cancelButtonText="取消"
-                  confirmButtonText="确认"
-                  textAlgin="center"
-                  close={this.closeTipsSave}
-                  cancel={this.cancelTipsSave}
-                  confirm={this.confirmTipsSave}
-                />
-
-                <PopupStatus
-                  isShow={isShowNursingSuccess}
-                  isClose
-                  title="您已结束本次护理"
-                  type="success"
-                  content="正在上传护理记录……"
-                  confirmButtonText="知道了"
-                  textAlgin="center"
-                  close={() => {
-                    /*不需要做处理*/
-                  }}
-                />
-
-                {isConnectShow && (
-                  <ConnectionBluetoot
-                    deviceInfo={currentDevice}
-                    close={this.connectionClose}
-                    isDisconnect={!isConnectionBlutoot}
-                    offlineChange={() => {}}
-                    pairingChange={this.pairingChange}
-                    upgradeFun={() => {}}
-                  />
+                <button onClick={this.updata.bind(this)}>模拟数据更新 </button>
+                {/* <button onClick={this.updata.bind(this)}>添加数据 </button> */}
+
+                <View className={classnames({ show: showEcharts })}>
+                  <Echarts
+                    series={series}
+                    full={this.full.bind(this)}
+                  ></Echarts>
+
+                  <EchartsFullScean
+                    series={series}
+                    full={this.full}
+                  ></EchartsFullScean>
+                </View>
+
+                {(ActiveModeItem.modeType === "maskPenetration" ||
+                  ActiveModeItem.modeType === "essence") && (
+                  <Gears
+                    onEmitMinus={this.handleMinus}
+                    onEmitAdd={this.handleAdd}
+                    GearData={GearData}
+                  ></Gears>
                 )}
 
-                <Popup
-                  show={isShowHistoryMsg}
-                  className="custom-popup"
-                  overlay={false}
-                >
-                  <View className="sync-history-msg">正在同步护理记录...</View>
-                </Popup>
+                {ActiveModeItem.modeType === "moistureTest" && (
+                  <WaterTest
+                    isRuningTest={isRuningTest}
+                    stepList={waterStepList}
+                    stepIndex={waterStepIndex}
+                  ></WaterTest>
+                )}
               </View>
 
-              <View>
-                <View className="iot-main">
-                  <View className="banner-box">
-                    <View>
-                      <Video
-                        className="video-or-image"
-                        src={currentVideoSrc}
-                        loop
-                        id="myVideo"
-                        objectFit="cover"
-                        enablePlayGesture
-                        showFullscreenBtn={false}
-                        onLoadedMetaData={this.GetVideosTime}
-                      />
-                      {/* <button onClick={this.executePromises}>点击按钮</button> */}
-                      {errorTips && (
-                        <Block>
-                          <View className="msg-tips">
-                            <Image
-                              className="msg-tips-img"
-                              src={require("@/img/tips.png")}
-                            />
-                            <View className="msg-tips-content">
-                              {errorTips}
-                            </View>
-                          </View>
-                        </Block>
-                      )}
-                    </View>
-
-                    <View className="fr200-iot-device">
-                      <View className="item">
-                        <Text className="device-time">
-                          倒计时：<Text className="time">{currentTime}</Text>
-                        </Text>
-                      </View>
-                      <View className="line" />
-                      <View className="item">
-                        档位：<Text className="gear">{currentGear}</Text>档
-                      </View>
-                      <View className="line" />
-                      <ElectricityView
-                        Electricity={Electricity}
-                        DeviceConnectStatus={DeviceConnectStatus}
-                      />
-                    </View>
-                  </View>
-
-                  {ModeList.length > 0 && (
-                    <ModeListView
-                      isPop={false}
-                      isShowNurse={isShowNurse}
-                      ModeList={ModeList}
-                      ModeType={ModeType}
-                      ModeID={ModeID}
-                      activeModeID={activeModeID}
-                      onEmit={this.modeCurrentFun}
-                      onEmitShowAll={this.openModeSwitch}
-                      onModeLockOpen={this.onModeLockOpen}
-                    />
-                  )}
-                  <button onClick={this.updata.bind(this)}>
-                    模拟数据更新{" "}
-                  </button>
-                  {/* <button onClick={this.updata.bind(this)}>添加数据 </button> */}
-
-                  <View className={classnames({ show: showEcharts })}>
-                    <Echarts
-                      series={series}
-                      full={this.full.bind(this)}
-                    ></Echarts>
-
-                    <EchartsFullScean
-                      series={series}
-                      full={this.full}
-                    ></EchartsFullScean>
-                  </View>
-                  {/* {(ActiveModeItem.modeType === "face" ||
-              ActiveModeItem.modeType === "eyes") && <Echarts></Echarts>} */}
-
-                  {(ActiveModeItem.modeType === "maskPenetration" ||
-                    ActiveModeItem.modeType === "essence") && (
-                    <Gears
-                      onEmitMinus={this.handleMinus}
-                      onEmitAdd={this.handleAdd}
-                      GearData={GearData}
-                    ></Gears>
-                  )}
-
-                  {ActiveModeItem.modeType === "moistureTest" && (
-                    <WaterTest
-                      isRuningTest={isRuningTest}
-                      stepList={waterStepList}
-                      stepIndex={waterStepIndex}
-                    ></WaterTest>
-                  )}
-                </View>
-
-                {/* <Footer
-            currentWorkModeType={currentWorkModeType}
-            isRuningTest={isRuningTest}
-            isStopNurse={isStopNurse}
-            onEmitStartNurse={this.onStartNurse}
-            onEmitSwitchChange={this.onSwitchChange}
-            onEmitEndPlan={this.onEndPlan}
-            onsuccess={this.onsuccess}
-          /> */}
-              </View>
+              <Footer
+                currentWorkModeType={currentWorkModeType}
+                isRuningTest={isRuningTest}
+                isStopNurse={isStopNurse}
+                onEmitStartNurse={this.onStartNurse}
+                onEmitSwitchChange={this.onSwitchChange}
+                onEmitEndPlan={this.onEndPlan}
+                onsuccess={this.onsuccess}
+              />
             </View>
           </View>
         )}