@extscreen/es-core 2.2.28 → 2.2.30

package/dist/index.js

@@ -116,23 +116,23 @@ var ESDevelopManager$1 = new ESDevelopManager();
  */
 class ESDeviceModule {
 
-  getAndroidDevice() {
+  getDevice() {
     return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getAndroidDevice');
   }
 
-  getWifiMac() {
-    return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getWifiMac');
+  getDeviceEthMac() {
+    return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getEthMac');
   }
 
-  getEthMac() {
-    return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getEthMac');
+  getDeviceWifiMac() {
+    return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getWifiMac');
   }
 
-  getTotalMemory() {
+  getDeviceTotalMemory() {
     return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getTotalMemory');
   }
 
-  getAvailableMemory() {
+  getDeviceAvailMemory() {
     return Vue.Native.callNativeWithPromise('AndroidDeviceModule', 'getAvailableMemory');
   }
 
@@ -198,29 +198,6 @@ var ESDeviceModule$1 = new ESDeviceModule();
 /**
  * 设备信息管理
  *
- * {
-	"screenWidth": 1920,
-	"clientType": "MiBOX4",
-	"buildBoard": "transformers",
-	"scaledDensity": "1.0",
-	"mac": null,
-	"uuid": null,
-	"buildVersionRelease": "6.0.1",
-	"buildManufacturer": "Xiaomi",
-	"windowWidth": 0,
-	"density": "1.0",
-	"buildDevice": "transformers",
-	"availableMemory": 0,
-	"buildHardware": "amlogic",
-	"screenHeight": 1080,
-	"buildModel": "MiBOX4",
-	"buildBrand": null,
-	"densityDpi": "160.0",
-	"resolution": "1920*1080",
-	"totalMemory": 0,
-	"buildProduct": "transformers"
-}
-
  */
 class ESDeviceManager {
 
@@ -254,23 +231,37 @@ class ESDeviceManager {
   _buildDevice = '';
   _buildProduct = '';
   _buildHardware = '';
-  _buildSDKVersion = 1;
+
+  _buildBoard = '';
+  _buildTags = '';
+  _buildId = '';
+  _buildTime = '';
+  _buildType = '';
+  _buildUser = '';
+  _buildBootloader = '';
+  _buildDisplay = '';
+  _buildFingerPrint = '';
+  _buildVersionIncremental = '';
+  _buildVersionBaseOS = '';
+  _buildVersionCodeName = '';
+  _buildVersionSecurityPatch = '';
+  _buildVersionPreviewSDKInt = '';
+  _buildVersionSDKInt = '';
 
   _device = null;
 
   init() {
     return new Promise((resolve, reject) => {
       this.initAndroidDevice();
-      ESDeviceModule$1.getAndroidDevice().then(
+      ESDeviceModule$1.getDevice().then(
         (device) => {
           this._device = device;
 
           try {
             if (device) {
-              this._buildSDKVersion = device.buildSDKVersion;
 
               this._deviceId = device.deviceId;
-              this._deviceType = device._deviceType;
+              this._deviceType = device.deviceType;
 
               this._deviceEthMac = device.ethMac;
               this._deviceWifiMac = device.wifiMac;
@@ -286,20 +277,35 @@ class ESDeviceManager {
               this._densityDpi = device.densityDpi;
               this._scaledDensity = device.scaledDensity;
 
-              this._buildVersionRelease = device.buildVersionRelease;
+              this._ipAddress = device.ipAddress;
+
               this._buildModel = device.buildModel;
               this._buildBrand = device.buildBrand;
+              this._buildBoard = device.buildBoard;
               this._buildDevice = device.buildDevice;
               this._buildProduct = device.buildProduct;
               this._buildHardware = device.buildHardware;
               this._buildManufacturer = device.buildManufacturer;
               this._buildSerial = device.buildSerial;
 
-              this._ipAddress = device.ipAddress;
+              this._buildTags = device.buildTags;
+              this._buildId = device.buildId;
+              this._buildTime = device.buildTime;
+              this._buildType = device.buildType;
+              this._buildUser = device.buildUser;
+              this._buildBootloader = device.buildBootloader;
+              this._buildDisplay = device.buildDisplay;
+              this._buildFingerPrint = device.buildFingerPrint;
+              this._buildVersionIncremental = device.buildVersionIncremental;
+              this._buildVersionBaseOS = device.buildVersionBaseOS;
+              this._buildVersionCodeName = device.buildVersionCodeName;
+              this._buildVersionSecurityPatch = device.buildVersionSecurityPatch;
+              this._buildVersionPreviewSDKInt = device.buildVersionPreviewSDKInt;
+              this._buildVersionSDKInt = device.buildVersionSDKInt;
+              this._buildVersionRelease = device.buildVersionRelease;
             }
           } catch (e) {
           }
-
           resolve(device);
         },
         //
@@ -323,24 +329,17 @@ class ESDeviceManager {
     return this._androidAPILevel;
   }
 
-  getDeviceTotalMemory() {
-    return this._totalMemory;
-  }
-
-  getDeviceAvailMemory() {
-    return this._availMemory;
-  }
-
   getDevice() {
     return this._device;
   }
 
-  getBuildVersionRelease() {
-    return this._buildVersionRelease;
+
+  getDeviceId() {
+    return this._deviceId;
   }
 
-  getBuildManufacturer() {
-    return this._buildManufacturer;
+  getDeviceType() {
+    return this._deviceType;
   }
 
   getDeviceEthMac() {
@@ -351,32 +350,53 @@ class ESDeviceManager {
     return this._deviceWifiMac;
   }
 
-  getDeviceId() {
-    return this._deviceId;
+  getDeviceTotalMemory() {
+    return this._totalMemory;
   }
 
-  getDeviceType() {
-    return this._deviceType;
+  getDeviceAvailMemory() {
+    return this._availMemory;
+  }
+
+
+  getScreenWidth() {
+    return this._screenWidth;
+  }
+
+  getScreenHeight() {
+    return this._screenHeight
   }
 
   getResolution() {
     return this._resolution;
   }
 
-  getIpAddress() {
+  getDensity() {
+    return this._density;
+  }
+
+  getDensityDpi() {
+    return this._densityDpi;
+  }
+
+  getScaledDensity() {
+    return this._scaledDensity;
+  }
+
+  getIPAddress() {
     return this._ipAddress;
   }
 
-  getBuildSerial() {
-    return this._buildSerial;
+  getBuildModel() {
+    return this._buildModel;
   }
 
   getBuildBrand() {
     return this._buildBrand;
   }
 
-  getBuildModel() {
-    return this._buildModel;
+  getBuildBoard() {
+    return this._buildBoard;
   }
 
   getBuildDevice() {
@@ -391,28 +411,73 @@ class ESDeviceManager {
     return this._buildHardware;
   }
 
-  getBuildSDKVersion() {
-    return this._buildSDKVersion;
+  getBuildManufacturer() {
+    return this._buildManufacturer;
   }
 
-  getScreenWidth() {
-    return this._screenWidth;
+  getBuildSerial() {
+    return this._buildSerial;
   }
 
-  getScreenHeight() {
-    return this._screenHeight
+  getBuildTags() {
+    return this._buildTags;
   }
 
-  getDensity() {
-    return this._density;
+  getBuildId() {
+    return this._buildId;
   }
 
-  getDensityDpi() {
-    return this._densityDpi;
+  getBuildTime() {
+    return this._buildTime;
   }
 
-  getScaledDensity() {
-    return this._scaledDensity;
+  getBuildType() {
+    return this._buildType;
+  }
+
+  getBuildUser() {
+    return this._buildUser;
+  }
+
+  getBuildBootloader() {
+    return this._buildBootloader;
+  }
+
+  getBuildDisplay() {
+    return this._buildDisplay;
+  }
+
+
+  getBuildFingerPrint() {
+    return this._buildFingerPrint;
+  }
+
+  getBuildVersionIncremental() {
+    return this._buildVersionIncremental;
+  }
+
+  getBuildVersionBaseOS() {
+    return this._buildVersionBaseOS;
+  }
+
+  getBuildVersionCodeName() {
+    return this._buildVersionCodeName;
+  }
+
+  getBuildVersionSecurityPatch() {
+    return this._buildVersionSecurityPatch;
+  }
+
+  getBuildVersionPreviewSDKInt() {
+    return this._buildVersionPreviewSDKInt;
+  }
+
+  getBuildVersionSDKInt() {
+    return this._buildVersionSDKInt;
+  }
+
+  getBuildVersionRelease() {
+    return this._buildVersionRelease;
   }
 }
 
@@ -1662,50 +1727,86 @@ var ESSharedPreferencesModule$1 = new ESSharedPreferencesModule();
 
 class ESSharedPreferencesManager {
 
+  _sharedPreferencesName = ''
+
   init() {
     return Promise.resolve();
   }
 
   initSharedPreferences(name) {
+    this._sharedPreferencesName = name;
     return ESSharedPreferencesModule$1.initSharedPreferences(name);
   }
 
   //----------------------------------------------------
   getBoolean(key, defValue) {
-    return ESSharedPreferencesModule$1.getBoolean(key, defValue);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.getBoolean(key, defValue));
   }
 
   putBoolean(key, value) {
-    return ESSharedPreferencesModule$1.putBoolean(key, value);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.putBoolean(key, value));
   }
 
   //----------------------------------------------------
 
   getInt(key, defValue) {
-    return ESSharedPreferencesModule$1.getInt(key, defValue);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.getInt(key, defValue));
   }
 
   putInt(key, value) {
-    return ESSharedPreferencesModule$1.putInt(key, value);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.putInt(key, value));
   }
 
   //----------------------------------------------------
 
   getLong(key, defValue) {
-    return ESSharedPreferencesModule$1.getLong(key, defValue);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.getLong(key, defValue));
   }
 
   putLong(key, value) {
-    return ESSharedPreferencesModule$1.putLong(key, value);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.putLong(key, value));
   }
 
   //----------------------------------------------------
   getString(key, defValue) {
-    return ESSharedPreferencesModule$1.getString(key, defValue);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.getString(key, defValue));
   }
 
   putString(key, value) {
-    return ESSharedPreferencesModule$1.putString(key, value);
+    if (!this._sharedPreferencesName) {
+      return Promise.reject('sharedPreferencesName is null');
+    }
+    return ESSharedPreferencesModule$1.initSharedPreferences(this._sharedPreferencesName)
+      .then(() => ESSharedPreferencesModule$1.putString(key, value));
   }
 
   //----------------------------------------------------
@@ -2282,6 +2383,8 @@ class ESLaunchManager {
   _ESPageRouterViewSupported = false;
   _launchLimit = 10;
 
+  _routeListener = null;
+
   init(router) {
     try {
       this._ESRouter = router;
@@ -2338,6 +2441,22 @@ class ESLaunchManager {
     }
   }
 
+  //-----------------------------------------------------------
+  setRouteListener(routeListener) {
+    this._routeListener = routeListener;
+  }
+
+  _notifyListeners(url, params) {
+    if (this._routeListener && this.isFunction(this._routeListener)) {
+      this._routeListener(url, params);
+    }
+  }
+
+  isFunction(func) {
+    return Object.prototype.toString.call(func) === '[object Function]';
+  }
+
+  //-----------------------------------------------------------
   launchNativeApp(paramsArray) {
     return ESModule$1.launchNativeApp(paramsArray);
   }
@@ -2349,25 +2468,46 @@ class ESLaunchManager {
   }
 
   launchESPage(intent) {
+    if (!intent || !intent.url) {
+      return;
+    }
+    let url = intent.url;
+    let params = intent.params;
+
     if (this.isESRouterEnabled()
       && this.isESRouterSupported()
       && this._ESRouter) {
+      //
+      this._notifyListeners(url, params);
+      //
       this._ESRouter.push({
-        name: intent.url,
-        params: intent.params,
+        name: url,
+        params: params,
       });
     }
     //
     else {
+      //
+      this._notifyListeners(url, params);
+      //
       this.launchNativePage(intent);
     }
   }
 
   launchAfterFinishESPage(intent) {
+    if (!intent || !intent.url) {
+      return;
+    }
+    let url = intent.url;
+    let params = intent.params;
+
     if (this.isESRouterEnabled()
       && this.isESRouterSupported()
       && this._ESRouter) {
       this._ESRouter.back();
+      //
+      this._notifyListeners(url, params);
+
       this._ESRouter.push({
         name: intent.url,
         params: intent.params,
@@ -2383,6 +2523,9 @@ class ESLaunchManager {
       }
       //1.finish
       ESModule$1.finish();
+      //
+      this._notifyListeners(url, params);
+
       //2.launch
       this.launchNativePage(intent);
     }
@@ -4192,13 +4335,20 @@ var ESApplication = {
           })
         )
         .then((result) => {
-            this._initESAppParams();
+            this._initESApplication();
           },
           error => {
-            this._initESAppParams();
+            this._initESApplication();
           }
         );
     },
+    _initESApplication() {
+      ESLaunchManager$1.setRouteListener(this._routeListener);
+      this._initESAppParams();
+    },
+    _routeListener(url, params) {
+      this.onLaunchESPage(url, params);
+    },
     _initESAppParams() {
       //
       this.appInitProps = ESApp.$options.$superProps;
@@ -4246,13 +4396,17 @@ var ESApplication = {
               this._initPage();
             }
           );
-        } else {
+        }
+        //
+        else {
           if (ESLog.isLoggable(ESLog.DEBUG)) {
             ESLog.d(TAG, '---------onESCreate--return-Not Promise----->>>>');
           }
           this._initPage();
         }
-      } else {
+      }
+      //
+      else {
         if (ESLog.isLoggable(ESLog.DEBUG)) {
           ESLog.d(TAG, '---------onESCreate---Not Function----->>>>');
         }
@@ -4290,6 +4444,10 @@ var ESApplication = {
       }
       return false;
     },
+    //---------------------------下面的方法给使用者覆写-----------------------------
+    onLaunchESPage(url, params) {
+
+    }
   },
 };
 

package/package.json

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