@extscreen/es-core 2.2.0 → 2.2.2

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,7 +2065,9 @@ 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,
@@ -2082,7 +2088,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----->>>>>');
@@ -2397,10 +2405,10 @@ var ESPageLifecycle = {
   methods: {
     onESLifecycleChanged(event, params) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d('ESRouter', '#################页面生命周期#################' + '\n' +
-          '页面:' + this.$options.name + '\n' +
-          "生命周期:" + event + '\n' +
-          "参数:" + JSON.stringify(params)
+        ESLog.d('ESRouter', '####页面生命周期####' +
+          '###页面:' + this.$options.name +
+          "###生命周期:" + event +
+          "###参数:" + JSON.stringify(params)
         );
       }
       if (event === 'onCreate') {
@@ -2488,7 +2496,7 @@ const KEYCODE_SEARCH = 84;
  * 处理key事件
  */
 
-var ESKeyEventMixin = {
+var ESKeyEvent = {
   methods: {
     onDispatchKeyEvent(keyEvent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
@@ -2519,7 +2527,7 @@ var ESKeyEventMixin = {
  * 处理back key事件
  */
 
-var ESBackPressMixin = {
+var ESBackPress = {
   methods: {
     onESBackPressed() {
       this.onBackPressed();
@@ -2534,7 +2542,7 @@ var ESBackPressMixin = {
  *
  */
 var ESPage = {
-  mixins: [ESPageLifecycle, ESKeyEventMixin, ESBackPressMixin],
+  mixins: [ESPageLifecycle, ESKeyEvent, ESBackPress],
   methods: {
     onESCreate(params) {
 
@@ -3600,13 +3608,12 @@ const AUDIO_USAGE_ASSISTANT = 16;
  * 处理back key事件
  */
 
-var ESBackPress = {
+var ESBackPressMixin = {
   methods: {
     onESBackPressed() {
       this.onBackPressed();
     },
     onBackPressed() {
-      ESLaunchManager$1.finishESPage();
     },
   },
 };
@@ -3615,7 +3622,7 @@ var ESBackPress = {
  * 处理key事件
  */
 
-var ESKeyEvent = {
+var ESKeyEventMixin = {
   methods: {
     onDispatchKeyEvent(keyEvent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {

package/package.json

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