diff --git a/src/common/WuJieInitializer.ts b/src/common/WuJieInitializer.ts index f872181..f9ef1e0 100644 --- a/src/common/WuJieInitializer.ts +++ b/src/common/WuJieInitializer.ts @@ -36,6 +36,9 @@ export class WuJieInitializer { $wujie.bus.$on("initialize_app", (device_sn: string) => { WuJieInitializer.onInitializeApp(device_sn, $wujie, $store, $q, $t); }); + setTimeout(() => { + $wujie.bus.$emit("client_mounted"); + }, 500); } } @@ -79,6 +82,9 @@ export class WuJieInitializer { .initialize() .then(() => { $store.commit("setInitialized"); + if ($wujie) { + $wujie.bus.$emit("client_initialize_end"); + } }); EventBus.getInstance().emit(EventNamesDefine.WebSocketConnected, this); }, 0); diff --git a/src/common/WuJieReconnectingWebSocket.ts b/src/common/WuJieReconnectingWebSocket.ts index f68c659..72a708a 100644 --- a/src/common/WuJieReconnectingWebSocket.ts +++ b/src/common/WuJieReconnectingWebSocket.ts @@ -1,61 +1,59 @@ -import { IWuJieInterface } from './../store/index'; -import { store } from 'quasar/wrappers'; - +import { IWuJieInterface } from "./../store/index"; +import { store } from "quasar/wrappers"; export default class WuJieReconnectingWebSocket { - readyState: number ; - $wujie : IWuJieInterface; + readyState: number; + $wujie: IWuJieInterface; constructor() { - this.readyState=WebSocket.OPEN; - this.onclose=(ev:any)=>{} - this.onerror=(ev:any)=>{} - this.onmessage=(ev:any)=>{} - this.onopen=(ev:any)=>{} + this.readyState = WebSocket.OPEN; + this.onclose = (ev: any) => {}; + this.onerror = (ev: any) => {}; + this.onmessage = (ev: any) => {}; + this.onopen = (ev: any) => {}; this.$wujie = (window as any).$wujie; - if(this.$wujie){ - this.$wujie.bus.$on("onclose",this.onclose) - this.$wujie.bus.$on("onerror",this.onerror) - this.$wujie.bus.$on("onmessage", (ev:any)=>{ - if(this.onmessage) { - this.onmessage(ev) + if (this.$wujie) { + this.$wujie.bus.$on("onclose", this.onclose); + this.$wujie.bus.$on("onerror", this.onerror); + this.$wujie.bus.$on("onmessage", (ev: any) => { + if (this.onmessage) { + this.onmessage(ev); } - }) - this.$wujie.bus.$on("onopen",this.onopen) + }); + this.$wujie.bus.$on("onopen", this.onopen); setTimeout(() => { - if(this.onopen){ + if (this.onopen) { this.onopen(null); } - },1000); + }, 500); } } - onclose: ((event: any) => void) | null; - /** - * An event listener to be called when an error occurs - */ - onerror: ((event: any) => void) | null; - /** - * An event listener to be called when a message is received from the server - */ - onmessage: ((event: MessageEvent) => void) | null; - /** - * An event listener to be called when the WebSocket connection's readyState changes to OPEN; - * this indicates that the connection is ready to send and receive data - */ - onopen: ((event: any) => void) | null; - /** - * Closes the WebSocket connection or connection attempt, if any. If the connection is already - * CLOSED, this method does nothing - */ - close(code?: number, reason?: string){ - } - /** - * Enqueue specified data to be transmitted to the server over the WebSocket connection - */ - send(data: string) { - if(this.$wujie){ - this.$wujie.bus.$emit("send_to",data) - } + onclose: ((event: any) => void) | null; + /** + * An event listener to be called when an error occurs + */ + onerror: ((event: any) => void) | null; + /** + * An event listener to be called when a message is received from the server + */ + onmessage: ((event: MessageEvent) => void) | null; + /** + * An event listener to be called when the WebSocket connection's readyState changes to OPEN; + * this indicates that the connection is ready to send and receive data + */ + onopen: ((event: any) => void) | null; + /** + * Closes the WebSocket connection or connection attempt, if any. If the connection is already + * CLOSED, this method does nothing + */ + close(code?: number, reason?: string) {} + /** + * Enqueue specified data to be transmitted to the server over the WebSocket connection + */ + send(data: string) { + if (this.$wujie) { + this.$wujie.bus.$emit("send_to", data); } + } } diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index ae7d3d7..e4b09c1 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -104,7 +104,6 @@ :disable="loading" />