修复bug

master
blak-kong 2 years ago
parent 0fc7d07689
commit f14cb28a59

@ -33,11 +33,8 @@ import {
} from "@flossom-npm/iot-translater-we100";
// 通过设备类型判断给 deviceToolKitInstance 赋值
import { DeviceToolKit as DeviceToolKitWE100 } from "@flossom-npm/iot-translater-we100";
import { DeviceToolKit as DeviceToolKitFR200 } from "@flossom-npm/iot-translater";
import OtaDeviceTypeEnum from "../OtaDeviceTypeEnum";
// 临时替代
var log = console;
@ -208,7 +205,9 @@ class UpdateIotFR200 extends Component<any, any> {
//@ts-ignore
const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
sendCommand({ value }).then((res) => {
console.log("finishedOTA", res);
this.resetOta();
this.finishFun();
});
}
/**
@ -416,10 +415,12 @@ class UpdateIotFR200 extends Component<any, any> {
// 错误关闭回调
errorFun = () => {
this.resetOta();
if (this.$checkTimer) clearInterval(this.$checkTimer);
this.props.errorFun();
};
// 升级完成回调
finishFun = () => {
if (this.$checkTimer) clearInterval(this.$checkTimer);
this.props.finishFun();
};

@ -229,6 +229,7 @@ class UpdateIotWL200 extends Component<any, any> {
const value = deviceToolKitInstance.toBleCommand(jsoncmd as any);
sendCommand({ value }).then((res) => {
this.resetOta();
this.finishFun();
});
}
/**
@ -435,6 +436,7 @@ class UpdateIotWL200 extends Component<any, any> {
// 错误关闭回调
errorFun = () => {
this.resetOta();
if (this.$checkTimer) clearInterval(this.$checkTimer);
this.props.errorFun();
};
// 升级完成回调

@ -56,13 +56,12 @@ import ConnectionBluetoot from "@/components/bluetoot/connection";
/* 本页组件 */
import ElectricityView from "./components/ElectricityView/Electricity";
import ModeListView from "./components/ModeList/FR200";
import ModeListAllView from "./components/ModeList/FR200All";
import Footer from "./components/Footer/FR200";
import WaterTest from "./components/WaterTest/index";
/* 本页组件 END */
import Echarts from "./components/Echart";
import EchartsFullScean from "./components/EchartFullScean";
import Gears from "./components/Gears";
import "./FR200.less";
@ -345,10 +344,10 @@ class IotCarePlanFR200 extends Component<any, any> {
],
time: {
min: 0,
second: 0
second: 0,
},
timeArr: [],
videoVoiceStatus: false
videoVoiceStatus: false,
};
}
bluetoothContainer: any = null;
@ -380,7 +379,6 @@ class IotCarePlanFR200 extends Component<any, any> {
ModeTypeArray: string[] = [
"all",
"base",
"eyes",
"zone",
"permeation",
"sensitive",
@ -409,9 +407,9 @@ class IotCarePlanFR200 extends Component<any, any> {
this.getInstrumentClockSummary();
this.getInstrumentClockDetail();
}
componentDidMount() { }
componentDidMount() {}
componentWillUnmount() { }
componentWillUnmount() {}
componentDidShow() {
console.log("页面显示了");
@ -441,23 +439,7 @@ class IotCarePlanFR200 extends Component<any, any> {
title: obj.name,
});
let sendParams: any = {
// ...deviceCommandSamples.pause,
// workMode: 'moistureTest', // 使用模式
commandType: "DeviceStatusSync",
deviceSyncCommandType: 'onlySyncStatusToDevice',
totalWorkingSeconds: 0,
workStatus: "pause",
workMode: 'face',
};
sendParams.gear = 1;
let pauseArrayBuffer = deviceToolKitInstance.toBleCommand(
sendParams as any
);
sendCommand({
value: pauseArrayBuffer,
}).then((res) => console.log("同步为0=====》", res));
this.resetDeviceTimeSync();
await this.GetModeList(obj?.id);
@ -476,6 +458,26 @@ class IotCarePlanFR200 extends Component<any, any> {
}
}
/**重置设备时间同步*/
resetDeviceTimeSync(workMode = "face") {
let sendParams: any = {
// ...deviceCommandSamples.pause,
// workMode: 'moistureTest', // 使用模式
commandType: "DeviceStatusSync",
deviceSyncCommandType: "onlySyncStatusToDevice",
totalWorkingSeconds: 0,
workStatus: "pause",
workMode: workMode,
};
sendParams.gear = 1;
let pauseArrayBuffer = deviceToolKitInstance.toBleCommand(
sendParams as any
);
sendCommand({
value: pauseArrayBuffer,
}).then((res) => console.log("同步为0=====》", res));
}
async init() {
// 查询离线记录汇总
const queryInstructionParams = {
@ -601,12 +603,11 @@ class IotCarePlanFR200 extends Component<any, any> {
// 护理检查改变模式,是否提示切换护理模式
// isNotCheck为真时不进行校验直接切换
this.tempModeCurrent = data;
this.resetDeviceTimeSync(data.modeType); // 切换模式时,重置设备同步时间
// 仅在未开始护理前,切换模式的时候提示模式弹窗
// FR200默认开始护理
if (!isShowNurse) {
this.openStepTips();
}
this.openStepTips();
// 如果按钮不可点击则报错,内部自带检查底部按钮函数
// this.onEmitErrorTips();
@ -627,14 +628,13 @@ class IotCarePlanFR200 extends Component<any, any> {
currentWorkModeType = 2;
}
series.map(item => {
if (item.type == 'line') {
item.data = []
series.map((item) => {
if (item.type == "line") {
item.data = [];
} else {
item.data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
item.data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
}
})
});
this.setState({
ActiveModeItem: data,
@ -645,7 +645,7 @@ class IotCarePlanFR200 extends Component<any, any> {
MaskModeStepIndex: 0, // 面膜促渗步骤
ModeType: this.ModeTypeArray[data.modeClass],
currentWorkModeType,
series
series,
});
// 切换模式时:重新设置视频地址
@ -732,8 +732,11 @@ class IotCarePlanFR200 extends Component<any, any> {
};
// 取消并关闭切换护理模式弹窗
cancelModeSwitchBtn = () => {
let { ActiveModeItem } = this.state;
this.setState({
isSwitchActiveMode: false,
activeModeID: ActiveModeItem?.id,
ModeID: "mode_" + ActiveModeItem?.id,
});
};
// 弹窗确定切换护理模式
@ -896,14 +899,14 @@ class IotCarePlanFR200 extends Component<any, any> {
}
updata(level = 1, min = 0, seconds = 0) {
if (seconds == 0 && min == 0) {
return
return;
}
// let that = this;
// let stop = 0;
// let time = setInterval(function () {
// stop++;
let series = JSON.parse(JSON.stringify(this.state.series));
let num = level
let num = level;
let count = 0;
series.map((item) => {
if (item.type === "line") {
@ -923,16 +926,16 @@ class IotCarePlanFR200 extends Component<any, any> {
}
} else {
if (count <= num) {
item.data.splice(seconds - 1, 1, 1)
item.data.splice(seconds - 1, 1, 1);
} else {
item.data.splice(seconds - 1, 1, 0)
item.data.splice(seconds - 1, 1, 0);
}
}
}
});
let time = JSON.parse(JSON.stringify(this.state.time));
time.min = min
time.second = seconds
time.min = min;
time.second = seconds;
// 更新图表数据
this.setState({ series });
this.setState({ time });
@ -1091,7 +1094,6 @@ class IotCarePlanFR200 extends Component<any, any> {
// 更新界面倒计时
this.resetTimer();
if (
sceneTime > totalTime &&
this.isRuning &&
@ -1381,14 +1383,12 @@ class IotCarePlanFR200 extends Component<any, any> {
}
}
/**
*
*/
*
*/
videoVoiceStatusChange() {
let { videoVoiceStatus } = this.state;
this.setState({ videoVoiceStatus: !videoVoiceStatus })
this.setState({ videoVoiceStatus: !videoVoiceStatus });
}
/** @name 精华促渗下一步,根据时间自动调用 */
essencePenetrationNext() {
@ -1905,17 +1905,16 @@ class IotCarePlanFR200 extends Component<any, any> {
console.log("保存setFR200NursingHistory");
};
formatTime(min, sec) {
let mins
let mins;
if (min < 10) {
mins = '0' + min;
mins = "0" + min;
} else {
mins = min;
}
let secs
let secs;
if (sec < 10) {
secs = '0' + sec;
secs = "0" + sec;
} else {
secs = sec;
}
@ -1937,19 +1936,22 @@ class IotCarePlanFR200 extends Component<any, any> {
// 设置正确封面
if (!data) {
if (jsonStatus) {
let { timeArr } = this.state
let newTime = this.formatTime(jsonStatus.totalWorkingMinutes, jsonStatus.totalWorkingSeconds)
let flag = false
timeArr.map(item => {
let { timeArr } = this.state;
let newTime = this.formatTime(
jsonStatus.totalWorkingMinutes,
jsonStatus.totalWorkingSeconds
);
let flag = false;
timeArr.map((item) => {
if (newTime === item) {
flag = true
flag = true;
}
})
});
if (flag) {
return
return;
}
timeArr.push(newTime)
this.setState({ timeArr })
timeArr.push(newTime);
this.setState({ timeArr });
// 缓存每秒数据
if (!params.dataArray) params.dataArray = [];
params.dataArray.push(jsonStatus);
@ -1957,17 +1959,26 @@ class IotCarePlanFR200 extends Component<any, any> {
params.workMode = jsonStatus?.workMode;
params.modeId = this.state.ActiveModeItem?.id;
params.modeName = this.state.ActiveModeItem.modeName;
let impedance = jsonStatus.impedance
let level = impedance - 200
let impedance = jsonStatus.impedance;
let level = impedance - 200;
if (level < 0) {
level = 1
level = 1;
} else {
level = Math.ceil(level / 80) + 1
level = Math.ceil(level / 80) + 1;
}
console.log('min:', jsonStatus.totalWorkingMinutes, ' ', 'sec', jsonStatus.totalWorkingSeconds);
this.updata(level, jsonStatus.totalWorkingMinutes, jsonStatus.totalWorkingSeconds)
console.log(
"min:",
jsonStatus.totalWorkingMinutes,
" ",
"sec",
jsonStatus.totalWorkingSeconds
);
this.updata(
level,
jsonStatus.totalWorkingMinutes,
jsonStatus.totalWorkingSeconds
);
}
} else {
params.jsonStatus = jsonStatus;
@ -2282,11 +2293,11 @@ class IotCarePlanFR200 extends Component<any, any> {
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("水分测试");
@ -2297,11 +2308,11 @@ class IotCarePlanFR200 extends Component<any, any> {
go(
"/recoding/pages/face_report/face_report?id=" +
deviceid +
"&recordId=" +
currentDevice +
"&report=" +
report
deviceid +
"&recordId=" +
currentDevice +
"&report=" +
report
);
}
};
@ -2491,7 +2502,7 @@ class IotCarePlanFR200 extends Component<any, any> {
series,
time,
isFullScreen,
videoVoiceStatus
videoVoiceStatus,
} = this.state;
return (
@ -2510,19 +2521,19 @@ class IotCarePlanFR200 extends Component<any, any> {
<PopupAlert
isShow={isModeLock}
zIndex={10020}
myClassName='level-up'
title='提示'
content='该模式即将上线,敬请期待'
confirmButtonText='我知道了'
textAlgin='center'
myClassName="level-up"
title="提示"
content="该模式即将上线,敬请期待"
confirmButtonText="我知道了"
textAlgin="center"
close={this.onModeLockClose}
confirm={this.onModeLockClose}
/>
<PopupInstrumentUploadTips
isShow={isFirstTipShow}
zIndex={10020}
myClassName='level-up'
title='打卡介绍'
myClassName="level-up"
title="打卡介绍"
data={nurseInfo}
close={this.onTipShowClose}
confirm={this.onTipShowClose}
@ -2534,11 +2545,11 @@ class IotCarePlanFR200 extends Component<any, any> {
isLarge
isClose
isShow={isEndCarePlan}
title='提示'
content='是否结束护理'
textAlgin='center'
cancelButtonText='取消'
confirmButtonText='确定'
title="提示"
content="是否结束护理"
textAlgin="center"
cancelButtonText="取消"
confirmButtonText="确定"
close={this.cancelEndBtn}
confirm={this.confirmEndBtn}
/>
@ -2546,7 +2557,7 @@ class IotCarePlanFR200 extends Component<any, any> {
isLarge
isClose
isShow={isSwitchActiveMode}
title='护理模式切换'
title="护理模式切换"
content={
<ModeListView
ModeID={ModeID}
@ -2560,9 +2571,9 @@ class IotCarePlanFR200 extends Component<any, any> {
onModeLockOpen={this.onModeLockOpen}
/>
}
textAlgin='center'
cancelButtonText='取消'
confirmButtonText='确定'
textAlgin="center"
cancelButtonText="取消"
confirmButtonText="确定"
close={this.cancelModeSwitchBtn}
confirm={this.confirmModeSwitchBtn}
/>
@ -2572,7 +2583,7 @@ class IotCarePlanFR200 extends Component<any, any> {
isShow={isShowStepTips}
isLarge
isFirstEntry={false}
confirmButtonText='知道了'
confirmButtonText="知道了"
data={ActiveModeItem.openSourceData}
close={this.closeStepTips}
/>
@ -2581,10 +2592,10 @@ class IotCarePlanFR200 extends Component<any, any> {
<PopupAlert
isShow={isNotEnoughTime}
isClose
title='提示'
content='您的本次护理时间不足,请重新护理'
confirmButtonText='确认'
textAlgin='center'
title="提示"
content="您的本次护理时间不足,请重新护理"
confirmButtonText="确认"
textAlgin="center"
close={this.closeNotEnoughTime}
confirm={this.closeNotEnoughTime}
/>
@ -2593,11 +2604,11 @@ class IotCarePlanFR200 extends Component<any, any> {
isShow={isShowErrorTipsText}
isClose
zIndex={10020}
myClassName='level-up'
title='提示'
myClassName="level-up"
title="提示"
content={errorTipsText}
confirmButtonText='知道了'
textAlgin='center'
confirmButtonText="知道了"
textAlgin="center"
close={this.closeErrorTipsText}
confirm={this.closeErrorTipsText}
/>
@ -2606,17 +2617,17 @@ class IotCarePlanFR200 extends Component<any, any> {
isShow={isShowTipsSave}
isClose
zIndex={10020}
myClassName='level-up'
title='提示'
myClassName="level-up"
title="提示"
content={
<Block>
<View></View>
<View></View>
</Block>
}
cancelButtonText='取消'
confirmButtonText='确认'
textAlgin='center'
cancelButtonText="取消"
confirmButtonText="确认"
textAlgin="center"
close={this.closeTipsSave}
cancel={this.cancelTipsSave}
confirm={this.confirmTipsSave}
@ -2625,11 +2636,11 @@ class IotCarePlanFR200 extends Component<any, any> {
<PopupStatus
isShow={isShowNursingSuccess}
isClose
title='您已结束本次护理'
type='success'
content='正在上传护理记录……'
confirmButtonText='知道了'
textAlgin='center'
title="您已结束本次护理"
type="success"
content="正在上传护理记录……"
confirmButtonText="知道了"
textAlgin="center"
close={() => {
/*不需要做处理*/
}}
@ -2640,71 +2651,75 @@ class IotCarePlanFR200 extends Component<any, any> {
deviceInfo={currentDevice}
close={this.connectionClose}
isDisconnect={!isConnectionBlutoot}
offlineChange={() => { }}
offlineChange={() => {}}
pairingChange={this.pairingChange}
upgradeFun={() => { }}
upgradeFun={() => {}}
/>
)}
<Popup
show={isShowHistoryMsg}
className='custom-popup'
className="custom-popup"
overlay={false}
>
<View className='sync-history-msg'>...</View>
<View className="sync-history-msg">...</View>
</Popup>
</View>
<View>
<View className='iot-main'>
<View className="iot-main">
{isFullScreen && (
<View className='banner-box'>
<View className="banner-box">
<View>
<Video
className='video-or-image'
className="video-or-image"
src={currentVideoSrc}
loop
id='myVideo'
id="myVideo"
muted={videoVoiceStatus}
objectFit='cover'
enablePlayGesture
objectFit="cover"
showFullscreenBtn={false}
showPlayBtn={false}
showBottomProgress={false}
controls={false}
onLoadedMetaData={this.GetVideosTime}
/>
{/* <button onClick={this.executePromises}>点击按钮</button> */}
{errorTips && (
<Block>
<View className='msg-tips'>
<View className="msg-tips">
<Image
className='msg-tips-img'
className="msg-tips-img"
src={require("@/img/tips.png")}
/>
<View className='msg-tips-content'>{errorTips}</View>
<View className="msg-tips-content">{errorTips}</View>
</View>
</Block>
)}
</View>
<View
className='music flex aitems jcenter'
className="music flex aitems jcenter"
onClick={this.videoVoiceStatusChange.bind(this)}
>
<Image
src={require(`@/img/${videoVoiceStatus ? 'mute' : 'play'}.png`)}
mode='aspectFill'
src={require(`@/img/${
videoVoiceStatus ? "mute" : "play"
}.png`)}
mode="aspectFill"
></Image>
</View>
<View className='fr200-iot-device'>
<View className='item'>
<Text className='device-time'>
<View className="fr200-iot-device">
<View className="item">
<Text className="device-time">
<Text className='time'>{currentTime}</Text>
<Text className="time">{currentTime}</Text>
</Text>
</View>
<View className='line' />
<View className='item'>
<Text className='gear'>{currentGear}</Text>
<View className="line" />
<View className="item">
<Text className="gear">{currentGear}</Text>
</View>
<View className='line' />
<View className="line" />
<ElectricityView
Electricity={Electricity}
DeviceConnectStatus={DeviceConnectStatus}
@ -2714,12 +2729,9 @@ class IotCarePlanFR200 extends Component<any, any> {
)}
{ModeList.length > 0 && isFullScreen && (
<ModeListView
<ModeListAllView
isPop={false}
isShowNurse={isShowNurse}
ModeList={ModeList}
ModeType={ModeType}
ModeID={ModeID}
activeModeID={activeModeID}
onEmit={this.modeCurrentFun}
onEmitShowAll={this.openModeSwitch}
@ -2728,8 +2740,21 @@ class IotCarePlanFR200 extends Component<any, any> {
)}
{/* <button onClick={this.updata.bind(this)}>模拟数据更新 </button> */}
<View className={classnames({ show: ActiveModeItem?.modeType !== "face" && ActiveModeItem?.modeType !== "eyes" && ActiveModeItem?.modeType !== "nasolabialFold" && ActiveModeItem?.modeType !== "mandibularLine" && ActiveModeItem?.modeType !== "headLiftingPro" })}>
<Echarts series={series} time={time} full={this.full.bind(this)}></Echarts>
<View
className={classnames({
show:
ActiveModeItem?.modeType !== "face" &&
ActiveModeItem?.modeType !== "eyes" &&
ActiveModeItem?.modeType !== "nasolabialFold" &&
ActiveModeItem?.modeType !== "mandibularLine" &&
ActiveModeItem?.modeType !== "headLiftingPro",
})}
>
<Echarts
series={series}
time={time}
full={this.full.bind(this)}
></Echarts>
</View>
{(ActiveModeItem?.modeType === "maskPenetration" ||

@ -241,9 +241,9 @@ class IotCarePlanWL200 extends Component<any, any> {
this.getWL200NursingHistory();
this.initData();
}
componentDidMount() { }
componentDidMount() {}
componentWillUnmount() { }
componentWillUnmount() {}
componentDidShow() {
console.log("页面显示了");
@ -546,8 +546,11 @@ class IotCarePlanWL200 extends Component<any, any> {
};
// 取消并关闭切换护理模式弹窗
cancelModeSwitchBtn = () => {
let { ActiveModeItem } = this.state;
this.setState({
isSwitchActiveMode: false,
activeModeID: ActiveModeItem?.id,
ModeID: "mode_" + ActiveModeItem?.id,
});
};
// 弹窗确定切换护理模式
@ -588,7 +591,7 @@ class IotCarePlanWL200 extends Component<any, any> {
this.onNursingTap();
// 倒计时弹窗: 倒计时完成后,自动开始,并判断弹窗
let downNum = CountDownTime[this.state.ActiveModeItem.modeType] || 3;
this.showCountdownFun(downNum, () => { });
this.showCountdownFun(downNum, () => {});
}, 500);
return;
@ -620,7 +623,7 @@ class IotCarePlanWL200 extends Component<any, any> {
};
// 绘制能量图
drawProwerPicture() { }
drawProwerPicture() {}
/** 切换光照 */
onSwitchChange = async () => {
@ -1385,7 +1388,7 @@ class IotCarePlanWL200 extends Component<any, any> {
// 仅在切换模式的时候,弹窗倒计时.
if (type === "switch") {
let downNum = CountDownTime[ActiveModeItem.modeType] || 3;
this.showCountdownFun(downNum, () => { }); // 倒计时弹窗
this.showCountdownFun(downNum, () => {}); // 倒计时弹窗
}
// 开始执行护理
@ -1935,7 +1938,7 @@ class IotCarePlanWL200 extends Component<any, any> {
if (currentTimeTimer) clearInterval(currentTimeTimer);
go(
"/recording/pages/face_report/face_report?id=" +
this.state.currentDevice.id
this.state.currentDevice.id
);
};
@ -2128,11 +2131,11 @@ class IotCarePlanWL200 extends Component<any, any> {
<PopupAlert
isShow={isModeLock}
zIndex={10020}
myClassName='level-up'
title='提示'
content='该模式即将上线,敬请期待'
confirmButtonText='我知道了'
textAlgin='center'
myClassName="level-up"
title="提示"
content="该模式即将上线,敬请期待"
confirmButtonText="我知道了"
textAlgin="center"
isClose={false}
close={this.onModeLockClose}
confirm={this.onModeLockClose}
@ -2140,8 +2143,8 @@ class IotCarePlanWL200 extends Component<any, any> {
<PopupInstrumentUploadTips
isShow={isFirstTipShow}
zIndex={10020}
myClassName='level-up'
title='打卡介绍'
myClassName="level-up"
title="打卡介绍"
data={nurseInfo}
close={this.onTipShowClose}
confirm={this.onTipShowClose}
@ -2153,11 +2156,11 @@ class IotCarePlanWL200 extends Component<any, any> {
isLarge
isClose
isShow={isEndCarePlan}
title='提示'
content='是否结束护理'
textAlgin='center'
cancelButtonText='取消'
confirmButtonText='确定'
title="提示"
content="是否结束护理"
textAlgin="center"
cancelButtonText="取消"
confirmButtonText="确定"
close={this.cancelEndBtn}
confirm={this.confirmEndBtn}
/>
@ -2165,7 +2168,7 @@ class IotCarePlanWL200 extends Component<any, any> {
isLarge
isClose
isShow={isSwitchActiveMode}
title='护理模式切换'
title="护理模式切换"
content={
<ModeListView
ModeID={ModeID}
@ -2179,9 +2182,9 @@ class IotCarePlanWL200 extends Component<any, any> {
onModeLockOpen={this.onModeLockOpen}
/>
}
textAlgin='center'
cancelButtonText='取消'
confirmButtonText='确定'
textAlgin="center"
cancelButtonText="取消"
confirmButtonText="确定"
close={this.cancelModeSwitchBtn}
confirm={this.confirmModeSwitchBtn}
/>
@ -2191,7 +2194,7 @@ class IotCarePlanWL200 extends Component<any, any> {
isShow={isShowStepTips}
isLarge
isFirstEntry={false}
confirmButtonText='知道了'
confirmButtonText="知道了"
data={ActiveModeItem.openSourceData}
close={this.closeStepTips}
/>
@ -2200,10 +2203,10 @@ class IotCarePlanWL200 extends Component<any, any> {
<PopupAlert
isShow={isNotEnoughTime}
isClose
title='提示'
content='您的本次护理时间不足,请重新护理'
confirmButtonText='确认'
textAlgin='center'
title="提示"
content="您的本次护理时间不足,请重新护理"
confirmButtonText="确认"
textAlgin="center"
close={this.closeNotEnoughTime}
confirm={this.closeNotEnoughTime}
/>
@ -2212,11 +2215,11 @@ class IotCarePlanWL200 extends Component<any, any> {
isShow={isShowErrorTipsText}
isClose
zIndex={10020}
myClassName='level-up'
title='提示'
myClassName="level-up"
title="提示"
content={errorTipsText}
confirmButtonText='知道了'
textAlgin='center'
confirmButtonText="知道了"
textAlgin="center"
close={this.closeErrorTipsText}
confirm={this.closeErrorTipsText}
/>
@ -2225,17 +2228,17 @@ class IotCarePlanWL200 extends Component<any, any> {
isShow={isShowTipsSave}
isClose
zIndex={10020}
myClassName='level-up'
title='提示'
myClassName="level-up"
title="提示"
content={
<Block>
<View></View>
<View></View>
</Block>
}
cancelButtonText='取消'
confirmButtonText='确认'
textAlgin='center'
cancelButtonText="取消"
confirmButtonText="确认"
textAlgin="center"
close={this.closeTipsSave}
cancel={this.cancelTipsSave}
confirm={this.confirmTipsSave}
@ -2244,11 +2247,11 @@ class IotCarePlanWL200 extends Component<any, any> {
<PopupStatus
isShow={isShowNursingSuccess}
isClose
title='您已结束本次护理'
type='success'
content='正在上传护理记录……'
confirmButtonText='知道了'
textAlgin='center'
title="您已结束本次护理"
type="success"
content="正在上传护理记录……"
confirmButtonText="知道了"
textAlgin="center"
close={() => {
/*不需要做处理*/
}}
@ -2259,31 +2262,31 @@ class IotCarePlanWL200 extends Component<any, any> {
deviceInfo={currentDevice}
close={this.connectionClose}
isDisconnect={!isConnectionBlutoot}
offlineChange={() => { }}
offlineChange={() => {}}
pairingChange={this.pairingChange}
upgradeFun={() => { }}
upgradeFun={() => {}}
/>
)}
<Popup
show={isShowHistoryMsg}
className='custom-popup'
className="custom-popup"
overlay={false}
>
<View className='sync-history-msg'>...</View>
<View className="sync-history-msg">...</View>
</Popup>
</View>
<View>
<View className='iot-main'>
<View className='banner-box'>
<View className="iot-main">
<View className="banner-box">
<View>
{!isShowNurse && (
<Video
className='video-or-image'
className="video-or-image"
src={ActiveModeItem.modeVideo}
loop
id='myVideo'
id="myVideo"
onPlay={this.onPlay}
muted={isMuted}
onTimeUpdate={this.GetVideosTime}
@ -2296,12 +2299,12 @@ class IotCarePlanWL200 extends Component<any, any> {
<Block>
{isStopNurse ? (
<Image
className='video-or-image'
className="video-or-image"
src={currentServiceData.stopSource}
/>
) : (
<Image
className='video-or-image'
className="video-or-image"
src={currentServiceData.startSource}
/>
)}
@ -2309,33 +2312,33 @@ class IotCarePlanWL200 extends Component<any, any> {
)}
{errorTips && (
<Block>
<View className='msg-tips'>
<View className="msg-tips">
<Image
className='msg-tips-img'
className="msg-tips-img"
src={require("@/img/tips.png")}
/>
<View className='msg-tips-content'>{errorTips}</View>
<View className="msg-tips-content">{errorTips}</View>
</View>
</Block>
)}
</View>
<View
className='music flex aitems jcenter'
className="music flex aitems jcenter"
onClick={this.handleClicksound.bind(this)}
>
<Image
src={require(`@/img/${isMuted ? 'mute' : 'play'}.png`)}
mode='aspectFill'
src={require(`@/img/${isMuted ? "mute" : "play"}.png`)}
mode="aspectFill"
></Image>
</View>
<View className='iot-device'>
<View className='item'>
<Text className='device-time'>
<View className="iot-device">
<View className="item">
<Text className="device-time">
<Text className='time'>{currentTime}</Text>
<Text className="time">{currentTime}</Text>
</Text>
</View>
<View className='line' />
<View className="line" />
<ElectricityView
Electricity={Electricity}
matrixElectricity={matrixElectricity}

@ -240,7 +240,7 @@ function Index({
>
<View className="mode-list">
<View className="mode-item-title"></View>
{PermeationList.map((item: any, index: any) => {
{SensitiveList.map((item: any, index: any) => {
return (
<View
key={"sensitive_" + index}

@ -0,0 +1,108 @@
import Taro from "@tarojs/taro";
import classnames from "classnames";
import { Block, View, ScrollView, Image } from "@tarojs/components";
import { useState, useEffect } from "react";
import "./FR200.less";
interface Props {
isPop: boolean;
activeModeID: any;
ModeList: any;
onEmit: Function; // 每次点击item回调事件和数据给父组件
onEmitShowAll: Function; // 打开弹窗按钮
onModeLockOpen: Function; // 打开锁定弹窗
}
function Index({
isPop,
ModeList,
activeModeID,
onEmit,
onModeLockOpen,
onEmitShowAll,
}: Props) {
const onItemClick = (item) => {
if (item.lock) {
onModeLockOpen(); // 点击了锁定模式
return;
}
onEmit(item);
};
const showAll = () => {
onEmitShowAll();
};
return (
<Block>
<View className="mode-list-main">
{!isPop && ModeList.length > 0 && (
<View className="change-all-mode-btn" onClick={showAll}>
<View className="title"></View>
<Image
className="icon"
src={require("@/img/iot/mode-switch.png")}
/>
</View>
)}
<ScrollView
className="mode-list-box"
scrollX={true}
scrollIntoView={"all_" + activeModeID} // itemID自动滚动到该元素位置
>
<View className="mode-list">
{ModeList.map((item: any, index: any) => {
return (
<View
key={"all_" + index}
id={"all_" + item.id}
className={classnames("mode-item", {
"mode-item-active": activeModeID === item.id,
})}
onClick={onItemClick.bind(this, item)}
>
<View
className={classnames("new", {
"is-new": item.isNew === 1,
})}
>
NEW
</View>
<View className="mode-info">
<View className="mode-info-title">{item.modeName}</View>
<View className="mode-info-time">
{item.modeTimeStr === "00:00"
? "--:--"
: item.modeTimeStr}
</View>
<View
className={classnames("mode-info-select", {
"is-select": activeModeID === item.id,
})}
>
{activeModeID === item.id && (
<View className="mode-info-select-point"></View>
)}
</View>
</View>
{activeModeID === item.id && (
<View className="mode-pic">
<Image
src={item.modeBanner}
mode="aspectFill"
style="animation-iteration-count:1;"
/>
</View>
)}
</View>
);
})}
<View style="width:120rpx;min-width:120rpx;height:40rpx;display:flex"></View>
</View>
</ScrollView>
</View>
</Block>
);
}
export default Index;
Loading…
Cancel
Save