314637581
/
flossom-miniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

Browse Source
master
blak-kong 2 years ago
parent d15b1e53e5 e55061722d
commit 586edb21de
3 changed files with 202 additions and 46 deletions
Show Stats Download Patch File Download Diff File

166
src/moduleIOT/pages/iotCarePlan/FR200.tsx
Unescape Escape View File

@ -122,6 +122,36 @@ class IotCarePlanFR200 extends Component<any, any> {
{ name: "左脸颊", forehead: 6, Total: 10 }, { name: "左脸颊", forehead: 6, Total: 10 },
{ name: "右脸颊", forehead: 2, Total: 10 }, { name: "右脸颊", forehead: 2, Total: 10 },
], ],
stepList: [
{
value: "Step1",
name: "额头",
finish: false,
schedule: 0,
color: "#c2e5f3",
forehead: 0,
},
{
value: "Step2",
name: "左脸颊",
finish: false,
schedule: 0,
color: "#c2e5f3",
forehead: 0,
},
{
value: "Step3",
name: "右脸颊",
finish: false,
schedule: 0,
color: "#c2e5f3",
forehead: 0,
},
],
stepIndex: 0,
// 进度条定时器
timerIdSchedule: null,
timerIdSuccess: null,
gear: { gear: 1 }, gear: { gear: 1 },
currentShowDialog: "", currentShowDialog: "",
@ -133,7 +163,7 @@ class IotCarePlanFR200 extends Component<any, any> {
/** 连接设备 End */ /** 连接设备 End */
/** 护理过程 */ /** 护理过程 */
isRuningTest: false, // 是否正在测试 isRuningTest: 1, // 是否正在测试
isShowStepTips: false, // 是否显示介绍步骤弹窗 isShowStepTips: false, // 是否显示介绍步骤弹窗
isConnectionBlutoot: true, // 是否已连接蓝牙 isConnectionBlutoot: true, // 是否已连接蓝牙
isShowNurse: true, // 是否开始并显示护理 FR200默认已经开始准备护理 isShowNurse: true, // 是否开始并显示护理 FR200默认已经开始准备护理
@ -578,6 +608,7 @@ class IotCarePlanFR200 extends Component<any, any> {
this.handleWorkStatus(false, MODE_WORKING_ENUM.STANDBY); this.handleWorkStatus(false, MODE_WORKING_ENUM.STANDBY);
}); });
}; };
/** 开始护理按钮：点击开始，页面进行到下一步 */ /** 开始护理按钮：点击开始，页面进行到下一步 */
onStartNurse = async () => { onStartNurse = async () => {
this.stepNext(); this.stepNext();
@ -592,6 +623,42 @@ class IotCarePlanFR200 extends Component<any, any> {
// 如果检查失败，则报错 // 如果检查失败，则报错
this.onEmitErrorTips(); this.onEmitErrorTips();
}; };
/** 完成护理，跳转到水分 */
onsuccess = async () => {
let stepList = this.state.stepList;
this.setState({
isShowNursingSuccess: true,
});
// return;
let { currentDevice, ActiveModeItem } = this.state;
let params = {};
let nursingData = {
nursingData: JSON.stringify({
GearData: [...stepList],
}),
};
params = {
instrumentId: currentDevice.id,
instrumentName: currentDevice.name,
modeId: ActiveModeItem.id,
modeName: ActiveModeItem.modeName,
nursingTime: s_to_hms(this.elapsedTime),
};
params = { ...params, ...nursingData };
let res: any = await InstrumentInfo.apiNursingLog.addLog(
JSON.stringify(params)
);
setTimeout(() => {
this.setState({
isShowNursingSuccess: false,
});
go(
`/recoding/pages/moisture_test_report/moisture_test_report?data=${nursingData}&date=${s_to_hms(
this.elapsedTime
)}&modeId=${ActiveModeItem.id}`
);
}, 2000);
};
/** /**
* @name 不可切换光照提示 * @name 不可切换光照提示
@ -721,11 +788,7 @@ class IotCarePlanFR200 extends Component<any, any> {
break; break;
case "working": case "working":
//设备的运行中状态 //设备的运行中状态
console.log("设备状态同步 运行中状态", jsonStatus); console.log("设备状态同步 运行中状态", jsonStatus.workMode);
if (jsonStatus.workMode === "moistureTest") {
// 水分测试
// teststatus:success
}
// 脸部模式 // 脸部模式
if (jsonStatus.workMode === "face") { if (jsonStatus.workMode === "face") {
@ -742,6 +805,59 @@ class IotCarePlanFR200 extends Component<any, any> {
default: default:
break; break;
} }
if (jsonStatus.workMode === "moistureTest") {
if ("success" === jsonStatus.testStatus) {
let stepList = this.state.stepList;
let stepIndex = this.state.stepIndex;
let timerIdSuccess = this.state.timerIdSuccess;
let timerIdSchedule = this.state.timerIdSchedule;
if (stepList[stepIndex].finish) {
stepList[stepIndex].forehead = jsonStatus.waterLevel;
if (stepIndex === 2) {
this.setState({
isRuningTest: 4,
});
} else {
this.setState({
isRuningTest: 1,
});
}
clearTimeout(timerIdSuccess);
clearTimeout(timerIdSchedule);
console.log("成功拿到", jsonStatus, stepIndex);
let num = stepIndex;
if (stepIndex < 2) {
num = stepIndex + 1;
}
this.setState({
timerIdSuccess: null,
timerIdSchedule: null,
stepIndex: num,
stepList,
});
}
} else {
let stepList = this.state.stepList;
let stepIndex = this.state.stepIndex;
let timerIdSuccess = this.state.timerIdSuccess;
let timerIdSchedule = this.state.timerIdSchedule;
if (stepList[stepIndex].finish) {
clearTimeout(timerIdSuccess);
clearTimeout(timerIdSchedule);
stepList[stepIndex].schedule = 0;
stepList[stepIndex].finish = false;
this.setState({
stepList,
isRuningTest: 3,
});
}
}
// 水分测试
// testStatus:success
}
console.log( console.log(
"jsonStatus?.workMode === this.state.ActiveModeItem.modeType", "jsonStatus?.workMode === this.state.ActiveModeItem.modeType",
jsonStatus?.workMode === this.state.ActiveModeItem.modeType jsonStatus?.workMode === this.state.ActiveModeItem.modeType
@ -1206,14 +1322,38 @@ class IotCarePlanFR200 extends Component<any, any> {
workMode: ActiveModeItem.modeType, // 使用模式 workMode: ActiveModeItem.modeType, // 使用模式
workStatus: newWorkStatus, workStatus: newWorkStatus,
}; };
console.log(ActiveModeItem, "查看工作状态");
// 水分测试需要特殊处理 // 水分测试需要特殊处理
// 水分测试准备 水分测试工作 水分测试启动 // 水分测试准备 水分测试工作 水分测试启动
if (ActiveModeItem.modeType === "moistureTest") { if (ActiveModeItem.modeType === "moistureTest") {
sendParams.testStatus = "standby"; // 切换为准备 sendParams.testStatus = "standby"; // 切换为准备
let stepList = this.state.stepList;
let stepIndex = this.state.stepIndex;
let timerIdSchedule = this.state.timerIdSchedule;
let timerIdSuccess = this.state.timerIdSuccess;
if (isBtnClick) { if (isBtnClick) {
timerIdSchedule = setTimeout(function () {
stepList[stepIndex].schedule = 100;
timerIdSuccess = setTimeout(function () {
stepList[stepIndex].finish = true;
this.setState({
stepList,
});
}, 2000);
this.setState({
stepList,
timerIdSuccess,
});
}, 3000);
this.setState({
isRuningTest: 2,
timerIdSchedule,
});
// 水分测试启动 // 水分测试启动
sendParams.testStatus = "start"; // 点击开始再开始 sendParams.testStatus = "start"; // 点击开始再开始
console.log("点击开始", isBtnClick);
} }
} }
@ -1243,7 +1383,7 @@ class IotCarePlanFR200 extends Component<any, any> {
*/ */
onNursingTap(type = "") { onNursingTap(type = "") {
// 如果已禁止运行，则停止执行后续逻辑 // 如果已禁止运行，则停止执行后续逻辑
if (this.state.isRuningTest) return; if (this.state.isRuningTest === 2) return;
// 防止多次点击 // 防止多次点击
if (this.state.hadClickStart) return; if (this.state.hadClickStart) return;
this.setState({ this.setState({
@ -1588,13 +1728,6 @@ class IotCarePlanFR200 extends Component<any, any> {
Taro.removeStorageSync("FR200NursingHistory"); Taro.removeStorageSync("FR200NursingHistory");
}; };
// todoPromise = () => {
// return new Promise<void>((resolve, reject) => {
// setTimeout(() => {
// resolve();
// });
// });
// };
// 脸部one // 脸部one
todoPromise = async () => { todoPromise = async () => {
const nowFR200NursingHistory = Taro.getStorageSync("FR200NursingHistory"); const nowFR200NursingHistory = Taro.getStorageSync("FR200NursingHistory");
@ -2021,6 +2154,8 @@ class IotCarePlanFR200 extends Component<any, any> {
title, title,
isConnectShow, isConnectShow,
GearData, GearData,
stepList,
stepIndex,
isShowStepTips, isShowStepTips,
isShowNurse, isShowNurse,
isStopNurse, isStopNurse,
@ -2294,6 +2429,8 @@ class IotCarePlanFR200 extends Component<any, any> {
<WaterTest <WaterTest
isRuningTest={isRuningTest} isRuningTest={isRuningTest}
TestModeStepIndex={TestModeStepIndex} TestModeStepIndex={TestModeStepIndex}
stepList={stepList}
stepIndex={stepIndex}
></WaterTest> ></WaterTest>
)} )}
</View> </View>
@ -2305,6 +2442,7 @@ class IotCarePlanFR200 extends Component<any, any> {
onEmitStartNurse={this.onStartNurse} onEmitStartNurse={this.onStartNurse}
onEmitSwitchChange={this.onSwitchChange} onEmitSwitchChange={this.onSwitchChange}
onEmitEndPlan={this.onEndPlan} onEmitEndPlan={this.onEndPlan}
onsuccess={this.onsuccess}
/> />
</View> </View>
</Block> </Block>

24
src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.tsx
Unescape Escape View File

@ -5,10 +5,11 @@ interface Props {
// isShowNurse: boolean; // isShowNurse: boolean;
currentWorkModeType: number; // 当前工作模式 1：基础脸部等，只有结束按钮 2.促渗，可以开始暂停和结束 3.水分测试 currentWorkModeType: number; // 当前工作模式 1：基础脸部等，只有结束按钮 2.促渗，可以开始暂停和结束 3.水分测试
isStopNurse: boolean; isStopNurse: boolean;
isRuningTest: boolean; // 是否在运行测试 isRuningTest: any; // 是否在运行测试 1是启动，2进行中，3重新检测，4检测完成
onEmitStartNurse: Function; // 每次点击item，回调事件和数据给父组件 onEmitStartNurse: Function; // 每次点击item，回调事件和数据给父组件
onEmitSwitchChange: Function; onEmitSwitchChange: Function;
onEmitEndPlan: Function; onEmitEndPlan: Function;
onsuccess:Function
} }
function Index({ function Index({
currentWorkModeType, currentWorkModeType,
@ -17,6 +18,7 @@ function Index({
onEmitStartNurse, onEmitStartNurse,
onEmitSwitchChange, onEmitSwitchChange,
onEmitEndPlan, onEmitEndPlan,
onsuccess
}: Props) { }: Props) {
const onStartNurse = () => { const onStartNurse = () => {
onEmitStartNurse(); onEmitStartNurse();
@ -35,14 +37,18 @@ function Index({
<View className="iot-footer"> <View className="iot-footer">
{currentWorkModeType === 3 && ( {currentWorkModeType === 3 && (
<Block> <Block>
{!isRuningTest ? ( {isRuningTest === 1 ? (
<View className="btn " onClick={onStartNurse}> <View className="btn" onClick={onStartNurse}>
启动检测 启动检测
</View> </View>
) : ( ) : isRuningTest === 2 ? (
<View className="btn">检测中...</View> <View className="btn">检测中...</View>
)} ) : isRuningTest === 3 ? (
</Block> <View className="btn" onClick={onStartNurse}>重新检测</View>
) : (
<View className="btn" onClick={onsuccess}>检测完成</View>
)}
</Block>
)} )}
{currentWorkModeType === 2 && ( {currentWorkModeType === 2 && (

58
src/moduleIOT/pages/iotCarePlan/components/WaterTest/index.tsx
Unescape Escape View File

@ -8,29 +8,41 @@ import "./index.less";
interface Props { interface Props {
isRuningTest: boolean; // 是否已开始水分测试 isRuningTest: boolean; // 是否已开始水分测试
TestModeStepIndex: number; // 当前测试步骤 TestModeStepIndex: number; // 当前测试步骤
stepList:any
stepIndex:any
} }
function Index(isRuningTest, TestModeStepIndex) { function Index({
const stepIndex = 0; isRuningTest,
stepList,
stepIndex
}:Props) {
// const stepIndex = 0;
const testIndex = 1; const testIndex = 1;
const stepList = [ // const stepList = [
{ // {
value: "Step1", // value: "Step1",
name: "额头", // name: "额头",
finish: false, // finish: false,
}, // schedule:0,
{ // color:["#ee0a24",'#c2e5f3']
value: "Step2", // },
name: "左脸颊", // {
finish: false, // value: "Step2",
}, // name: "左脸颊",
{ // finish: false,
value: "Step3", // schedule:0,
name: "右脸颊", // color:["#ee0a24",'#c2e5f3']
finish: false, // },
}, // {
]; // value: "Step3",
// name: "右脸颊",
// finish: false,
// schedule:0,
// color:["#ee0a24",'#c2e5f3']
// },
// ];
return ( return (
<Block> <Block>
<View> <View>
@ -69,7 +81,7 @@ function Index(isRuningTest, TestModeStepIndex) {
{stepIndex > index && ( {stepIndex > index && (
<Image <Image
className="finish_img" className="finish_img"
src={require("@/img/full-scran.png")} src={require("@/img/finished.png")}
mode="aspectFill" mode="aspectFill"
></Image> ></Image>
)} )}
@ -89,12 +101,12 @@ function Index(isRuningTest, TestModeStepIndex) {
style={{ style={{
width: "300rpx", width: "300rpx",
}} }}
percentage="80" percentage={stepList[stepIndex].schedule}
strokeWidth="14" strokeWidth="14"
showPivot={false} showPivot={false}
color="#C2E5F3" color={stepList[stepIndex].color}
></Progress> ></Progress>
{stepList[stepIndex].finish && 80 >= 99 ? ( {stepList[stepIndex].finish ? (
<Image <Image
className="finish_img" className="finish_img"
src={require("@/img/finished.png")} src={require("@/img/finished.png")}

Write Preview
Loading…
Cancel
Save