diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index a9d3c3e..f177a02 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -1496,14 +1496,6 @@ class IotCarePlanFR200 extends Component { let newWorkStatus = workStatus || (this.workStatus == MODE_WORKING_ENUM.WORKING ? "pause" : "working"); - // if (isBtnClick && newWorkStatus == "working") { - // // todo FR200 不判断舱体,判断肌肤 - // if (!ActiveModeItem.isCabinMode && DeviceConnectStatus != 1) { - // console.log("DeviceConnectStatus", DeviceConnectStatus); - // this.showTips("检测到您的设备没有紧贴肌肤,请紧贴肌肤后点击重新检测"); - // return; - // } - // } let sendParams: any = { ...deviceCommandSamples.pause, @@ -1571,7 +1563,7 @@ class IotCarePlanFR200 extends Component { }); }, 500); - const { ActiveModeItem, DeviceConnectStatus } = this.state; + const { DeviceConnectStatus } = this.state; if (DeviceConnectStatus != 1) { console.log("DeviceConnectStatus 开始处", DeviceConnectStatus); @@ -1579,12 +1571,6 @@ class IotCarePlanFR200 extends Component { return; } - // 仅在切换模式的时候,弹窗倒计时. - // if (type === "switch") { - // let downNum = CountDownTime[ActiveModeItem.modeType] || 3; - // this.showCountdownFun(downNum, () => {}); // 倒计时弹窗 - // } - // 开始执行护理 this.workStatus = MODE_WORKING_ENUM.WORKING; // 不管当前什么状态,直接设为工作状态 this.handleWorkStatus(true, MODE_WORKING_ENUM.WORKING); @@ -1594,12 +1580,12 @@ class IotCarePlanFR200 extends Component { } // 结束护理 - endNurseFun() { - this.handleWorkStatus(false, "end"); + async endNurseFun() { if (this.isCheckNurseTime()) { - this.PostNursingLogClock(); + await this.PostNursingLogClock(); + this.handleWorkStatus(false, "end"); } else { - // 时间不满足,回到主页 + // 时间不满足,直接提交回到主页 this.handleWorkStatus(false, "end"); this.setState({ isEndCarePlan: false, @@ -1723,10 +1709,6 @@ class IotCarePlanFR200 extends Component { return; } - console.log("workStatus", workStatus); - console.log("jsonStatus", jsonStatus, this.workJsonStatus); - console.log("currentTime", FR200NursingHistory.currentTime); - let historyElapsedTime = minSecToS(currentVideoTime) - minSecToS(FR200NursingHistory.currentTime);