@extscreen/es-core 10000.0.1 → 10000.0.4

package/dist/index.js

@@ -1693,36 +1693,6 @@ class ESDisplayManager {
 
 var ESDisplayManager$1 = new ESDisplayManager();
 
-/**
- *
- */
-
-class ESLaunchManager {
-
-  _ESRouter = null;
-
-  init() {
-    return Promise.resolve();
-  }
-
-  setESRouter(ESRouter) {
-    this._ESRouter = ESRouter;
-  }
-
-  launchNativeIntent(paramsArray) {
-    ESModule$1.launchNativeApp(paramsArray);
-  }
-
-  launchESPageIntent(intent) {
-    //
-    ESModule$1.launchESPage({
-      args: intent
-    });
-  }
-}
-
-var ESLaunchManager$1 = new ESLaunchManager();
-
 /**
  *
  */
@@ -1783,6 +1753,77 @@ class ESManager {
 
 var ESManager$1 = new ESManager();
 
+/**
+ *
+ */
+
+class ESLaunchManager {
+
+  _ESRouter = null;
+  _ESRouterEnabled = true;
+
+  init() {
+    this._ESRouterEnabled = this.isESRouterSupported();
+    return Promise.resolve();
+  }
+
+  setESRouter(ESRouter) {
+    this._ESRouter = ESRouter;
+  }
+
+  setESRouterEnabled(enabled) {
+    this._ESRouterEnabled = enabled && this.isESRouterSupported();
+  }
+
+  isESRouterEnabled() {
+    return this._ESRouterEnabled && this.isESRouterSupported();
+  }
+
+  isESRouterSupported() {
+    return ESManager$1.getESSDKVersionCode() > 800;
+  }
+
+  launchNativeApp(paramsArray) {
+    ESModule$1.launchNativeApp(paramsArray);
+  }
+
+  launchNativePage(intent) {
+    ESModule$1.launchESPage({
+      args: intent
+    });
+  }
+
+  launchESPage(intent) {
+    //
+    if (this.isESRouterEnabled() && this._ESRouter
+      && this.isESRouterSupported()) {
+      this._ESRouter.push({
+        name: intent.url,
+        params: intent.params,
+      });
+    }
+    //
+    else {
+      this.launchNativePage(intent);
+    }
+  }
+
+  finishAllESPage() {
+    ESModule$1.finishAll();
+  }
+
+  finishESPage() {
+    if (this.isESRouterEnabled() && this._ESRouter
+      && this._ESRouter.back()) ;
+    //
+    else {
+      ESModule$1.finish();
+    }
+  }
+}
+
+var ESLaunchManager$1 = new ESLaunchManager();
+
 /**
  *
  */
@@ -2607,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');
-    }
   },
 };
 
@@ -2637,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);
       }
@@ -2669,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();
       }
@@ -2695,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.1",
+  "version": "10000.0.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {