@extscreen/es-core 2.2.1 → 2.2.3

package/dist/index.js

@@ -1995,32 +1995,32 @@ class ESLaunchManager {
 
   _ESRouter = null;
   _ESRouterEnabled = true;
-  _ESPageRouterViewEnabled = false;
+  _ESPageRouterViewSupported = false;
   _launchLimit = 10;
 
   init(router) {
     try {
       this._ESRouter = router;
-      this._ESPageRouterViewEnabled = this.isESPageRouterViewSupported();
+      this._ESPageRouterViewSupported = this.isESPageRouterViewSupported();
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d('ESRouter', '#------init--------->>' + '\n' +
-          '_ESPageRouterViewEnabled: ' + this._ESPageRouterViewEnabled + '\n' +
+          '_ESPageRouterViewSupported: ' + this._ESPageRouterViewSupported + '\n' +
           '_ESRouter: ' + this._ESRouter
         );
       }
     } catch (e) {
     }
     //
-    this._setESPageRouterViewSupported(this._ESPageRouterViewEnabled);
+    this._setESPageRouterViewSupported(this._ESPageRouterViewSupported);
     return Promise.resolve();
   }
 
   //----------------------ESPageRouterView--------------------------
   _setESPageRouterViewSupported(enabled) {
-    this._ESPageRouterViewEnabled = enabled;
+    this._ESPageRouterViewSupported = enabled;
     try {
       if (this._ESRouter) {
-        this._ESRouter.setESPageRouterViewSupported(this._ESPageRouterViewEnabled);
+        this._ESRouter.setESPageRouterViewSupported(enabled);
       }
     } catch (e) {
     }
@@ -2030,6 +2030,10 @@ class ESLaunchManager {
     return ESManager$1.getESSDKVersionCode() >= ES_SDK_VERSION_21;
   }
 
+  isESRouterSupported() {
+    return this.isESPageRouterViewSupported();
+  }
+
   //---------------------------------------------------------
 
   isESRouterEnabled() {
@@ -2061,14 +2065,41 @@ class ESLaunchManager {
   }
 
   launchESPage(intent) {
-    if (this.isESRouterEnabled() && this._ESRouter) {
+    if (this.isESRouterEnabled()
+      && this.isESRouterSupported()
+      && this._ESRouter) {
+      this._ESRouter.push({
+        name: intent.url,
+        params: intent.params,
+      });
+    }
+    //
+    else {
+      this.launchNativePage(intent);
+    }
+  }
+
+  launchAfterFinishESPage(intent) {
+    if (this.isESRouterEnabled()
+      && this.isESRouterSupported()
+      && this._ESRouter) {
+      this._ESRouter.back();
       this._ESRouter.push({
         name: intent.url,
         params: intent.params,
       });
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '#----launchAfterFinishESPage--vue--back&&push----->>>>>');
+      }
     }
     //
     else {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d('ESRouter', '#----launchAfterFinishESPage--native--finish&&launch----->>>>>');
+      }
+      //1.finish
+      ESModule$1.finish();
+      //2.launch
       this.launchNativePage(intent);
     }
   }
@@ -2082,7 +2113,9 @@ class ESLaunchManager {
   }
 
   finishESPage() {
-    if (this.isESRouterEnabled() && this._ESRouter
+    if (this.isESRouterEnabled()
+      && this.isESRouterSupported()
+      && this._ESRouter
       && this._ESRouter.back()) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d('ESRouter', '#----finishESPage---ESRouter.back----->>>>>');
@@ -2525,6 +2558,7 @@ var ESBackPress = {
       this.onBackPressed();
     },
     onBackPressed() {
+      ESLaunchManager$1.finishESPage();
     },
   },
 };
@@ -2566,6 +2600,7 @@ var ESPage = {
 
     },
     onBackPressed() {
+      ESLaunchManager$1.finishESPage();
     },
     onESSaveInstanceState(savedInstanceState) {
 

package/package.json

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