@extscreen/es-core 1.1.2 → 1.1.5

package/dist/index.js

@@ -2750,8 +2750,26 @@ const AUDIO_USAGE_ASSISTANT = 16;
  */
 
 var ESBackPressMixin = {
+
   mounted() {
-    Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
+      ESApp.$on('hardwareBackPress', this.onESBackPressed);
+    }
+  },
+  beforeDestroy() {
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$off('hardwareBackPress', this.onESBackPressed);
+    }
+  },
+
+  methods: {
+    onESBackPressed() {
+      this.onBackPressed();
+    },
+    onBackPressed() {
+
+    },
   },
 };
 
@@ -2777,17 +2795,8 @@ 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()) {
@@ -2801,9 +2810,7 @@ var ESKeyEventMixin = {
         ESLog.d('ESRouter', '----ESKeyEventMixin---onDispatchKeyEvent----->>>>' + JSON.stringify(keyEvent));
       }
       if (keyEvent.action === KEY_ACTION_DOWN) {
-        if (keyEvent.keyCode === KEYCODE_BACK || keyEvent.keyCode === KEYCODE_ESCAPE) {
-          this.onBackPressed();
-        } else {
+        if (keyEvent.keyCode === KEYCODE_BACK || keyEvent.keyCode === KEYCODE_ESCAPE) ; else {
           this.onKeyDown(keyEvent);
         }
       }
@@ -2819,9 +2826,6 @@ var ESKeyEventMixin = {
     },
     onKeyUp(keyEvent) {
 
-    },
-    onBackPressed() {
-
     },
   },
 };
@@ -2832,18 +2836,9 @@ 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()) {
@@ -2855,7 +2850,7 @@ var ESLifecycleMixin = {
   methods: {
     onESLifecycleChanged(event) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d('ESRouter', '----ESLifecycleMixin---onESLifecycleChanged----->>>>' + event);
+        ESLog.d('ESRouter', '-------页面生命周期----->>>>' + this.$options.name + ":::::::" + event);
       }
       if (event === 'onCreate') {
         this.onESCreate();
@@ -2869,14 +2864,6 @@ var ESLifecycleMixin = {
         this.onESResume();
       }
       //
-      else if (event === 'visibleToUser') {
-        this.onESResume();
-      }
-      //
-      else if (event === 'invisibleToUser') {
-        this.onESPause();
-      }
-      //
       else if (event === 'onPause') {
         this.onESPause();
       }
@@ -2902,12 +2889,6 @@ var ESLifecycleMixin = {
     },
     onESResume() {
 
-    },
-    onESInvisibleToUser() {
-
-    },
-    onESVisibleToUser() {
-
     },
     onESPause() {
 

package/package.json

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