@extscreen/es-core 10000.0.3 → 10000.0.4

package/dist/index.js

@@ -1776,20 +1776,27 @@ class ESLaunchManager {
   }
 
   isESRouterEnabled() {
-    return this._ESRouterEnabled;
+    return this._ESRouterEnabled && this.isESRouterSupported();
   }
 
   isESRouterSupported() {
     return ESManager$1.getESSDKVersionCode() > 800;
   }
 
-  launchNativePage(paramsArray) {
+  launchNativeApp(paramsArray) {
     ESModule$1.launchNativeApp(paramsArray);
   }
 
+  launchNativePage(intent) {
+    ESModule$1.launchESPage({
+      args: intent
+    });
+  }
+
   launchESPage(intent) {
     //
-    if (this.isESRouterEnabled() && this._ESRouter) {
+    if (this.isESRouterEnabled() && this._ESRouter
+      && this.isESRouterSupported()) {
       this._ESRouter.push({
         name: intent.url,
         params: intent.params,
@@ -1797,9 +1804,7 @@ class ESLaunchManager {
     }
     //
     else {
-      ESModule$1.launchESPage({
-        args: intent
-      });
+      this.launchNativePage(intent);
     }
   }
 
@@ -2643,22 +2648,23 @@ var ESBackPressMixin = {
 
   mounted() {
     Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
-    ESApp.$on('hardwareBackPress', this.onAndroidBackPressed);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$on('hardwareBackPress', this.onESBackPressed);
+    }
   },
   beforeDestroy() {
-    ESApp.$off('hardwareBackPress', this.onAndroidBackPressed);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$off('hardwareBackPress', this.onESBackPressed);
+    }
   },
 
   methods: {
-    onAndroidBackPressed() {
+    onESBackPressed() {
       this.onBackPressed();
     },
     onBackPressed() {
 
     },
-    invokeAndroidBackPress() {
-      Vue.Native.callNative('DeviceEventModule', 'invokeDefaultBackPressHandler');
-    }
   },
 };
 
@@ -2673,14 +2679,18 @@ const KEY_ACTION_UP = 1;
 var ESKeyEventMixin = {
 
   mounted() {
-    ESApp.$on('DispatchKeyEvent', this.onAndroidKeyEvent);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$on('DispatchKeyEvent', this.onDispatchKeyEvent);
+    }
   },
   beforeDestroy() {
-    ESApp.$off('DispatchKeyEvent', this.onAndroidKeyEvent);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$off('DispatchKeyEvent', this.onDispatchKeyEvent);
+    }
   },
 
   methods: {
-    onAndroidKeyEvent(keyEvent) {
+    onDispatchKeyEvent(keyEvent) {
       if (keyEvent.action === KEY_ACTION_DOWN) {
         this.onKeyDown(keyEvent);
       }
@@ -2705,16 +2715,20 @@ var ESKeyEventMixin = {
  */
 var ESLifecycleMixin = {
   mounted() {
-    ESApp.$on('OnNewIntent', this.onActivityNewIntent);
-    ESApp.$on('LifecycleChange', this.onActivityLifecycle);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$on('OnNewIntent', this.onESLifecycleNewIntent);
+      ESApp.$on('LifecycleChange', this.onESLifecycleChanged);
+    }
   },
   beforeDestroy() {
-    ESApp.$off('OnNewIntent', this.onActivityNewIntent);
-    ESApp.$off('LifecycleChange', this.onActivityLifecycle);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$off('OnNewIntent', this.onESLifecycleNewIntent);
+      ESApp.$off('LifecycleChange', this.onESLifecycleChanged);
+    }
   },
 
   methods: {
-    onActivityLifecycle(event) {
+    onESLifecycleChanged(event) {
       if (event === 'onResume') {
         this.onESResume();
       }
@@ -2731,7 +2745,7 @@ var ESLifecycleMixin = {
         this.onESDestroy();
       }
     },
-    onActivityNewIntent(intent) {
+    onESLifecycleNewIntent(intent) {
       this.onESNewIntent(intent);
     },
 

package/package.json

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