测试横屏

master
blak-kong 2 years ago
parent e909ed328d
commit c76c055467

@ -124,7 +124,7 @@ class ConnectionBluetoot extends Component<any, any> {
// "FR200", // FR200
],
currentDeviceType: "", // 现在的设备类型: WE200 WL200
currentDeviceType: "", // 现在的设备类型: WE200 WL200 FR200当设备为WL200时它还可能是WE200
};
}

@ -110,9 +110,20 @@ export default class DeviceConnectPopup extends Component<any, any> {
<View
className={classnames("common-popup-title", "margin-samll")}
>
{data.bluetoothConnectingTitle}
{data.model === "WL200" && (
<Block>
{currentDeviceType !== "WE200"
? data.bluetoothConnectingTitle
: data.we200BluetoothConnectingTitle}
</Block>
)}
{data.model !== "WL200" && (
<Block>{data.bluetoothConnectingTitle}</Block>
)}
</View>
<View className="device-popup-content-box">
{data.model === "WL200" && (
<Block>
{!this.isImage(data.bluetoothConnecting) ? (
<Video
className="videos"
@ -122,7 +133,37 @@ export default class DeviceConnectPopup extends Component<any, any> {
enablePlayGesture
showFullscreenBtn={false}
playBtnPosition="center"
src={encodeURIComponent(data.bluetoothConnecting)}
src={
currentDeviceType !== "WE200"
? data.bluetoothConnecting
: data.we200BluetoothConnecting
}
/>
) : (
<Image
className="images"
src={
currentDeviceType !== "WE200"
? data.bluetoothConnecting
: data.we200BluetoothConnecting
}
mode="aspectFill"
/>
)}
</Block>
)}
{data.model !== "WL200" && (
<Block>
{!this.isImage(data.bluetoothConnecting) ? (
<Video
className="videos"
autoplay
loop
objectFit="cover"
enablePlayGesture
showFullscreenBtn={false}
playBtnPosition="center"
src={data.bluetoothConnecting}
/>
) : (
<Image
@ -131,6 +172,8 @@ export default class DeviceConnectPopup extends Component<any, any> {
mode="aspectFill"
/>
)}
</Block>
)}
<View className="blue-device-tips">
{currentDeviceType === "WE200" && (

@ -0,0 +1,5 @@
export default definePageConfig({
navigationBarTitleText: '首页',
enablePullDownRefresh: false,
enablePageMeta: true
})

@ -20,6 +20,7 @@ import {
Video,
Input,
Button,
PageMeta,
} from "@tarojs/components";
import { sendCommand } from "@/utils/bluetoothWXAPI";
@ -2354,6 +2355,7 @@ class IotCarePlanWE200 extends Component<any, any> {
return (
<Block>
<PageMeta pageOrientation="landscape">
<Navbar
titleSlot={title}
isBack
@ -2384,7 +2386,10 @@ class IotCarePlanWE200 extends Component<any, any> {
confirm={this.onTipShowClose}
/>
<PopupCountdown isShow={isShowCountdown} countdown={countdown} />
<PopupCountdown
isShow={isShowCountdown}
countdown={countdown}
/>
<PopupConfirm
isLarge
@ -2454,7 +2459,9 @@ class IotCarePlanWE200 extends Component<any, any> {
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>
)}
@ -2491,7 +2498,9 @@ class IotCarePlanWE200 extends Component<any, any> {
onModeLockOpen={this.onModeLockOpen}
/>
)}
<button onClick={this.updata.bind(this)}> </button>
<button onClick={this.updata.bind(this)}>
{" "}
</button>
{/* <button onClick={this.updata.bind(this)}>添加数据 </button> */}
<View className={classnames({ show: showEcharts })}>
@ -2546,6 +2555,8 @@ class IotCarePlanWE200 extends Component<any, any> {
></EchartsFullScean>
</View>
)}
</PageMeta>
<View></View>
</Block>
);
}

@ -1457,8 +1457,8 @@ class Index extends Component<any, any> {
<Popup show={show} className="custom-popup" overlay={false}>
<View className="popBox"></View>
</Popup>
{/* </PageMeta> */}
{/* <View
{/* </PageMeta>
<View
style="position:fixed;width:100vw;height:100vh"
onClick={this.goTest}
>

Loading…
Cancel
Save