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

fix:设备蓝牙连接增加限制，wl200切换模式增加限制

Browse Source
master
blak-kong 2 years ago
parent a9cdfaa602
commit dd2a627f8a
4 changed files with 123 additions and 112 deletions
Show Stats Download Patch File Download Diff File

27
src/components/bluetoot/connection/index.tsx
Unescape Escape View File

@ -117,11 +117,11 @@ class ConnectionBluetoot extends Component<any, any> {
// WL200匹配 // WL200匹配
tranType: [ tranType: [
"WE100", // 发箍 // "WE100", // 发箍
"WE200", // 发箍 // "WE200", // 发箍
"WL200", // 面罩 // "WL200", // 面罩
"12CAA", // 面罩前缀名 // "12CAA", // 面罩前缀名
"FR200", // FR200 // "FR200", // FR200
], ],
currentDeviceType: "", // 现在的设备类型： WE200 WL200 currentDeviceType: "", // 现在的设备类型： WE200 WL200
@ -319,14 +319,15 @@ class ConnectionBluetoot extends Component<any, any> {
/** 4.蓝牙查找 */ /** 4.蓝牙查找 */
onBluetoothDeviceFound() { onBluetoothDeviceFound() {
Taro.onBluetoothDeviceFound((item: any) => { Taro.onBluetoothDeviceFound((item: any) => {
console.log("蓝牙查找item", item, item.devices[0].name); let model = this.props.deviceInfo.model; // 限制只匹配当前传入的设备类型
console.info("搜索到到蓝牙设备 value => ", item.devices[0]?.name); // 匹配数组：先匹配到哪个连接哪个
console.log(">>>>>>>当前传入设备类型>>>>>", this.props.deviceInfo.model); let tranType: string[] = [];
// 先匹配到哪个连接哪个 // 判断条件随着设备的增加而增加
let tranType = [ if (model === "WL200") {
this.props.deviceInfo.model, // 当前传入设备类型 tranType = ["WL200", "WE200", "WE100", "12CAA"];
...this.state.tranType, } else if (model === "FR200") {
]; tranType = ["FR200"];
}
for (let i = 0; i < item.devices.length; i++) { for (let i = 0; i < item.devices.length; i++) {
let devicesName = item.devices[i].localName || item.devices[i].name; let devicesName = item.devices[i].localName || item.devices[i].name;
// 是否匹配可连接设备 // 是否匹配可连接设备

20
src/moduleIOT/pages/iotCarePlan/WL200.tsx
Unescape Escape View File

@ -11,8 +11,8 @@ import React, {
useRef, useRef,
} from "react"; } from "react";
import Echarts from "./components/Echart/index"; // import Echarts from "./components/Echart/index";
import EchartFace from "./components/Echart_face/index"; // import EchartFace from "./components/Echart_face/index";
import { import {
Block, Block,
View, View,
@ -378,9 +378,12 @@ class IotCarePlanWL200 extends Component<any, any> {
let res = await InstrumentInfo.modeInfoList(params); let res = await InstrumentInfo.modeInfoList(params);
if (res.data.code === 200) { if (res.data.code === 200) {
if (res.data.data.length > 0) { if (res.data.data.length > 0) {
this.tempModeCurrent = res.data.data[0];
this.setState({ this.setState({
ActiveModeItem: res.data.data[0], ActiveModeItem: res.data.data[0],
ModeList: res.data.data, ModeList: res.data.data,
activeModeID: res.data.data[0].id,
ModeID: "mode_" + res.data.data[0].id,
}); });
// setTimeout(() => { // setTimeout(() => {
@ -458,8 +461,15 @@ class IotCarePlanWL200 extends Component<any, any> {
currentServiceData, currentServiceData,
ModeStepIndex: 0, ModeStepIndex: 0,
currentTime, currentTime,
// ModeType: modeArray[data.modeClass],
});
// 只有点击过开始，才隐藏其他模式类型
if (isShowNurse) {
this.setState({
ModeType: modeArray[data.modeClass], ModeType: modeArray[data.modeClass],
}); });
}
setTimeout(() => { setTimeout(() => {
// 设置时间组合 // 设置时间组合
@ -2271,7 +2281,7 @@ class IotCarePlanWL200 extends Component<any, any> {
onTimeUpdate={this.GetVideosTime} onTimeUpdate={this.GetVideosTime}
/> />
)} )}
<button onClick={this.GetVideosTime}>获取视频时长</button> {/* <button onClick={this.GetVideosTime}>获取视频时长</button> */}
{/* <button onClick={this.handleClicksound}>音频播放/音频暂停</button> */} {/* <button onClick={this.handleClicksound}>音频播放/音频暂停</button> */}
{/* <button onClick={this.handleClickVideo}>播放/暂停</button> */} {/* <button onClick={this.handleClickVideo}>播放/暂停</button> */}
{isShowNurse && ( {isShowNurse && (
@ -2340,8 +2350,8 @@ class IotCarePlanWL200 extends Component<any, any> {
/> />
)} )}
<Echarts></Echarts> {/* <Echarts></Echarts>
<EchartFace></EchartFace> <EchartFace></EchartFace> */}
</View> </View>
<Footer <Footer

2
src/pages/index/index.less
Unescape Escape View File

@ -43,7 +43,7 @@ page {
/* background: red; */ /* background: red; */
} }
.infobox5 { .index-infobox5 {
padding: 44rpx 30rpx 0; padding: 44rpx 30rpx 0;
} }

172
src/pages/index/index.tsx
Unescape Escape View File

@ -420,7 +420,7 @@ class Index extends Component<any, any> {
}; };
GetSiteAddTag = async (id) => { GetSiteAddTag = async (id) => {
go("/pages/moisture_test_report/moisture_test_report") go("/pages/moisture_test_report/moisture_test_report");
let res = await GetSiteAddTag(id); let res = await GetSiteAddTag(id);
if (res.data.code === 200) { if (res.data.code === 200) {
console.log("点击自动上报，不需要逻辑处理"); console.log("点击自动上报，不需要逻辑处理");
@ -840,7 +840,7 @@ class Index extends Component<any, any> {
// 跳转仪器介绍页 // 跳转仪器介绍页
goNursing = (item) => { goNursing = (item) => {
console.log(item,'查看item'); console.log(item, "查看item");
// 仅开发者工具调试使用 // 仅开发者工具调试使用
const platform = Taro.getSystemInfoSync().platform; const platform = Taro.getSystemInfoSync().platform;
@ -1109,7 +1109,7 @@ class Index extends Component<any, any> {
<View catchMove> <View catchMove>
<PopupAlert <PopupAlert
isShow={isCommonError} isShow={isCommonError}
title='提示' title="提示"
content={ content={
<Block> <Block>
{commonErrorText.map((item) => { {commonErrorText.map((item) => {
@ -1117,60 +1117,60 @@ class Index extends Component<any, any> {
})} })}
</Block> </Block>
} }
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='center' textAlgin="center"
close={this.onCommonErrorFun} close={this.onCommonErrorFun}
confirm={this.onCommonErrorFun} confirm={this.onCommonErrorFun}
/> />
<PopupConfirm <PopupConfirm
isShow={isShowReConnectDeviceRecordWL200} isShow={isShowReConnectDeviceRecordWL200}
isClose isClose
title='提示' title="提示"
zIndex={10020} zIndex={10020}
myClassName='level-up' myClassName="level-up"
content={ content={
<Block> <Block>
<View>检测到您上一次护理的记录未生成，</View> <View>检测到您上一次护理的记录未生成，</View>
<View>是否重新读取</View> <View>是否重新读取</View>
</Block> </Block>
} }
cancelButtonText='取消' cancelButtonText="取消"
confirmButtonText='连接设备' confirmButtonText="连接设备"
textAlgin='center' textAlgin="center"
close={this.closeReConnectDeviceRecordWL200} close={this.closeReConnectDeviceRecordWL200}
confirm={this.confirmReConnectDeviceRecordWL200} confirm={this.confirmReConnectDeviceRecordWL200}
/> />
<PopupAlert <PopupAlert
isShow={isBindingError} isShow={isBindingError}
title='提示' title="提示"
content={ content={
<Block> <Block>
<View>序列号信息仍在更新，请联系微信小助理</View> <View>序列号信息仍在更新，请联系微信小助理</View>
<View>协助您绑定仪器</View> <View>协助您绑定仪器</View>
</Block> </Block>
} }
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='center' textAlgin="center"
close={this.onBindErrorClose} close={this.onBindErrorClose}
confirm={this.onBindErrorConfirm} confirm={this.onBindErrorConfirm}
/> />
<PopupAlert <PopupAlert
isShow={isNotRegister} isShow={isNotRegister}
isClose isClose
title='提示' title="提示"
content='暂未授权注册，请点击注册' content="暂未授权注册，请点击注册"
confirmButtonText='确定' confirmButtonText="确定"
textAlgin='center' textAlgin="center"
type='1' type="1"
close={this.closeAlert} close={this.closeAlert}
confirm={this.closeAlert} confirm={this.closeAlert}
/> />
<PopupAlert <PopupAlert
isShow={isDev} isShow={isDev}
title='提示' title="提示"
content='页面正在开发中' content="页面正在开发中"
confirmButtonText='确定' confirmButtonText="确定"
textAlgin='center' textAlgin="center"
close={this.closeDev} close={this.closeDev}
confirm={this.closeDev} confirm={this.closeDev}
/> />
@ -1189,54 +1189,54 @@ class Index extends Component<any, any> {
/> />
<PopupAlert <PopupAlert
isShow={isBindingError} isShow={isBindingError}
title='提示' title="提示"
content={ content={
<Block> <Block>
<View>序列号信息仍在更新，请联系微信小助理</View> <View>序列号信息仍在更新，请联系微信小助理</View>
<View>协助您绑定仪器</View> <View>协助您绑定仪器</View>
</Block> </Block>
} }
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='center' textAlgin="center"
close={this.onBindErrorClose} close={this.onBindErrorClose}
confirm={this.onBindErrorConfirm} confirm={this.onBindErrorConfirm}
/> />
<PopupAlert <PopupAlert
isShow={isBeforeBindingError} isShow={isBeforeBindingError}
title='提示' title="提示"
content={ content={
BeforeBindingErrorText || "您选择的仪器有误，请重新确认选择" BeforeBindingErrorText || "您选择的仪器有误，请重新确认选择"
} }
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='center' textAlgin="center"
close={this.onBeforeBindClose} close={this.onBeforeBindClose}
confirm={this.onBeforeBindConfirm} confirm={this.onBeforeBindConfirm}
/> />
<PopupAlert <PopupAlert
isShow={isBindingError203} isShow={isBindingError203}
title='提示' title="提示"
content='序列码已被别人绑定，请联系微信助手' content="序列码已被别人绑定，请联系微信助手"
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='center' textAlgin="center"
close={this.onBindErrorClose203} close={this.onBindErrorClose203}
confirm={this.onBindErrorConfirm203} confirm={this.onBindErrorConfirm203}
></PopupAlert> ></PopupAlert>
<PopupAlert <PopupAlert
isShow={showEquipment} isShow={showEquipment}
title='提示' title="提示"
content={ content={
<Block> <Block>
<View className='mb10'> <View className="mb10">
仪器：{instrumentInfo.instrumentName} 仪器：{instrumentInfo.instrumentName}
</View> </View>
<View className='mb10'>序列号：{instrumentInfo.serial}</View> <View className="mb10">序列号：{instrumentInfo.serial}</View>
<View className='mb10'>您需要完成注册登录才能进行一起绑定</View> <View className="mb10">您需要完成注册登录才能进行一起绑定</View>
</Block> </Block>
} }
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='center' textAlgin="center"
close={this.onUnloginClose.bind(this)} close={this.onUnloginClose.bind(this)}
confirm={this.onUnloginConfirm.bind(this)} confirm={this.onUnloginConfirm.bind(this)}
></PopupAlert> ></PopupAlert>
@ -1244,9 +1244,9 @@ class Index extends Component<any, any> {
<PopupSiteSwiper <PopupSiteSwiper
isShow={isShowSiteSwiper} isShow={isShowSiteSwiper}
siteData={sitePopupList} siteData={sitePopupList}
size='middle' size="middle"
confirmButtonText='确定' confirmButtonText="确定"
textAlgin='center' textAlgin="center"
close={this.closeSiteSwiper} close={this.closeSiteSwiper}
confirm={this.closeSiteSwiper} confirm={this.closeSiteSwiper}
/> />
@ -1266,15 +1266,15 @@ class Index extends Component<any, any> {
isLarge isLarge
isClose isClose
isShow={isShowUpdateVersionTip} isShow={isShowUpdateVersionTip}
title='提示' title="提示"
content={ content={
<Block> <Block>
<View>检测到设备有升级请求</View> <View>检测到设备有升级请求</View>
<View>是否进行升级？</View> <View>是否进行升级？</View>
</Block> </Block>
} }
textAlgin='center' textAlgin="center"
confirmButtonText='确定' confirmButtonText="确定"
close={this.cancelUpdateVersionTip} close={this.cancelUpdateVersionTip}
confirm={this.confirmUpdateVersionTip} confirm={this.confirmUpdateVersionTip}
/> />
@ -1287,16 +1287,16 @@ class Index extends Component<any, any> {
)} )}
<PopupAlert <PopupAlert
isShow={isShowVersionUpgradFinish} isShow={isShowVersionUpgradFinish}
title='升级内容公告' title="升级内容公告"
content={ content={
<Block> <Block>
<View className='nodes'> <View className="nodes">
<RichText nodes={versionUpgradFinishNodes} /> <RichText nodes={versionUpgradFinishNodes} />
</View> </View>
</Block> </Block>
} }
confirmButtonText='知道了' confirmButtonText="知道了"
textAlgin='left' textAlgin="left"
isClose isClose
close={this.onVersionUpgradFinish} close={this.onVersionUpgradFinish}
confirm={this.onVersionUpgradFinish} confirm={this.onVersionUpgradFinish}
@ -1308,29 +1308,29 @@ class Index extends Component<any, any> {
leftSlot={ leftSlot={
<Block> <Block>
<View <View
className='message' className="message"
onClick={this.gourl} onClick={this.gourl}
data-url='/pages/message/message' data-url="/pages/message/message"
> >
<Image <Image
className='message-img' className="message-img"
src={require("../../img/index/message.png")} src={require("../../img/index/message.png")}
mode='aspectFill' mode="aspectFill"
/> />
{messagecount ? <View className='tip' /> : ""} {messagecount ? <View className="tip" /> : ""}
</View> </View>
</Block> </Block>
} }
/> />
<View className='index'> <View className="index">
<View className='date-title' onClick={this.toNursingRecords}> <View className="date-title" onClick={this.toNursingRecords}>
<Text className='text'>护理记录</Text> <Text className="text">护理记录</Text>
<Image <Image
src={require("../../img/index/right.png")} src={require("../../img/index/right.png")}
style='width: 20rpx;height: 20rpx;' style="width: 20rpx;height: 20rpx;"
/> />
</View> </View>
<View className='bg-while'> <View className="bg-while">
<AtCalendar <AtCalendar
hideArrow hideArrow
isSwiper={false} isSwiper={false}
@ -1342,40 +1342,40 @@ class Index extends Component<any, any> {
/> />
</View> </View>
</View> </View>
<View className='infobox5'> <View className="index-infobox5">
{instrumentList.length > 0 && ( {instrumentList.length > 0 && (
<Block> <Block>
<View className='nurse_plan_box flex aitems sb'> <View className="nurse_plan_box flex aitems sb">
<View className='title'>前往护理</View> <View className="title">前往护理</View>
<View <View
className='txt_box flex jcenter aitems' className="txt_box flex jcenter aitems"
data-url='/pages/instrument/instrument' data-url="/pages/instrument/instrument"
onClick={this.gourl} onClick={this.gourl}
> >
<Image <Image
className='right_icon' className="right_icon"
src={require("../../img/black-add.png")} src={require("../../img/black-add.png")}
mode='aspectFill' mode="aspectFill"
/> />
<View className='txt'>添加新设备</View> <View className="txt">添加新设备</View>
</View> </View>
</View> </View>
<View style='overflow-x: auto;'> <View style="overflow-x: auto;">
<View className='device_list flex'> <View className="device_list flex">
{instrumentList.map((item, index) => { {instrumentList.map((item, index) => {
return ( return (
<View <View
key={"instrumentList" + index} key={"instrumentList" + index}
className='device_item' className="device_item"
onClick={this.goNursing.bind(this, item)} onClick={this.goNursing.bind(this, item)}
> >
<Image <Image
className='banner_img' className="banner_img"
src={item.banner} src={item.banner}
mode='aspectFill' mode="aspectFill"
/> />
<View className='device_name ellipsis1'> <View className="device_name ellipsis1">
{item.name} {item.name}
</View> </View>
</View> </View>
@ -1387,28 +1387,28 @@ class Index extends Component<any, any> {
)} )}
{instrumentList.length === 0 && ( {instrumentList.length === 0 && (
<Block> <Block>
<View className='nurse_plan_box flex aitems sb'> <View className="nurse_plan_box flex aitems sb">
<View className='title'>前往护理</View> <View className="title">前往护理</View>
</View> </View>
<View className='add_device flex jcenter aitems bg-while'> <View className="add_device flex jcenter aitems bg-while">
<View className='add_device_btn'> <View className="add_device_btn">
<View className='txt_box flex jcenter aitems'> <View className="txt_box flex jcenter aitems">
<View <View
className='at-icon at-icon-add' className="at-icon at-icon-add"
style='color: #fff;font-size: 30rpx;' style="color: #fff;font-size: 30rpx;"
></View> ></View>
<View className='txt' onClick={this.addNewDevice}> <View className="txt" onClick={this.addNewDevice}>
添加新设备 添加新设备
</View> </View>
</View> </View>
</View> </View>
<View className='tips'>您暂时还没有绑定任何设备</View> <View className="tips">您暂时还没有绑定任何设备</View>
</View> </View>
</Block> </Block>
)} )}
</View> </View>
<View className='infobox3'> <View className="infobox3">
<Swiper <Swiper
autoplay autoplay
onAnimationFinish={this.bannerSwiperchange.bind(this)} onAnimationFinish={this.bannerSwiperchange.bind(this)}
@ -1420,15 +1420,15 @@ class Index extends Component<any, any> {
key={"banner_" + index} key={"banner_" + index}
onClick={this.gobanner.bind(this, item)} onClick={this.gobanner.bind(this, item)}
> >
<Image style='width:100%;height:100%' src={item.fileUrl} /> <Image style="width:100%;height:100%" src={item.fileUrl} />
</SwiperItem> </SwiperItem>
); );
})} })}
</Swiper> </Swiper>
</View> </View>
<View style='height:200rpx'></View> <View style="height:200rpx"></View>
<Popup show={show} className='custom-popup' overlay={false}> <Popup show={show} className="custom-popup" overlay={false}>
<View className='popBox'>你已绑定所有设备</View> <View className="popBox">你已绑定所有设备</View>
</Popup> </Popup>
</Block> </Block>
); );

Write Preview
Loading…
Cancel
Save