@extscreen/es-core 2.2.46 → 2.2.49

package/dist/index.js

@@ -200,7 +200,7 @@ var ESDeviceModule$1 = new ESDeviceModule();
  *
  */
 
-const TAG$8 = 'ESDeviceManager';
+const TAG$9 = 'ESDeviceManager';
 
 class ESDeviceManager {
 
@@ -259,7 +259,7 @@ class ESDeviceManager {
       ESDeviceModule$1.getDevice().then(
         (device) => {
           if (ESLog.isLoggable(ESLog.DEBUG)) {
-            ESLog.d(TAG$8, '#----------init---------->>>>>' + JSON.stringify(device));
+            ESLog.d(TAG$9, '#----------init---------->>>>>' + JSON.stringify(device));
           }
           this._device = device;
 
@@ -312,7 +312,7 @@ class ESDeviceManager {
             }
           } catch (e) {
             if (ESLog.isLoggable(ESLog.DEBUG)) {
-              ESLog.d(TAG$8, '#----------init---解析--error----->>>>>' + e);
+              ESLog.d(TAG$9, '#----------init---解析--error----->>>>>' + e);
             }
           }
           resolve(device);
@@ -320,7 +320,7 @@ class ESDeviceManager {
         //
         error => {
           if (ESLog.isLoggable(ESLog.DEBUG)) {
-            ESLog.d(TAG$8, '#----------init-----error----->>>>>' + error);
+            ESLog.d(TAG$9, '#----------init-----error----->>>>>' + error);
           }
           resolve(error);
         }
@@ -822,7 +822,7 @@ var ESAudioModule$1 = new ESAudioModule();
  *
  */
 
-const TAG$7 = 'ESAudioManager';
+const TAG$8 = 'ESAudioManager';
 
 class ESAudioManager {
 
@@ -848,7 +848,7 @@ class ESAudioManager {
   initPromise() {
     return new Promise((resolve, reject) => {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$7, '------------init----start----->>>>');
+        ESLog.d(TAG$8, '------------init----start----->>>>');
       }
       this.getStreamSystemMaxVolume();
       this.getStreamSystemVolume();
@@ -863,7 +863,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamVoiceCallMaxVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamVoiceCallMaxVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamVoiceCallMaxVolume--->>>>' + volume);
         }
         this._voiceCallMaxVolume = volume;
       });
@@ -877,7 +877,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamVoiceCallVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamVoiceCallVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamVoiceCallVolume--->>>>' + volume);
         }
         this._voiceCallVolume = volume;
       });
@@ -892,7 +892,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamSystemMaxVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamSystemMaxVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamSystemMaxVolume--->>>>' + volume);
         }
         this._systemMaxVolume = volume;
       });
@@ -906,7 +906,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamSystemVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamSystemVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamSystemVolume--->>>>' + volume);
         }
         this._systemVolume = volume;
       });
@@ -921,7 +921,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamRingMaxVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamRingMaxVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamRingMaxVolume--->>>>' + volume);
         }
         this._ringMaxVolume = volume;
       });
@@ -935,7 +935,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamRingVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamRingVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamRingVolume--->>>>' + volume);
         }
         this._ringVolume = volume;
       });
@@ -950,7 +950,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamMusicMaxVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamMusicMaxVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamMusicMaxVolume--->>>>' + volume);
         }
         this._musicMaxVolume = volume;
       });
@@ -964,7 +964,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamMusicVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamMusicVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamMusicVolume--->>>>' + volume);
         }
         this._musicVolume = volume;
       });
@@ -979,7 +979,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamAlarmMaxVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamAlarmMaxVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamAlarmMaxVolume--->>>>' + volume);
         }
         this._alarmMaxVolume = volume;
       });
@@ -993,7 +993,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamAlarmVolume()
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, '-----getStreamAlarmVolume--->>>>' + volume);
+          ESLog.d(TAG$8, '-----getStreamAlarmVolume--->>>>' + volume);
         }
         this._alarmVolume = volume;
       });
@@ -1008,7 +1008,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamMaxVolume(streamType)
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, streamType + '-----getStreamMaxVolume--->>>>' + volume);
+          ESLog.d(TAG$8, streamType + '-----getStreamMaxVolume--->>>>' + volume);
         }
       });
   }
@@ -1017,7 +1017,7 @@ class ESAudioManager {
     ESAudioModule$1.getStreamVolume(streamType)
       .then((volume) => {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$7, streamType + '-----getStreamVolume--->>>>' + volume);
+          ESLog.d(TAG$8, streamType + '-----getStreamVolume--->>>>' + volume);
         }
       });
   }
@@ -2590,6 +2590,8 @@ var ESBroadcastModule$1 = new ESBroadcastModule();
 
 class ESBroadcastManager {
 
+  __broadcastReceiverSet = new Map();
+
   init() {
     return Promise.resolve();
   }
@@ -2599,20 +2601,45 @@ 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();
+      });
   }
 }
 
 var ESBroadcastManager$1 = new ESBroadcastManager();
 
-const TAG$6 = "ESBroadcast";
+const TAG$7 = "ESBroadcast";
 
 var ESBroadcast = {
   mounted() {
@@ -2620,36 +2647,63 @@ 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$7, key + '#-------TraceAction--->>>>>' + value);
+          }
+        });
+      }
+    },
     __onBroadcastReceive(intent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$6, '#-------onBroadcastReceive----->>>>>' + JSON.stringify(intent));
+        ESLog.d(TAG$7, '#-------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$7, '#-------onBroadcastReceive---broadcastReceiverSet为空-->>>>>');
         }
         return;
       }
-
+      //
+      else {
+        if (ESLog.isLoggable(ESLog.DEBUG)) {
+          ESLog.d(TAG$7, '#-------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-->>>>>');
+          ESLog.d(TAG$7, '#-------onBroadcastReceive---disable-->>>>>');
         }
         return;
       }
@@ -2662,7 +2716,7 @@ var ESBroadcast = {
   },
 };
 
-const TAG$5 = "ESRouter";
+const TAG$6 = "ESRouter";
 
 /**
  * router按键管理
@@ -2692,12 +2746,12 @@ class ESRouterKeyManager {
         if (keyEvent && keyEvent.action === 0) {
           if (this.isFunction(componentInstance.onKeyDown)) {
             if (ESLog.isLoggable(ESLog.DEBUG)) {
-              ESLog.d(TAG$5, '#-------onKeyDown---success------>>>>>');
+              ESLog.d(TAG$6, '#-------onKeyDown---success------>>>>>');
             }
             componentInstance.onKeyDown(keyEvent);
           } else {
             if (ESLog.isLoggable(ESLog.DEBUG)) {
-              ESLog.d(TAG$5, '#-------onKeyDown---error------>>>>>');
+              ESLog.d(TAG$6, '#-------onKeyDown---error------>>>>>');
             }
           }
         }
@@ -2705,19 +2759,19 @@ class ESRouterKeyManager {
         else if (keyEvent && keyEvent.action === 1) {
           if (this.isFunction(componentInstance.onKeyUp)) {
             if (ESLog.isLoggable(ESLog.DEBUG)) {
-              ESLog.d(TAG$5, '#-------onKeyUp---success------>>>>>');
+              ESLog.d(TAG$6, '#-------onKeyUp---success------>>>>>');
             }
             componentInstance.onKeyUp(keyEvent);
           } else {
             if (ESLog.isLoggable(ESLog.DEBUG)) {
-              ESLog.d(TAG$5, '#-------onKeyUp---error------>>>>>');
+              ESLog.d(TAG$6, '#-------onKeyUp---error------>>>>>');
             }
           }
         }
       }
     } else {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$5, '#-------dispatchInstanceKeyEvent-----实例对象为空------>>>>>');
+        ESLog.d(TAG$6, '#-------dispatchInstanceKeyEvent-----实例对象为空------>>>>>');
       }
     }
   }
@@ -2732,17 +2786,17 @@ class ESRouterKeyManager {
     if (componentInstance) {
       if (this.isFunction(componentInstance.onBackPressed)) {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$5, '#-------onBackPressed---success------>>>>>');
+          ESLog.d(TAG$6, '#-------onBackPressed---success------>>>>>');
         }
         componentInstance.onBackPressed();
       } else {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
-          ESLog.d(TAG$5, '#-------onBackPressed---error------>>>>>');
+          ESLog.d(TAG$6, '#-------onBackPressed---error------>>>>>');
         }
       }
     } else {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$5, '#-------dispatchInstanceBackPressed-----实例对象为空------>>>>>');
+        ESLog.d(TAG$6, '#-------dispatchInstanceBackPressed-----实例对象为空------>>>>>');
       }
     }
   }
@@ -2767,7 +2821,7 @@ const ES_LIFECYCLE_ON_STOP = 7;
 const ES_LIFECYCLE_ON_SAVE_INSTANCE_SATE = 8;
 const ES_LIFECYCLE_ON_DESTROY = 9;
 
-const TAG$4 = "ESRouter";
+const TAG$5 = "ESRouter";
 
 /**
  * router生命周期管理
@@ -2845,7 +2899,7 @@ class ESRouterLifecycleManager {
       }
     } else {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$4, '#-------onESRouterLifecycleChanged-----实例对象为空------>>>>>');
+        ESLog.d(TAG$5, '#-------onESRouterLifecycleChanged-----实例对象为空------>>>>>');
       }
     }
   }
@@ -2862,7 +2916,7 @@ class ESRouterLifecycleManager {
       componentInstance.onESNewIntent(params);
     } else {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$4, '#-------onESRouterLifecycleNewIntent-----实例对象为空------>>>>>');
+        ESLog.d(TAG$5, '#-------onESRouterLifecycleNewIntent-----实例对象为空------>>>>>');
       }
     }
   }
@@ -2874,7 +2928,7 @@ class ESRouterLifecycleManager {
 
 var ESRouterLifecycleManager$1 = new ESRouterLifecycleManager();
 
-const TAG$3 = "ESRouter";
+const TAG$4 = "ESRouter";
 
 var ESRouter = {
 
@@ -2896,7 +2950,7 @@ var ESRouter = {
     //---------------------------返回键--------------------------------
     onESRouterBackPressed() {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$3, '#-------onESRouterBackPressed----->>>>>');
+        ESLog.d(TAG$4, '#-------onESRouterBackPressed----->>>>>');
       }
       let router = this.$router;
       if (router) {
@@ -2907,7 +2961,7 @@ var ESRouter = {
     //----------------------------按键-------------------------------
     onESRouterDispatchKeyEvent(keyEvent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$3, '#-------onESRouterDispatchKeyEvent----->>>>>' + keyEvent);
+        ESLog.d(TAG$4, '#-------onESRouterDispatchKeyEvent----->>>>>' + keyEvent);
       }
       let router = this.$router;
       if (router) {
@@ -2919,7 +2973,7 @@ var ESRouter = {
     //---------------------------生命周期--------------------------------
     onESRouterLifecycleChanged(event) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$3, '#-------onESRouterLifecycleChanged----->>>>>' + event);
+        ESLog.d(TAG$4, '#-------onESRouterLifecycleChanged----->>>>>' + event);
       }
       let router = this.$router;
       if (router) {
@@ -2931,7 +2985,7 @@ var ESRouter = {
     //---------------------------onNewIntent--------------------------------
     onESRouterLifecycleNewIntent(intent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d(TAG$3, '#-------onESRouterLifecycleNewIntent----->>>>>' + intent);
+        ESLog.d(TAG$4, '#-------onESRouterLifecycleNewIntent----->>>>>' + intent);
       }
       let router = this.$router;
       if (router) {
@@ -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);
     },
+    //--------------------------------------------
   },
 };
 
@@ -3288,13 +3342,24 @@ class ES {
 
 var ES$1 = new ES();
 
+const TAG$3 = "ESPlugin";
+
 var ESPlugin = {
   mounted() {
-    ESApp.$on('onESPluginStateChanged', this.onESPluginStateChanged);
+    this.onESEventPlugin();
   },
 
   methods: {
+    onESEventPlugin() {
+      ESApp.$on('onESPluginStateChanged', this.onESPluginStateChanged);
+    },
+    offESEventPlugin() {
+      ESApp.$off('onESPluginStateChanged', this.onESPluginStateChanged);
+    },
     onESPluginStateChanged(status) {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d(TAG$3, "--------onESPluginStateChanged------>>>>>" + JSON.stringify(status));
+      }
       if (status.success) {
         if (status.status === 1002) {
           this.onESPluginInstallProgress(status.pkg, status.status, status.current, status.total);
@@ -3316,7 +3381,7 @@ var ESPlugin = {
   },
 
   beforeDestroy() {
-    ESApp.$off('onESPluginStateChanged', this.onESPluginStateChanged);
+    this.offESEventPlugin();
   },
 };
 

package/package.json

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