diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index 678c121..70b78fc 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -407,9 +407,9 @@ class IotCarePlanFR200 extends Component { this.getInstrumentClockSummary(); this.getInstrumentClockDetail(); } - componentDidMount() {} + componentDidMount() { } - componentWillUnmount() {} + componentWillUnmount() { } componentDidShow() { console.log("页面显示了"); @@ -1922,7 +1922,6 @@ class IotCarePlanFR200 extends Component { } /** 更新WL200护理历史运行时间 */ updateFR200NursingHistory = (data: any = null, jsonStatus: any = null) => { - console.log(11111111); this.FR200NursingHistory = Taro.getStorageSync("FR200NursingHistory"); @@ -1936,6 +1935,7 @@ class IotCarePlanFR200 extends Component { // 设置正确封面 if (!data) { if (jsonStatus) { + this.setState({ Electricity: jsonStatus.battery, currentGear: jsonStatus.gear }) let { timeArr } = this.state; let newTime = this.formatTime( jsonStatus.totalWorkingMinutes, @@ -1948,10 +1948,12 @@ class IotCarePlanFR200 extends Component { } }); if (flag) { - return; + this.switchVideoPause() + return } - timeArr.push(newTime); - this.setState({ timeArr }); + this.switchVideoPlay() + timeArr.push(newTime) + this.setState({ timeArr }) // 缓存每秒数据 if (!params.dataArray) params.dataArray = []; params.dataArray.push(jsonStatus); @@ -2293,11 +2295,11 @@ class IotCarePlanFR200 extends Component { let report = true; go( "/recoding/pages/face_report_one/face_report_one?id=" + - ids + - "&report=" + - report + - "&obj=" + - JSON.stringify(obj) + ids + + "&report=" + + report + + "&obj=" + + JSON.stringify(obj) ); } else if ("moistureTest" === nursingData.workMode) { console.log("水分测试"); @@ -2308,11 +2310,11 @@ class IotCarePlanFR200 extends Component { go( "/recoding/pages/face_report/face_report?id=" + - deviceid + - "&recordId=" + - currentDevice + - "&report=" + - report + deviceid + + "&recordId=" + + currentDevice + + "&report=" + + report ); } }; @@ -2651,9 +2653,9 @@ class IotCarePlanFR200 extends Component { deviceInfo={currentDevice} close={this.connectionClose} isDisconnect={!isConnectionBlutoot} - offlineChange={() => {}} + offlineChange={() => { }} pairingChange={this.pairingChange} - upgradeFun={() => {}} + upgradeFun={() => { }} /> )} @@ -2675,7 +2677,8 @@ class IotCarePlanFR200 extends Component { className="video-or-image" src={currentVideoSrc} loop - id="myVideo" + id='myVideo' + controls={false} muted={videoVoiceStatus} objectFit="cover" showFullscreenBtn={false} @@ -2702,9 +2705,8 @@ class IotCarePlanFR200 extends Component { onClick={this.videoVoiceStatusChange.bind(this)} > diff --git a/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.less b/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.less index a0ade45..c253f44 100644 --- a/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.less +++ b/src/moduleIOT/pages/iotCarePlan/components/ModeList/WL200.less @@ -9,11 +9,13 @@ height: 160rpx; background-color: #fff; border-radius: 30rpx 0rpx 0rpx 30rpx; - box-shadow: 1rpx 2rpx 16rpx 2rpx rgba(97, 97, 97, 0.1); + box-shadow: -60rpx 0 60rpx rgba(240,240,240,1); text-align: center; // align-items: center; z-index: 20; box-sizing: border-box; + + .title { font-size: 26rpx; text-align: center; diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index ffb4869..92f6b88 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -1517,8 +1517,8 @@ class Index extends Component { {instrumentList.length > 0 && ( - - 前往护理 + + 前往护理 {