@extscreen/es-core 10000.0.10 → 10000.0.13

package/dist/index.js

@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { ESLog } from '@extscreen/es-log';
 
 /**
  *
@@ -2548,11 +2549,9 @@ function ESPageRootViewComponent() {
   Vue.component('page', {
     methods: {
       onLifecycleChanged(evt) {
-        console.log('ESRouter', "--------onLifecycleChanged------>>>>>" + evt);
         this.$emit("onLifecycleChanged", evt);
       },
       onDispatchKeyEvent(evt) {
-        console.log('ESRouter', "--------onDispatchKeyEvent------>>>>>" + evt);
         this.$emit("onDispatchKeyEvent", evt);
       },
     },
@@ -2708,26 +2707,8 @@ const AUDIO_USAGE_ASSISTANT = 16;
  */
 
 var ESBackPressMixin = {
-
   mounted() {
     Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$on('hardwareBackPress', this.onESBackPressed);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('hardwareBackPress', this.onESBackPressed);
-    }
-  },
-
-  methods: {
-    onESBackPressed() {
-      this.onBackPressed();
-    },
-    onBackPressed() {
-
-    },
   },
 };
 
@@ -2735,12 +2716,22 @@ var ESBackPressMixin = {
 const KEY_ACTION_DOWN = 0;
 const KEY_ACTION_UP = 1;
 
+const KEYCODE_ENTER = 66;
+const KEYCODE_DPAD_CENTER = 23;
+const KEYCODE_DPAD_UP = 19;
+const KEYCODE_DPAD_DOWN = 20;
+const KEYCODE_DPAD_LEFT = 21;
+const KEYCODE_DPAD_RIGHT = 22;
+const KEYCODE_BACK = 4;
+const KEYCODE_ESCAPE = 111;
+const KEYCODE_MENU = 82;
+const KEYCODE_SEARCH = 84;
+
 /**
  * 处理key事件
  */
 
 var ESKeyEventMixin = {
-
   mounted() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
       ESApp.$on('DispatchKeyEvent', this.onDispatchKeyEvent);
@@ -2754,21 +2745,31 @@ var ESKeyEventMixin = {
 
   methods: {
     onDispatchKeyEvent(keyEvent) {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '----ESKeyEventMixin---onDispatchKeyEvent----->>>>' + JSON.stringify(keyEvent));
+      }
       if (keyEvent.action === KEY_ACTION_DOWN) {
-        this.onKeyDown(keyEvent);
+        if (keyEvent.keyCode === KEYCODE_BACK || keyEvent.keyCode === KEYCODE_ESCAPE) {
+          this.onBackPressed();
+        } else {
+          this.onKeyDown(keyEvent);
+        }
       }
       //
       else if (keyEvent.action === KEY_ACTION_UP) {
-        this.onKeyUp(keyEvent);
+        if (keyEvent.keyCode === KEYCODE_BACK || keyEvent.keyCode === KEYCODE_ESCAPE) ; else {
+          this.onKeyUp(keyEvent);
+        }
       }
     },
-    //页面复写即可
     onKeyDown(keyEvent) {
 
     },
-    //页面复写即可
     onKeyUp(keyEvent) {
 
+    },
+    onBackPressed() {
+
     },
   },
 };
@@ -2792,10 +2793,29 @@ var ESLifecycleMixin = {
 
   methods: {
     onESLifecycleChanged(event) {
-      if (event === 'onResume') {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '----ESLifecycleMixin---onESLifecycleChanged----->>>>' + event);
+      }
+      if (event === 'onCreate') {
+        this.onESCreate();
+      }
+      //
+      else if (event === 'onStart') {
+        this.onESStart();
+      }
+      //
+      else if (event === 'onResume') {
         this.onESResume();
       }
       //
+      else if (event === 'visibleToUser') {
+        this.onESVisibleToUser();
+      }
+      //
+      else if (event === 'invisibleToUser') {
+        this.onESInvisibleToUser();
+      }
+      //
       else if (event === 'onPause') {
         this.onESPause();
       }
@@ -2813,8 +2833,20 @@ var ESLifecycleMixin = {
     },
 
     //------------------------------------
+    onESCreate() {
+
+    },
+    onESStart() {
+
+    },
     onESResume() {
 
+    },
+    onESInvisibleToUser() {
+
+    },
+    onESVisibleToUser() {
+
     },
     onESPause() {
 
@@ -2831,17 +2863,6 @@ var ESLifecycleMixin = {
   },
 };
 
-const KEYCODE_ENTER = 66;
-const KEYCODE_DPAD_CENTER = 23;
-const KEYCODE_DPAD_UP = 19;
-const KEYCODE_DPAD_DOWN = 20;
-const KEYCODE_DPAD_LEFT = 21;
-const KEYCODE_DPAD_RIGHT = 22;
-const KEYCODE_BACK = 4;
-const KEYCODE_ESCAPE = 111;
-const KEYCODE_MENU = 82;
-const KEYCODE_SEARCH = 84;
-
 //
 const ES_ACCELERATE_DECELERATE_INTERPOLATOR = 1;
 const ES_ACCELERATE_INTERPOLATOR = 2;

package/package.json

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