@extscreen/es-core 10000.0.16 → 10000.0.19

package/dist/index.js

@@ -1763,41 +1763,37 @@ class ESLaunchManager {
 
   _ESRouter = null;
   _ESRouterEnabled = true;
-  _initTime = 0;
 
   init(router) {
-    this._ESRouter = router;
-    this._ESRouterEnabled = this.isESRouterSupported();
-    if (ESLog.isLoggable(ESLog.DEBUG)) {
-      ESLog.d('ESRouter', '#------init--------->>' + '\n' +
-        '_ESRouterEnabled: ' + this._ESRouterEnabled + '\n' +
-        '_ESRouter: ' + this._ESRouter
-      );
+    try {
+      this._ESRouter = router;
+      this._ESRouterEnabled = this.isESRouterSupported();
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '#------init--------->>' + '\n' +
+          '_ESRouterEnabled: ' + this._ESRouterEnabled + '\n' +
+          '_ESRouter: ' + this._ESRouter
+        );
+      }
+    } catch (e) {
+    }
+    //
+    try {
+      this._ESRouter.setEnabled(this._ESRouterEnabled);
+    } catch (e) {
     }
-    this._initTime = new Date().getTime();
     return Promise.resolve();
   }
 
   setESRouterEnabled(enabled) {
     this._ESRouterEnabled = enabled && this.isESRouterSupported();
-    if (ESLog.isLoggable(ESLog.DEBUG)) {
-      ESLog.d('ESRouter', '#--------setESRouterEnabled------->>' + '\n' +
-        'enabled: ' + enabled + '\n' +
-        '_ESRouterEnabled: ' + this._ESRouterEnabled
-      );
+    try {
+      this._ESRouter.setEnabled(this._ESRouterEnabled);
+    } catch (e) {
     }
   }
 
   isESRouterEnabled() {
-    let enabled = this._ESRouterEnabled && this.isESRouterSupported();
-    if (ESLog.isLoggable(ESLog.DEBUG)) {
-      ESLog.d('ESRouter', '#--------isESRouterEnabled------->>' + '\n' +
-        'enabled: ' + enabled + '\n' +
-        '_ESRouterEnabled: ' + this._ESRouterEnabled + '\n' +
-        'isESRouterSupported: ' + this.isESRouterSupported()
-      );
-    }
-    return enabled;
+    return this._ESRouterEnabled && this.isESRouterSupported();
   }
 
   isESRouterSupported() {
@@ -2757,8 +2753,17 @@ const KEYCODE_SEARCH = 84;
 var ESKeyEventMixin = {
   mounted() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '----ESKeyEventMixin---监听Activity----->>>>');
+      }
       ESApp.$on('DispatchKeyEvent', this.onDispatchKeyEvent);
     }
+    //
+    else {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '----ESKeyEventMixin---监听Fragment----->>>>');
+      }
+    }
   },
   beforeDestroy() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
@@ -2803,9 +2808,18 @@ var ESKeyEventMixin = {
 var ESLifecycleMixin = {
   mounted() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '----ESLifecycleMixin---监听Activity----->>>>');
+      }
       ESApp.$on('OnNewIntent', this.onESLifecycleNewIntent);
       ESApp.$on('LifecycleChange', this.onESLifecycleChanged);
     }
+    //
+    else {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '----ESLifecycleMixin---监听Fragment----->>>>');
+      }
+    }
   },
   beforeDestroy() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
@@ -2832,11 +2846,11 @@ var ESLifecycleMixin = {
       }
       //
       else if (event === 'visibleToUser') {
-        this.onESVisibleToUser();
+        this.onESResume();
       }
       //
       else if (event === 'invisibleToUser') {
-        this.onESInvisibleToUser();
+        this.onESPause();
       }
       //
       else if (event === 'onPause') {

package/package.json

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