ue-softphone-sdk 2.1.6 → 2.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ue-softphone-sdk",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "ue-softphone-sdk",
   "main": "dist/ue-softphone-sdk.js",
   "scripts": {

package/src/index.ts

@@ -534,6 +534,16 @@ export default class ueSoftphone {
     });
 
     this.Socketinstance.on("message", (event: any, fn: Function) => {
+      callbacks.message({
+        subtype: event.subType,
+        data: event.data
+      });
+      if (fn && typeof fn === "function") {
+        fn("success");
+      }
+    });
+
+    this.Socketinstance.on("event", (event: any) => {
       if (event.subType === "KICK_OFF") {
         this.Socketinstance.disconnect();
         try {
@@ -544,13 +554,6 @@ export default class ueSoftphone {
           error: "您的账号在其他网页登录"
         });
       }
-      callbacks.message({
-        subtype: event.subType,
-        data: event.data
-      });
-      if (fn && typeof fn === "function") {
-        fn("success");
-      }
     });
   }
 
@@ -2061,8 +2064,10 @@ class ueWebsocket {
 
     if (type === "message") {
       this.ws.on("call", callback);
+    }
+
+    if (type === "event") {
       this.ws.on("event", callback);
-      // this.ws.on("monitor", callback);
     }
   }
   public emit(type: string, params: any, callback: Function) {

package/src/new-index.ts

@@ -249,9 +249,12 @@ class ueWebsocket {
 
     if (type === "message") {
       this.ws.on("call", callback);
-      this.ws.on("event", callback);
       // this.ws.on("monitor", callback);
     }
+
+    if (type === "event") {
+      this.ws.on("event", callback);
+    }
   }
   public emit(type: string, params: any, callback: Function) {
     this.ws.emit(type, params, callback);
@@ -566,23 +569,27 @@ export default class ueSoftphone {
     });
 
     this.Socketinstance.on("message", (event: any, fn: Function) => {
+      callbacks.message({
+        subtype: event.subType,
+        data: event.data
+      });
+      if (fn && typeof fn === "function") {
+        fn("success");
+      }
+    });
+
+    this.Socketinstance.on("event", (event: any) => {
       if (event.subType === "KICK_OFF") {
         this.Socketinstance.disconnect();
         try {
           WebPhoneSdk.disconnect();
         } catch (error) {}
+
         callbacks.error({
           type: "accountError",
           error: "您的账号在其他网页登录"
         });
       }
-      callbacks.message({
-        subtype: event.subType,
-        data: event.data
-      });
-      if (fn && typeof fn === "function") {
-        fn("success");
-      }
     });
   }