diff --git a/src/components/bluetoot/connection/index.tsx b/src/components/bluetoot/connection/index.tsx index 6281810..7d0bb70 100644 --- a/src/components/bluetoot/connection/index.tsx +++ b/src/components/bluetoot/connection/index.tsx @@ -36,7 +36,7 @@ import { } from "@/utils/util"; // const log = require("@/utils/log"); import commandMap from "@/utils/commandMap"; -import { bleCommandSamples } from "./test"; +import { bleCommandSamples } from "./wl200"; import { DeviceToolKit as DeviceToolKitWE100 } from "@flossom-npm/iot-translater-we100"; const deviceToolKitInstanceWL200 = new DeviceToolKitWE100("WL200", "WL200"); diff --git a/src/components/bluetoot/connection/test.js b/src/components/bluetoot/connection/wl200.js similarity index 100% rename from src/components/bluetoot/connection/test.js rename to src/components/bluetoot/connection/wl200.js diff --git a/src/components/bluetoot/device-connection-popup/device-connection-popup.less b/src/components/bluetoot/device-connection-popup/device-connection-popup.less index fdee03f..1be0996 100644 --- a/src/components/bluetoot/device-connection-popup/device-connection-popup.less +++ b/src/components/bluetoot/device-connection-popup/device-connection-popup.less @@ -99,6 +99,7 @@ // width: 100%; // height: 100%; overflow: hidden; + background-color: #eee; } .error-block { diff --git a/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx b/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx index 88cc794..a4cdf1b 100644 --- a/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx +++ b/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx @@ -102,6 +102,7 @@ export default class DeviceConnectPopup extends Component { onClick={this.onClose} > + {/* 非错误弹窗 */} {!error && ( { {data.bluetoothConnectingTitle} - {this.isImage(data.bluetoothConnecting) ? ( + {!this.isImage(data.bluetoothConnecting) ? ( )} + {/* 错误与失败弹窗 */} {error && ( { {data.bluetoothConnectFailTitle} -