diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index 78d9547..0f8e528 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -154,7 +154,7 @@ class IotCarePlanFR200 extends Component { openSourceData: [], }, // 当前选中模式 SwitchActiveModeItem: {}, // 切换选中模式 - ModeID: "mode_", // 模式KEY + ModeID: "base_", // 模式KEY activeModeID: "", // 当前选中模式ID:用于高亮 ModeStepIndex: 0, // 当前护理功效步骤:每个步骤时间不定,所以时间另外计算,根据步骤显示 ModeStepTimeArray: [], // 护理功效时间步骤,用于切换显示GIF @@ -376,7 +376,8 @@ class IotCarePlanFR200 extends Component { if (res.data.code === 200) { if (res.data.data.length > 0) { this.setState({ - ModeList: res.data.data, + ModeList: res.data.data, // 模式列表 + ActiveModeItem: res.data.data[0], // 让模式列表正常显示 }); // if (this.state.activeModeID != "") { @@ -1210,14 +1211,14 @@ 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; - } - } + // if (isBtnClick && newWorkStatus == "working") { + // // todo FR200 不判断舱体,判断肌肤 + // if (!ActiveModeItem.isCabinMode && DeviceConnectStatus != 1) { + // console.log("DeviceConnectStatus", DeviceConnectStatus); + // this.showTips("检测到您的设备没有紧贴肌肤,请紧贴肌肤后点击重新检测"); + // return; + // } + // } let sendParams: any = { ...deviceCommandSamples.pause, @@ -1253,7 +1254,7 @@ class IotCarePlanFR200 extends Component { /** * @name 点击开始护理 - * @params type 传值 switch 则用于区分是否切换模式的启动 + * @params type 传值 switch 则用于区分是否切换模式的启动,如果是WL200的切换模式,则倒计时 */ onNursingTap(type = "") { // 如果已禁止运行,则停止执行后续逻辑 @@ -2245,6 +2246,10 @@ class IotCarePlanFR200 extends Component { className="video-or-image" src={ActiveModeItem.modeVideo} loop + id="myVideo" + objectFit="cover" + enablePlayGesture + showFullscreenBtn={false} /> )} @@ -2307,7 +2312,14 @@ class IotCarePlanFR200 extends Component { )} {(ActiveModeItem.modeType === "face" || - ActiveModeItem.modeType === "eyes") && } + ActiveModeItem.modeType === "eyes") && ( + + + + )} + {/* + + */} {(ActiveModeItem.modeType === "maskPenetration" || ActiveModeItem.modeType === "essence") && ( diff --git a/src/moduleIOT/pages/iotCarePlan/components/ModeList/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/components/ModeList/FR200.tsx index 48eb98d..9e3d272 100644 --- a/src/moduleIOT/pages/iotCarePlan/components/ModeList/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/components/ModeList/FR200.tsx @@ -60,7 +60,7 @@ function Index({ (ModeType === "all" || ModeType === "base" || isPop) && ( diff --git a/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.tsx index 9b3e930..db3a502 100644 --- a/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.tsx @@ -58,7 +58,7 @@ function Index({ (ModeType === "all" || ModeType === "visor" || isPop) && (