@extscreen/es-core 2.3.17 → 2.3.19

package/dist/index.js

@@ -1455,6 +1455,151 @@ class ESFileModule {
 
 var ESFileModule$1 = new ESFileModule();
 
+const ES_SDK_VERSION_20 = -1;
+const ES_SDK_VERSION_21 = 2.1;
+const ES_SDK_VERSION_22 = 2.2;
+const ES_SDK_VERSION_22_1 = 2.21;
+const ES_SDK_VERSION_23 = 2.3;
+const ES_SDK_VERSION_24 = 2.4;
+const ES_SDK_VERSION_25 = 2.5;
+const ES_SDK_VERSION_26 = 2.6;
+const ES_SDK_VERSION_27 = 2.7;
+const ES_SDK_VERSION_28 = 2.8;
+const ES_SDK_VERSION_29 = 2.9;
+const ES_SDK_VERSION_30 = 3.0;
+
+/**
+ *
+ */
+
+class ESManager {
+
+  _esSdkCid = null;
+  _esSdkVersionCode = null;
+  _esSdkVersionName = null;
+  _esSdkPackageName = null;
+  _esMiniProgramPath = null;
+  _esKitVersionCode = -1;
+  _esSdkSchemes = [];
+  _runtimePath = null;
+
+  _esSdkInfo = null;
+
+
+  init() {
+    return Promise.resolve()
+      .then(() => this.initESInfoPromise())
+  }
+
+  initESInfoPromise() {
+    return ESModule$1.getESSDKInfo()
+      .then((result) => {
+          this._esSdkInfo = result;
+          if (result) {
+            this._esSdkVersionCode = result.versionCode;
+            this._esSdkVersionName = result.versionName;
+            this._esSdkPackageName = result.packageName;
+            this._esMiniProgramPath = result.miniProgramPath;
+            this._esSdkSchemes = result.schemes;
+            if (result.eskit_ver_code) {
+              this._esKitVersionCode = result.eskit_ver_code;
+            }
+            //
+            this._runtimePath = result.runtimePath;
+          }
+          return ESModule$1.getESDeviceInfo();
+        }
+      )
+      //获取cid
+      .then((result) => {
+          if (result) {
+            this._esSdkCid = result.cid;
+          }
+          return Promise.resolve();
+        }
+      );
+  }
+
+  getESSDKInfo() {
+    return this._esSdkInfo;
+  }
+
+  getESSDKCid() {
+    return this._esSdkCid;
+  }
+
+  getESSDKVersionCode() {
+    return this._esKitVersionCode;
+  }
+
+  getESSDKVersionName() {
+    return this._esSdkVersionName;
+  }
+
+  getESPackageName() {
+    return this._esSdkPackageName;
+  }
+
+  getESVersionCode() {
+    return this._esSdkVersionCode;
+  }
+
+  getESVersionName() {
+    return this._esSdkVersionName;
+  }
+
+  /**
+   * 获取EsApp路径, 用于文件存储管理
+   * @return
+   * /data/data/APK包名/app_rpk/apps/小程序包名/files
+   * 示例:/data/data/com.extscreen.runtime/app_rpk/apps/es.com.baduanjin.tv/files
+   */
+  getESMiniProgramPath() {
+    return this._esMiniProgramPath;
+  }
+
+  /**
+   * 获取EsApp路径, 用于文件存储管理
+   * @return
+   * /data/data/APK包名/app_rpk/apps/小程序包名/files
+   * 示例:/data/data/com.extscreen.runtime/app_rpk/apps/es.com.baduanjin.tv/files
+   */
+  getESAppPath() {
+    return this._esMiniProgramPath;
+  }
+
+  /**
+   * 获取EsApp运行时路径, 通常用于获取代码包里的assets
+   * @return
+   * /data/data/APK包名/app_rpk/apps/小程序包名/版本号/android
+   * 示例:/data/data/com.extscreen.runtime/app_rpk/apps/es.com.baduanjin.tv/2.2.2203/android
+   */
+  getESAppRuntimePath() {
+    if (this.getESSDKVersionCode() > ES_SDK_VERSION_22) {
+      return this._runtimePath;
+    }
+    //
+    else {
+      return this._esMiniProgramPath;
+    }
+  }
+
+  getESSDKSupportSchemes() {
+    return this._esSdkSchemes;
+  }
+
+  //----------------------------组件和模块注册相关--------------------------------------------
+  isModuleRegistered(className) {
+    return ESModule$1.isModuleRegistered(className);
+  }
+
+  isComponentRegistered(className) {
+    return ESModule$1.isComponentRegistered(className);
+  }
+}
+
+var ESManager$1 = new ESManager();
+
 /**
  *
  */
@@ -1476,11 +1621,19 @@ class ESFile {
   }
 
   newESFile(pathname) {
-    return ESFileModule$1.newESFile(pathname)
-      .then((fileId) => {
-        this._fileId = fileId;
-        return Promise.resolve(fileId);
-      });
+    if (ESManager$1.getESSDKVersionCode() < ES_SDK_VERSION_22) {
+      return ESFileModule$1.newFile(pathname)
+        .then((fileId) => {
+          this._fileId = fileId;
+          return Promise.resolve(fileId);
+        });
+    } else {
+      return ESFileModule$1.newESFile(pathname)
+        .then((fileId) => {
+          this._fileId = fileId;
+          return Promise.resolve(fileId);
+        });
+    }
   }
 
   getFileId() {
@@ -1802,151 +1955,6 @@ class ESSharedPreferencesModule {
 
 var ESSharedPreferencesModule$1 = new ESSharedPreferencesModule();
 
-const ES_SDK_VERSION_20 = -1;
-const ES_SDK_VERSION_21 = 2.1;
-const ES_SDK_VERSION_22 = 2.2;
-const ES_SDK_VERSION_22_1 = 2.21;
-const ES_SDK_VERSION_23 = 2.3;
-const ES_SDK_VERSION_24 = 2.4;
-const ES_SDK_VERSION_25 = 2.5;
-const ES_SDK_VERSION_26 = 2.6;
-const ES_SDK_VERSION_27 = 2.7;
-const ES_SDK_VERSION_28 = 2.8;
-const ES_SDK_VERSION_29 = 2.9;
-const ES_SDK_VERSION_30 = 3.0;
-
-/**
- *
- */
-
-class ESManager {
-
-  _esSdkCid = null;
-  _esSdkVersionCode = null;
-  _esSdkVersionName = null;
-  _esSdkPackageName = null;
-  _esMiniProgramPath = null;
-  _esKitVersionCode = -1;
-  _esSdkSchemes = [];
-  _runtimePath = null;
-
-  _esSdkInfo = null;
-
-
-  init() {
-    return Promise.resolve()
-      .then(() => this.initESInfoPromise())
-  }
-
-  initESInfoPromise() {
-    return ESModule$1.getESSDKInfo()
-      .then((result) => {
-          this._esSdkInfo = result;
-          if (result) {
-            this._esSdkVersionCode = result.versionCode;
-            this._esSdkVersionName = result.versionName;
-            this._esSdkPackageName = result.packageName;
-            this._esMiniProgramPath = result.miniProgramPath;
-            this._esSdkSchemes = result.schemes;
-            if (result.eskit_ver_code) {
-              this._esKitVersionCode = result.eskit_ver_code;
-            }
-            //
-            this._runtimePath = result.runtimePath;
-          }
-          return ESModule$1.getESDeviceInfo();
-        }
-      )
-      //获取cid
-      .then((result) => {
-          if (result) {
-            this._esSdkCid = result.cid;
-          }
-          return Promise.resolve();
-        }
-      );
-  }
-
-  getESSDKInfo() {
-    return this._esSdkInfo;
-  }
-
-  getESSDKCid() {
-    return this._esSdkCid;
-  }
-
-  getESSDKVersionCode() {
-    return this._esKitVersionCode;
-  }
-
-  getESSDKVersionName() {
-    return this._esSdkVersionName;
-  }
-
-  getESPackageName() {
-    return this._esSdkPackageName;
-  }
-
-  getESVersionCode() {
-    return this._esSdkVersionCode;
-  }
-
-  getESVersionName() {
-    return this._esSdkVersionName;
-  }
-
-  /**
-   * 获取EsApp路径, 用于文件存储管理
-   * @return
-   * /data/data/APK包名/app_rpk/apps/小程序包名/files
-   * 示例:/data/data/com.extscreen.runtime/app_rpk/apps/es.com.baduanjin.tv/files
-   */
-  getESMiniProgramPath() {
-    return this._esMiniProgramPath;
-  }
-
-  /**
-   * 获取EsApp路径, 用于文件存储管理
-   * @return
-   * /data/data/APK包名/app_rpk/apps/小程序包名/files
-   * 示例:/data/data/com.extscreen.runtime/app_rpk/apps/es.com.baduanjin.tv/files
-   */
-  getESAppPath() {
-    return this._esMiniProgramPath;
-  }
-
-  /**
-   * 获取EsApp运行时路径, 通常用于获取代码包里的assets
-   * @return
-   * /data/data/APK包名/app_rpk/apps/小程序包名/版本号/android
-   * 示例:/data/data/com.extscreen.runtime/app_rpk/apps/es.com.baduanjin.tv/2.2.2203/android
-   */
-  getESAppRuntimePath() {
-    if (this.getESSDKVersionCode() > ES_SDK_VERSION_22) {
-      return this._runtimePath;
-    }
-    //
-    else {
-      return this._esMiniProgramPath;
-    }
-  }
-
-  getESSDKSupportSchemes() {
-    return this._esSdkSchemes;
-  }
-
-  //----------------------------组件和模块注册相关--------------------------------------------
-  isModuleRegistered(className) {
-    return ESModule$1.isModuleRegistered(className);
-  }
-
-  isComponentRegistered(className) {
-    return ESModule$1.isComponentRegistered(className);
-  }
-}
-
-var ESManager$1 = new ESManager();
-
 /**
  *
  */
@@ -3264,11 +3272,11 @@ class ESRouterLifecycleManager {
    * @param route
    * @param params
    */
-  onESRouterLifecycleNewIntent(route, params) {
+  onESRouterLifecycleNewIntent(route, params, intent) {
     let componentInstance = this.getComponentInstance(route);
     let lifecycleChanged = this.isFunction(componentInstance.onESNewIntent);
     if (componentInstance && lifecycleChanged) {
-      componentInstance.onESNewIntent(params);
+      componentInstance.onESNewIntent(params, intent);
     } else {
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d(TAG$5, '#-------onESRouterLifecycleNewIntent-----实例对象为空------>>>>>');
@@ -3349,7 +3357,7 @@ var ESRouter = {
       if (router && router.history && router.history.stack
         && router.history.stack.length > 0) {
         let route = router.currentRoute;
-        ESRouterLifecycleManager$1.onESRouterLifecycleNewIntent(route, intent.params);
+        ESRouterLifecycleManager$1.onESRouterLifecycleNewIntent(route, intent.params, intent);
       }
     }
   },
@@ -3430,7 +3438,7 @@ var ESPageLifecycle = {
     onESDestroy() {
 
     },
-    onESNewIntent(intent) {
+    onESNewIntent(params, intent) {
 
     },
     onESSaveInstanceState(savedInstanceState) {

package/package.json

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