@extscreen/es-core 1.1.27 → 1.1.29

package/dist/index.js

@@ -1701,45 +1701,46 @@ var ESDisplayManager$1 = new ESDisplayManager();
 class ESManager {
 
   _esSdkVersionCode = null;
+  _esSdkVersionName = null;
   _esSdkPackageName = null;
   _esMiniProgramPath = null;
+  _esKitVersionCode = -1;
+
+  _esSdkInfo = null;
+
 
   init() {
     return Promise.resolve()
-      .then(() => this.initESSdkVersionCodePromise())
-      .then(() => this.initESPackageNamePromise())
-      .then(() => this.initESMiniProgramPathPromise())
+      .then(() => this.initESInfoPromise())
   }
 
-
-  initESSdkVersionCodePromise() {
-    return ESModule$1.getESSDKVersionCode()
+  initESInfoPromise() {
+    return ESModule$1.getESSDKInfo()
       .then((result) => {
-          this._esSdkVersionCode = result;
+          this._esSdkInfo = result;
+          if (result) {
+            this._esSdkVersionCode = result.versionCode;
+            this._esSdkVersionName = result.versionName;
+            this._esSdkPackageName = result.packageName;
+            this._esMiniProgramPath = result.miniProgramPath;
+            if (result.eskit_ver_code) {
+              this._esKitVersionCode = result.eskit_ver_code;
+            }
+          }
           return Promise.resolve();
         }
       );
   }
 
-  initESPackageNamePromise() {
-    return ESModule$1.getESPackageName()
-      .then((result) => {
-          this._esSdkPackageName = result;
-          return Promise.resolve();
-        }
-      );
+  getESSDKInfo() {
+    return this._esSdkInfo;
   }
 
-  initESMiniProgramPathPromise() {
-    return ESModule$1.getESMiniProgramPath()
-      .then((result) => {
-          this._esMiniProgramPath = result;
-          return Promise.resolve();
-        }
-      );
+  getESSDKVersionCode() {
+    return this._esKitVersionCode;
   }
 
-  getESSDKVersionCode() {
+  getESVersionCode() {
     return this._esSdkVersionCode;
   }
 
@@ -1754,6 +1755,8 @@ class ESManager {
 
 var ESManager$1 = new ESManager();
 
+const ES_SDK_VERSION_21 = 2.1;
+
 /**
  *
  */
@@ -1763,42 +1766,49 @@ class ESLaunchManager {
 
   _ESRouter = null;
   _ESRouterEnabled = true;
+  _ESPageRouterViewEnabled = false;
   _launchLimit = 10;
 
   init(router) {
     try {
       this._ESRouter = router;
-      this._ESRouterEnabled = this.isESRouterSupported();
+      this._ESPageRouterViewEnabled = this.isESPageRouterViewSupported();
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d('ESRouter', '#------init--------->>' + '\n' +
-          '_ESRouterEnabled: ' + this._ESRouterEnabled + '\n' +
+          '_ESPageRouterViewEnabled: ' + this._ESPageRouterViewEnabled + '\n' +
           '_ESRouter: ' + this._ESRouter
         );
       }
     } catch (e) {
     }
     //
-    try {
-      this._ESRouter.setEnabled(this._ESRouterEnabled);
-    } catch (e) {
-    }
+    this._setESPageRouterViewSupported(this._ESPageRouterViewEnabled);
     return Promise.resolve();
   }
 
-  setESRouterEnabled(enabled) {
-    this._ESRouterEnabled = enabled && this.isESRouterSupported();
+  //----------------------ESPageRouterView--------------------------
+  _setESPageRouterViewSupported(enabled) {
+    this._ESPageRouterViewEnabled = enabled;
     try {
-      this._ESRouter.setEnabled(this._ESRouterEnabled);
+      if (this._ESRouter) {
+        this._ESRouter.setESPageRouterViewSupported(this._ESPageRouterViewEnabled);
+      }
     } catch (e) {
     }
   }
 
+  isESPageRouterViewSupported() {
+    return ESManager$1.getESSDKVersionCode() >= ES_SDK_VERSION_21;
+  }
+
+  //---------------------------------------------------------
+
   isESRouterEnabled() {
-    return this._ESRouterEnabled && this.isESRouterSupported();
+    return this._ESRouterEnabled;
   }
 
-  isESRouterSupported() {
-    return ESManager$1.getESSDKVersionCode() > 800;
+  setESRouterEnabled(enabled) {
+    this._ESRouterEnabled = enabled;
   }
 
   setLaunchLimit(limit) {
@@ -1822,9 +1832,7 @@ class ESLaunchManager {
   }
 
   launchESPage(intent) {
-    //
-    if (this.isESRouterEnabled() && this._ESRouter
-      && this.isESRouterSupported()) {
+    if (this.isESRouterEnabled() && this._ESRouter) {
       this._ESRouter.push({
         name: intent.url,
         params: intent.params,
@@ -2082,9 +2090,6 @@ var ESRouter = {
   methods: {
     //---------------------------返回键--------------------------------
     onESRouterBackPressed() {
-      if (!ESLaunchManager$1.isESRouterEnabled()) {
-        return
-      }
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d(TAG, '#-------onESRouterBackPressed----->>>>>');
       }
@@ -2096,9 +2101,6 @@ var ESRouter = {
     },
     //----------------------------按键-------------------------------
     onESRouterDispatchKeyEvent(keyEvent) {
-      if (!ESLaunchManager$1.isESRouterEnabled()) {
-        return
-      }
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d(TAG, '#-------onESRouterDispatchKeyEvent----->>>>>' + keyEvent);
       }
@@ -2111,9 +2113,6 @@ var ESRouter = {
 
     //---------------------------生命周期--------------------------------
     onESRouterLifecycleChanged(event) {
-      if (!ESLaunchManager$1.isESRouterEnabled()) {
-        return
-      }
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d(TAG, '#-------onESRouterLifecycleChanged----->>>>>' + event);
       }
@@ -2130,19 +2129,6 @@ var ESRouter = {
  *
  */
 var ESPageLifecycle = {
-  mounted() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$on('OnNewIntent', this.onESLifecycleNewIntent);
-      ESApp.$on('LifecycleChange', this.onESLifecycleChanged);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('OnNewIntent', this.onESLifecycleNewIntent);
-      ESApp.$off('LifecycleChange', this.onESLifecycleChanged);
-    }
-  },
-
   methods: {
     onESLifecycleChanged(event, params) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
@@ -2238,17 +2224,6 @@ const KEYCODE_SEARCH = 84;
  */
 
 var ESKeyEventMixin = {
-  mounted() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$on('DispatchKeyEvent', this.onDispatchKeyEvent);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('DispatchKeyEvent', this.onDispatchKeyEvent);
-    }
-  },
-
   methods: {
     onDispatchKeyEvent(keyEvent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
@@ -2280,19 +2255,6 @@ var ESKeyEventMixin = {
  */
 
 var ESBackPressMixin = {
-
-  mounted() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
-      ESApp.$on('hardwareBackPress', this.onESBackPressed);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('hardwareBackPress', this.onESBackPressed);
-    }
-  },
-
   methods: {
     onESBackPressed() {
       this.onBackPressed();
@@ -3361,19 +3323,6 @@ const AUDIO_USAGE_ASSISTANT = 16;
  */
 
 var ESBackPress = {
-
-  mounted() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
-      ESApp.$on('hardwareBackPress', this.onESBackPressed);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('hardwareBackPress', this.onESBackPressed);
-    }
-  },
-
   methods: {
     onESBackPressed() {
       this.onBackPressed();
@@ -3389,17 +3338,6 @@ var ESBackPress = {
  */
 
 var ESKeyEvent = {
-  mounted() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$on('DispatchKeyEvent', this.onDispatchKeyEvent);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('DispatchKeyEvent', this.onDispatchKeyEvent);
-    }
-  },
-
   methods: {
     onDispatchKeyEvent(keyEvent) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
@@ -3430,19 +3368,6 @@ var ESKeyEvent = {
  *
  */
 var ESLifecycleMixin = {
-  mounted() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$on('OnNewIntent', this.onESLifecycleNewIntent);
-      ESApp.$on('LifecycleChange', this.onESLifecycleChanged);
-    }
-  },
-  beforeDestroy() {
-    if (!ESLaunchManager$1.isESRouterEnabled()) {
-      ESApp.$off('OnNewIntent', this.onESLifecycleNewIntent);
-      ESApp.$off('LifecycleChange', this.onESLifecycleChanged);
-    }
-  },
-
   methods: {
     onESLifecycleChanged(event, params) {
       if (ESLog.isLoggable(ESLog.DEBUG)) {

package/package.json

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