@aiot-toolkit/emulator 2.0.2-beta.1 → 2.0.2-beta.2

package/lib/avd/index.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const constants_1 = require("../static/constants");
 const Avd_1 = require("../typing/Avd");
+const os_1 = __importDefault(require("os"));
 const EAvdParamsToIni = {
     'arm': {
         abiType: 'armeabi-v7a',
@@ -26,6 +27,12 @@ class VelaAvdCls {
         }
     }
     createVelaAvd(avdParams) {
+        // 在.android下创建advancedFeatures.ini文件
+        const advancedFeaturesIni = path_1.default.resolve(os_1.default.homedir(), '.android/advancedFeatures.ini');
+        if (!fs_1.default.existsSync(advancedFeaturesIni)) {
+            const iniSourcePath = path_1.default.join(__dirname, '../static/advancedFeatures.ini');
+            fs_1.default.copyFileSync(iniSourcePath, advancedFeaturesIni);
+        }
         const { avdName, avdArch, avdWidth, avdHeight, avdSkin, avdImagePath = constants_1.defaultImageHome } = avdParams;
         const avdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
         const avdIni = path_1.default.resolve(this.avdHome, `${avdName}.ini`);

package/lib/instance/miwear.js

@@ -104,10 +104,13 @@ class MiwearInstance extends common_1.default {
             // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
             const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.img');
             const dataImageBin = path_1.default.resolve(avdImagePath, 'data.img');
+            const coreBin = path_1.default.resolve(avdImagePath, 'coredump.core');
             const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin} \
 -device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
 -drive index=1,id=userdata,if=none,format=raw,file=${dataImageBin} \
 -device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
+-drive index=2,id=vendor,if=none,format=raw,file=${coreBin} \
+-device virtio-blk-device,bus=virtio-mmio-bus.4,drive=vendor \
 -device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
             // vnc配置
             let windowStr = '';
@@ -125,7 +128,7 @@ class MiwearInstance extends common_1.default {
             ColorConsole_1.default.log(`### Emulator ### Start CMD: ${cmd}`);
             return new Promise((resolve) => {
                 var _a, _b, _c;
-                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
+                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true, cwd: this.sdkHome });
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());

package/lib/static/advancedFeatures.ini

@@ -0,0 +1 @@
+ModemSimulator = on

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.2",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.1",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.1",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.2",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
-  "gitHead": "9244af36e617295ea4ff11a2f4f07f0e4f9f5f59"
+  "gitHead": "5226bdb0ba61daef207531c2eaaf3d034e04c50f"
 }