@aiot-toolkit/emulator 2.0.6-beta.17 → 2.0.6-beta.19

package/lib/emulatorutil/constants.js

@@ -27,7 +27,6 @@ Object.defineProperty(exports, "isVelaImageType", {
 });
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var _https = _interopRequireDefault(require("https"));
 var _Vvd = require("../typing/Vvd");
 var _utils = require("../utils");
 var _shared = require("../shared");
@@ -51,15 +50,8 @@ async function getSdkUrl() {
   const internalBaseUrl = 'https://cnbj3-fusion-fds.api.xiaomi.net/vela-ide';
   // 优先使用内网域名，因为云上工程没有外网环境
   let base = internalBaseUrl;
-  await new Promise(resolve => {
-    _https.default.get(`${base}/versions.json`, {
-      timeout: 2000
-    }, res => {
-      if (res.statusCode !== 200) {
-        base = externalBaseUrl;
-      }
-      resolve();
-    });
+  await fetch(`${base}/versions.json`).catch(() => {
+    base = externalBaseUrl;
   });
   return {
     baseUrl: base,
@@ -80,14 +72,14 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   label: 'vela-miwear-watch-5',
   description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
-  time: '20260112',
+  time: '20260130',
   hide: false,
   icon: ''
 }, {
   label: 'vela-watch-5',
   description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_WATCH_5,
-  time: '20250716',
+  time: '20260127',
   hide: false,
   icon: ''
 }, {
@@ -115,8 +107,8 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   label: 'openvela-smartspeaker-5',
   description: '适用于音响的 vela-miwear 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5,
-  time: '20260116',
-  hide: false,
+  time: '20260128',
+  hide: true,
   icon: ''
 }];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {

package/lib/vvd/index.js

@@ -135,8 +135,7 @@ class VvdManager {
     if (marketName) {
       configIniJson['product.marketname'] = marketName;
     }
-    // 默认使用 'image.sysdir.2' 自定义使用 'image.sysdir.1'
-    configIniJson['image.sysdir.2'] = imagePath;
+    configIniJson['image.sysdir.1'] = imagePath;
     try {
       _fs.default.mkdirSync(vvdDir, {
         recursive: true
@@ -197,8 +196,8 @@ class VvdManager {
       vvdInfo.width = config['hw.lcd.width'];
       vvdInfo.shape = config['hw.lcd.shape'];
       vvdInfo.skin = config['skin.name'];
-      vvdInfo.imageDir = config['image.sysdir.2'];
-      vvdInfo.customImagePath = config['image.sysdir.1'];
+      vvdInfo.imageDir = config['image.sysdir.1'];
+      vvdInfo.customImagePath = config['ide.image.reset.sysdir'];
       vvdInfo.customLcdRadius = config['ide.lcd.radius'];
       if (config['ide.image.type']) vvdInfo.imageType = config['ide.image.type'];
       if (vvdInfo.skin) {
@@ -322,6 +321,7 @@ class VvdManager {
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
     const contents = _fs.default.readFileSync(configIni, 'utf-8');
     const config = (0, _ini.parse)(contents);
+    config['ide.image.reset.sysdir'] = config['image.sysdir.1'];
     config['image.sysdir.1'] = target;
     await _fs.default.promises.writeFile(configIni, (0, _ini.stringify)(config));
     const defaultImageHome = config['image.sysdir.1'];
@@ -351,8 +351,7 @@ class VvdManager {
     const config = (0, _ini.parse)(contents);
     const home = this.getSDKPart(_Vvd.SDKParts.SYSTEM_IMAGES);
     let imageDir = _path.default.resolve(home, config['ide.image.type']);
-    config['image.sysdir.2'] = imageDir;
-    delete config['image.sysdir.1'];
+    config['image.sysdir.1'] = imageDir;
     _fs.default.writeFileSync(configIni, (0, _ini.stringify)(config));
   }
   getEmulatorBinPath(sdkHome) {
@@ -422,6 +421,18 @@ class VvdManager {
       needUpdate = true;
       config['image.sysdir.2'] = normalizePath(config['image.sysdir.2'].toString()).replace('.export_dev/system-images', '.vela/sdk/system-images');
     }
+
+    // 不在使用 'image.sysdir.2' 字段，统一使用 'ide.image.reset.sysdir'
+    if (config['image.sysdir.2']) {
+      needUpdate = true;
+      const oldVal = config['image.sysdir.2'];
+      // TODO delete 会造成 image.sysdir.2=  留下一个空值
+      delete config['image.sysdir.2'];
+      if (config['image.sysdir.1']) {
+        config['ide.image.reset.sysdir'] = config['image.sysdir.1'];
+      }
+      config['image.sysdir.1'] = oldVal;
+    }
     if (needUpdate) {
       await _promises.default.writeFile(configIni, (0, _ini.stringify)(config));
       _ColorConsole.default.log(`update ${vvdName} config.ini`);
@@ -476,8 +487,8 @@ class VvdManager {
     const verboseOption = options.verbose ? `-verbose` : ``;
     // 启动模拟器的命令和参数
 
-    const vvdInfo = this.getVvdInfo(vvdName);
     await this.oldEmulatorMigrate(vvdName);
+    const vvdInfo = this.getVvdInfo(vvdName);
     if (vvdInfo.imageType === _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5) {
       qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting -smp 4 -device virtio-gpu-device,xres=480,yres=800,bus=virtio-mmio-bus.5`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.17",
+  "version": "2.0.6-beta.19",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -32,7 +32,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.17",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.19",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
     "@miwt/adb": "0.10.5",
@@ -50,5 +50,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "d9d60157e951ebbc58f6a6f6fac63efd9d9d4fd5"
+  "gitHead": "29d48c29e9b35e01a722868daba622fd74baefc9"
 }