aiot-toolkit 2.0.3-beta.9 → 2.0.4-beta.1

package/lib/builder/AndroidUxBuilder.js

@@ -11,7 +11,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * AndroidUxBuilder
  */
 class AndroidUxBuilder extends _UxBuilderBase.default {
-  params = [];
+  params = [{
+    type: 'string',
+    name: 'devtool',
+    description: 'source map config'
+  }];
   match(projectPath) {
     return _sharedUtils.ProjectType.getProjectType(projectPath) === _sharedUtils.ProjectType.ANDDROID_UX;
   }

package/lib/builder/VelaUxBuilder.d.ts

@@ -3,7 +3,7 @@ import IBuilder from './IBuilder';
 import UxBuilderBase, { IUxBuildOption } from './UxBuilderBase';
 export interface IVelaUxBuilderOption extends IUxBuildOption {
     watch?: boolean;
-    enableJsc: boolean;
+    enableJsc?: boolean;
     enableE2e?: boolean;
     enableStats?: boolean;
     optimizeCssAttr?: boolean;

package/lib/starter/VelaUxStarter.js

@@ -32,6 +32,9 @@ class VelaUxStarter extends _IStarter.default {
     this.event = new _events.default();
     this.builder = new _VelaUxBuilder.default({
       onBuildSuccess: data => {
+        _sharedUtils.ColorConsole.success({
+          word: 'build success: '
+        }, `${data.costTime}ms`);
         this.lastRpk = data.info?.rpk;
         this.event.emit('buildSuccess', data);
       }
@@ -126,7 +129,7 @@ class VelaUxStarter extends _IStarter.default {
     const projectInfo = _aiotpack.UxFileUtils.getMainfestInfo(projectPath, compilerOption.sourceRoot);
     if (this.lastRpk && _fsExtra.default.existsSync(this.lastRpk)) {
       const targetPath = await this.emulatorInstance?.pushRpk(this.lastRpk, projectInfo.package);
-      await this.emulatorInstance?.install(targetPath);
+      await this.emulatorInstance?.install(targetPath, projectInfo.package);
       await this.emulatorInstance?.startApp(projectInfo.package, options.devtool);
     }
     this.event.on('buildSuccess', async data => {
@@ -137,7 +140,7 @@ class VelaUxStarter extends _IStarter.default {
         await this.emulatorInstance?.reloadApp(projectInfo.package);
       } else if (data.info?.trigger === _FileLaneTriggerType.default.START && data.info.rpk) {
         const targetPath = await this.emulatorInstance?.pushRpk(data.info.rpk, projectInfo.package);
-        await this.emulatorInstance?.install(targetPath);
+        await this.emulatorInstance?.install(targetPath, projectInfo.package);
         await this.emulatorInstance?.startApp(projectInfo.package, options.devtool);
       }
     });

package/lib/utils/VelaAvdUtils.js

@@ -57,7 +57,7 @@ class VelaVvdUtils {
         })
       });
       // skin或者size
-      let skin = '';
+      let skin;
       let width = '466';
       let height = '466';
       // vela4.0不允许自定义分辨率
@@ -73,7 +73,7 @@ class VelaVvdUtils {
             choices: skinList.map(item => {
               return {
                 name: item.name,
-                value: item.name,
+                value: item,
                 description: item.name
               };
             })
@@ -92,7 +92,7 @@ class VelaVvdUtils {
       const vvdManager = new _emulator.VvdManager({
         sdkHome: VelaVvdUtils.sdkHome
       });
-      if ((await vvdManager.hasSDKChildrenUpdate()).length > 0) {
+      if ((await vvdManager.hasSDKPartUpdate()).length > 0) {
         const downloder = await vvdManager.downloadSDK({
           force: false,
           cliProgress: true,
@@ -100,17 +100,18 @@ class VelaVvdUtils {
         });
         await downloder.downlodPromise;
       }
-      const imageDir = _path.default.resolve(VelaVvdUtils.sdkHome, _emulator.SDKChildren.SYSTEM_IMAGES, velaImage);
+      const imageDir = _path.default.resolve(VelaVvdUtils.sdkHome, _emulator.SDKParts.SYSTEM_IMAGES, velaImage);
 
       // 创建vvd文本文件
       const vvdParams = {
         name,
-        skin,
+        skin: skin?.name,
         width,
         height,
         arch: _emulator.IVvdArchType.arm,
         imageDir,
         imageType: velaImage,
+        'skin.path': skin?.path,
         customLcdRadius: ''
       };
       VelaVvdUtils.vvdManager.createVvd(vvdParams);
@@ -120,7 +121,7 @@ class VelaVvdUtils {
     }
   }
   static async checkEmulatorEnv() {
-    return (await this.vvdManager.hasSDKChildrenUpdate()).length === 0;
+    return (await this.vvdManager.hasSDKPartUpdate()).length === 0;
   }
 
   /** 初始化/重置模拟器环境 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.3-beta.9",
+  "version": "2.0.4-beta.1",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -22,14 +22,14 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.3-beta.9",
-    "@aiot-toolkit/commander": "2.0.3-beta.9",
-    "@aiot-toolkit/emulator": "2.0.3-beta.9",
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.9",
+    "@aiot-toolkit/aiotpack": "2.0.4-beta.1",
+    "@aiot-toolkit/commander": "2.0.4-beta.1",
+    "@aiot-toolkit/emulator": "2.0.4-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.4-beta.1",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "axios": "^1.7.4",
-    "file-lane": "2.0.3-beta.9",
+    "file-lane": "2.0.4-beta.1",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -43,5 +43,5 @@
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8"
   },
-  "gitHead": "d51c01beb50c17548d9ab5be522790d295b4c18d"
+  "gitHead": "85c4287c7b9468c83d468cfc39b147f4975f8285"
 }