@extscreen/es-core 2.2.46 → 2.2.48

package/dist/index.js

@@ -2590,6 +2590,8 @@ var ESBroadcastModule$1 = new ESBroadcastModule();
 
 class ESBroadcastManager {
 
+  __broadcastReceiverSet = new Map();
+
   init() {
     return Promise.resolve();
   }
@@ -2599,14 +2601,39 @@ class ESBroadcastManager {
   }
 
   registerReceiver(receiver, paramsArray) {
-    if (receiver && receiver.broadcastReceiverActionArray) {
-      receiver.broadcastReceiverActionArray.push(...paramsArray);
+    let has = this.__broadcastReceiverSet.has(paramsArray);
+    if (has) {
+      return Promise.resolve();
     }
-    return ESBroadcastModule$1.registerReceiver(paramsArray);
+    return ESBroadcastModule$1.registerReceiver(paramsArray)
+      .then((receiverId) => {
+        if (receiverId >= 0) {
+          if (receiver && receiver.__registerReceiver) {
+            receiver.__registerReceiver(paramsArray, receiverId);
+          }
+          this.__broadcastReceiverSet.set(paramsArray, receiverId);
+          return Promise.resolve();
+        }
+        return Promise.reject();
+      });
   }
 
-  unregisterReceiver(receiverId) {
-    return ESBroadcastModule$1.unregisterReceiver(receiverId);
+  unregisterReceiver(receiver, paramsArray) {
+    let receiverId = this.__broadcastReceiverSet.get(paramsArray);
+    if (receiverId < 0) {
+      return Promise.reject();
+    }
+    return ESBroadcastModule$1.unregisterReceiver(receiverId)
+      .then((receiverId) => {
+        if (receiverId >= 0) {
+          if (receiver && receiver.__unregisterReceiver) {
+            receiver.__unregisterReceiver(paramsArray);
+          }
+          this.__broadcastReceiverSet.delete(paramsArray);
+          return Promise.resolve();
+        }
+        return Promise.reject();
+      });
   }
 }
 
@@ -2620,33 +2647,60 @@ var ESBroadcast = {
   },
   data() {
     return {
-      broadcastReceiverActionArray: [],
+      broadcastReceiverSet: new Map()
     }
   },
   beforeDestroy() {
     ESApp.$off('onESBroadcastReceive', this.__onBroadcastReceive);
   },
   methods: {
+    __registerReceiver(paramsArray, receiverId) {
+      this.broadcastReceiverSet.set(paramsArray, receiverId);
+      this.__traceBroadcastReceiverList();
+    },
+    __unregisterReceiver(paramsArray) {
+      this.broadcastReceiverSet.delete(paramsArray);
+      this.__traceBroadcastReceiverList();
+    },
+    __traceBroadcastReceiverList() {
+      if (this.broadcastReceiverSet) {
+        this.broadcastReceiverSet.forEach(function (value, key) {
+          if (ESLog.isLoggable(ESLog.DEBUG)) {
+            ESLog.d(TAG$6, key + '#-------TraceAction--->>>>>' + value);
+          }
+        });
+      }
+    },
     __onBroadcastReceive(intent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d(TAG$6, '#-------onBroadcastReceive----->>>>>' + JSON.stringify(intent));
       }
-      if (!this.broadcastReceiverActionArray
-        || this.broadcastReceiverActionArray.length <= 0) {
+      if (!this.broadcastReceiverSet || this.broadcastReceiverSet.size <= 0) {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$6, '#-------onBroadcastReceive---broadcastReceiverActionArray为空-->>>>>');
+          ESLog.d(TAG$6, '#-------onBroadcastReceive---broadcastReceiverSet为空-->>>>>');
         }
         return;
       }
-
+      //
+      else {
+        if (ESLog.isLoggable(ESLog.DEBUG)) {
+          ESLog.d(TAG$6, '#-------onBroadcastReceive---broadcastReceiverSet不为空-->>>>>');
+        }
+      }
       let action = intent.action;
       let enable = false;
-      for (let i = 0; i < this.broadcastReceiverActionArray.length; i++) {
-        let ba = this.broadcastReceiverActionArray[i];
-        if (ba === action) {
-          enable = true;
+
+      this.broadcastReceiverSet.forEach(function (value, key) {
+        if (key && key.length > 0) {
+          for (let i = 0; i < key.length; i++) {
+            let ba = key[i];
+            if (ba === action) {
+              enable = true;
+            }
+          }
         }
-      }
+      });
+
       if (!enable) {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
           ESLog.d(TAG$6, '#-------onBroadcastReceive---disable-->>>>>');
@@ -3135,7 +3189,6 @@ var ESPage = {
     onESRestoreInstanceState(savedInstanceState) {
 
     },
-
     //--------------------------------------------
     startNativePage(intent) {
       ESLaunchManager$1.launchNativePage(intent);
@@ -3149,6 +3202,7 @@ var ESPage = {
     startAfterFinishESPage(intent) {
       ESLaunchManager$1.startAfterFinishESPage(intent);
     },
+    //--------------------------------------------
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extscreen/es-core",
-  "version": "2.2.46",
+  "version": "2.2.48",
   "description": "",
   "main": "dist/index.js",
   "scripts": {