aiot-toolkit 2.0.2-beta.10 → 2.0.2-beta.12

package/lib/starter/androidRouter/h5/index.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright (C) 2017, hapjs.org. All rights reserved.
+ */
+
+const $ = (selector, elem) => {
+  return typeof elem === 'undefined'
+    ? document.querySelector(selector)
+    : elem.querySelector(selector)
+}
+
+function init() {
+  const qrImgId = '#j-qr-icon'
+  const $qrCodeImg = $(qrImgId)
+  const timeStamp = Date.now() % 1e5
+  $qrCodeImg.src = `/qrcode?ws_id=${timeStamp}`
+  bindEvents()
+}
+
+function bindEvents() {
+  const socket = io(location.origin) // eslint-disable-line no-undef
+
+  socket.on('appRegistered', (data) => {
+    console.info(`on receiving appRegistered message: ${JSON.stringify(data)}`)
+    updateTableElement(data)
+  })
+  socket.on('informUpdate', () => {
+    console.info('on receiving informUpdate')
+    appendUpdateInfo()
+  })
+}
+
+/**
+ * 更新页面调试信息
+ * @param data{ inspectorUrl, application }
+ */
+function updateTableElement(data) {
+  const wrapper = '.inspector-link-panel'
+  const tplId = '#j-tpl-appinfo'
+  const $panelWrapper = $(wrapper)
+  const $tplAppInfoElem = $(tplId)
+  const $tbodyElem = $('tbody', $panelWrapper)
+  let tplTextContent = $tplAppInfoElem.textContent
+
+  $panelWrapper.classList.add('hide')
+  const dataToFill = {
+    data_app_name: data.application,
+    data_href_value: data.inspectorUrl,
+    data_href_name: 'Enter the debug page'
+  }
+  Object.keys(dataToFill).forEach((key) => {
+    tplTextContent = tplTextContent.replace(`{{${key}}}`, dataToFill[key])
+  })
+
+  $tbodyElem.innerHTML = tplTextContent
+  $panelWrapper.classList.remove('hide')
+}
+
+function appendUpdateInfo() {
+  const tplId = '#j-tpl-updatetip'
+  const wrapper = '.inform-tip-wrapper'
+  const $tplUpdateTipElem = $(tplId)
+  const $panelWrapper = $(wrapper)
+  $panelWrapper.innerHTML = $tplUpdateTipElem.textContent
+}
+
+init()

package/lib/utils/AdbUtils.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const adbMiwt = __importStar(require("@miwt/adb"));
 const adb_commander_1 = __importDefault(require("adb-commander"));
 /**
@@ -76,12 +76,12 @@ class AdbUtils {
             const adbShell = adbMiwt.execAdbCmd(`adb -s ${deviceSn} shell am start -n "org.hapjs.debugger/.MainActivity"`);
             adbShell.stdout.on('data', (data) => {
                 // 监听stderr事件，获取输出内容
-                ColorConsole_1.default.log(`### startDebugger ### ${data}`);
+                shared_utils_1.ColorConsole.log(`### startDebugger ### ${data}`);
             });
             adbShell.stderr.on('data', (data) => {
                 // 监听stderr事件，获取输出内容
                 if (data.indexOf('Error') >= 0) {
-                    ColorConsole_1.default.throw(`### startDebugger ### ${data}`);
+                    shared_utils_1.ColorConsole.throw(`### startDebugger ### ${data}`);
                 }
             });
             adbShell.on('close', () => {

package/lib/utils/DeviceUtil.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const prompts_1 = require("@inquirer/prompts");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -31,16 +30,16 @@ class DeviceUtil {
         try {
             return AdbUtils_1.default.getAllConnectedDevices().then((deviceList) => {
                 if (deviceList.length > 0) {
-                    ColorConsole_1.default.info(`Devices connected via adb： ${deviceList.join(', ')}.`);
+                    shared_utils_1.ColorConsole.info(`Devices connected via adb： ${deviceList.join(', ')}.`);
                     return Promise.resolve(deviceList);
                 }
                 else {
-                    ColorConsole_1.default.throw(`No device is currently connected, please check the following preparations in turn：\n  1. Whether the device is started;\n  2. Whether in the same LAN WI-FI;\n  3. Whether the device can be connected to the computer via USB;`);
+                    shared_utils_1.ColorConsole.throw(`No device is currently connected, please check the following preparations in turn：\n  1. Whether the device is started;\n  2. Whether in the same LAN WI-FI;\n  3. Whether the device can be connected to the computer via USB;`);
                 }
             });
         }
         catch (error) {
-            ColorConsole_1.default.throw('Error getting connection information of adb device');
+            shared_utils_1.ColorConsole.throw('Error getting connection information of adb device');
         }
     }
     /**
@@ -62,8 +61,10 @@ class DeviceUtil {
                     : [];
                 connectDeviceList = finalDeviceList ? [...finalDeviceList] : [];
                 // 若connectDeviceList为空，应该warn并结束程序
-                connectDeviceList.length <= 0 &&
-                    ColorConsole_1.default.throw('No device requires debugger or previewer installation');
+                if (connectDeviceList.length <= 0) {
+                    shared_utils_1.ColorConsole.throw({ word: 'No device' }, 'requires debugger or previewer installation');
+                    return Promise.reject(new Error(`No device requires debugger or previewer installation`));
+                }
                 // 3. 下载并获取调试器、预览器地址
                 const debuggerPath = yield this.downloadApk(options, true);
                 const previewPath = yield this.downloadApk(options, false);
@@ -73,7 +74,7 @@ class DeviceUtil {
                 return Promise.resolve('All devices successfully installed the Quickapp debugger and previewer');
             }
             catch (error) {
-                return Promise.reject(new Error(`Failed to install debugger, error message：${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`));
+                return Promise.reject(new Error(`Failed to install , error message：${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`));
             }
         });
     }
@@ -106,14 +107,14 @@ class DeviceUtil {
                     }
                 }
                 if (ip.length === 0) {
-                    ColorConsole_1.default.log(`Since no ip address is entered, the connected device will be connected`);
+                    shared_utils_1.ColorConsole.log(`Since no ip address is entered, the connected device will be connected`);
                     return Promise.resolve();
                 }
                 const ips = ip.trim().split(',');
                 const invalidIps = ips.filter((ip) => !this.ipRegExp.test(ip));
                 if (invalidIps && invalidIps.length) {
                     invalidIps.map((ip) => {
-                        ColorConsole_1.default.throw(`ip: `, { word: ip, style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw) }, ` is invalid IP`);
+                        shared_utils_1.ColorConsole.throw(`ip: `, { word: ip, style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW) }, ` is invalid IP`);
                     });
                 }
                 else {
@@ -124,16 +125,16 @@ class DeviceUtil {
                         });
                         return AdbUtils_1.default.connect(ip, devicePort)
                             .then(() => {
-                            ColorConsole_1.default.success(`wifi connection ip: The device with ip of "${ip}" succeeded`);
+                            shared_utils_1.ColorConsole.success(`wifi connection ip: The device with ip of "${ip}" succeeded`);
                             return Promise.resolve();
                         })
                             .catch((err) => {
-                            ColorConsole_1.default.throw(`${err}`);
+                            shared_utils_1.ColorConsole.throw(`${err}`);
                         });
                     }));
                     return Promise.all(newDeviceListPromiseArray)
                         .then(() => {
-                        ColorConsole_1.default.log(`All new WIFI devices are connected`);
+                        shared_utils_1.ColorConsole.log(`All new WIFI devices are connected`);
                         return Promise.resolve();
                     })
                         .catch(() => {
@@ -154,7 +155,7 @@ class DeviceUtil {
     static queryDevice(deviceList, orderText = '') {
         return __awaiter(this, void 0, void 0, function* () {
             if (!deviceList || deviceList.length === 0) {
-                ColorConsole_1.default.throw(`No device is connected yet, please confirm and try again`);
+                shared_utils_1.ColorConsole.throw(`No device is connected yet, please confirm and try again`);
                 return;
             }
             const ALL_TEXT = 'All connected devices';
@@ -192,19 +193,19 @@ class DeviceUtil {
             const apkPath = path_1.default.join(__dirname, './apk/', fileName);
             if (fs_1.default.existsSync(apkPath)) {
                 // apk已下载
-                ColorConsole_1.default.log(`The installation package has been downloaded, now use the cache file to install`);
+                shared_utils_1.ColorConsole.log(`The installation package has been downloaded, now use the cache file to install`);
                 return apkPath;
             }
             else {
                 try {
                     const result = yield RequestUtils_1.default.downloadFile(url, fileName);
                     // 打印出成功信息
-                    ColorConsole_1.default.success(`Success to download, ${result}`);
+                    shared_utils_1.ColorConsole.success(`Success to download, ${result}`);
                     return apkPath;
                 }
                 catch (error) {
                     // 打印出错误
-                    ColorConsole_1.default.throw(`Failed to download the installation package, ${error}`);
+                    shared_utils_1.ColorConsole.throw(`Failed to download the installation package, ${error}`);
                     return '';
                 }
             }
@@ -227,7 +228,7 @@ class DeviceUtil {
                 let countTime = 0;
                 let data;
                 const sleep = () => {
-                    ColorConsole_1.default.error(`Error when the device gets running platforms,request again after 3s delay`);
+                    shared_utils_1.ColorConsole.error(`Error when the device gets running platforms,request again after 3s delay`);
                     return new Promise((resolve) => setTimeout(resolve, 3000));
                 };
                 const requestPlatform = () => __awaiter(this, void 0, void 0, function* () {
@@ -242,17 +243,17 @@ class DeviceUtil {
                         const dataObj = JSON.parse(data);
                         if (!dataObj.availablePlatforms) {
                             // 请求结果不存在平台信息，报错，结束程序
-                            ColorConsole_1.default.throw(`The request result no avaliable platform `);
+                            shared_utils_1.ColorConsole.throw(`The request result no avaliable platform `);
                         }
                         else {
                             // 打印请求的平台信息
                             const availablePlatforms = dataObj.availablePlatforms;
-                            ColorConsole_1.default.log(`The Quickapp engine list of device "${deviceSn}" is：${availablePlatforms.join(',')}`);
+                            shared_utils_1.ColorConsole.log(`The Quickapp engine list of device "${deviceSn}" is：${availablePlatforms.join(',')}`);
                         }
                     }
                     else {
                         //请求失败，结束程序
-                        ColorConsole_1.default.throw(`The device gets running platforms error`);
+                        shared_utils_1.ColorConsole.throw(`The device gets running platforms error`);
                     }
                 });
                 // 先打开调试器，才能获取运行平台
@@ -260,7 +261,7 @@ class DeviceUtil {
                 yield requestPlatform();
             }
             catch (error) {
-                ColorConsole_1.default.throw(`Error getting the list of Quickapp engines on the device`);
+                shared_utils_1.ColorConsole.throw(`Error getting the list of Quickapp engines on the device`);
             }
         });
     }
@@ -278,11 +279,23 @@ class DeviceUtil {
                 });
                 const apkName = path_1.default.basename(apkPath);
                 return Promise.all(newDeviceListPromiseArray)
-                    .then(() => {
-                    ColorConsole_1.default.success(`All devices installed ${apkName}`);
+                    .then((results) => {
+                    let statusAll = true;
+                    results.forEach((res) => {
+                        if (!res.status) {
+                            shared_utils_1.ColorConsole.error(res.msg);
+                            statusAll = false;
+                        }
+                    });
+                    if (statusAll) {
+                        shared_utils_1.ColorConsole.success(`All devices installed ${apkName}`);
+                    }
+                    else {
+                        // TODO 后续从这里抛出异常
+                    }
                 })
                     .catch(() => {
-                    ColorConsole_1.default.throw(`Installed ${apkName} failed`);
+                    shared_utils_1.ColorConsole.throw(`Installed ${apkName} failed`);
                 });
             }
             catch (error) { }

package/lib/utils/RequestUtils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const axios_1 = __importDefault(require("axios"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -38,16 +38,16 @@ class RequestUtils {
                 axios_1.default
                     .post(requrl, options)
                     .then((data) => {
-                    ColorConsole_1.default.log(`### App Server ### Request ${requrl} succeeded`);
+                    shared_utils_1.ColorConsole.log(`### App Server ### Request ${requrl} succeeded`);
                     resolve(data.toString());
                 })
                     .catch((error) => {
                     if (error.respose && error.response.status === 408) {
                         // 超时处理
-                        ColorConsole_1.default.error(`### App Server ### Request ${requrl} timed out, please try again`);
+                        shared_utils_1.ColorConsole.error(`### App Server ### Request ${requrl} timed out, please try again`);
                     }
                     else {
-                        ColorConsole_1.default.error(`### App Server ### Request ${requrl} error message: ${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`);
+                        shared_utils_1.ColorConsole.error(`### App Server ### Request ${requrl} error message: ${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`);
                     }
                 });
             });
@@ -56,7 +56,7 @@ class RequestUtils {
     static downloadFile(url, fileName) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             // 开始下载
-            ColorConsole_1.default.log(`Start downloading file：${fileName}, address：${url}`);
+            shared_utils_1.ColorConsole.log(`Start downloading file：${fileName}, address：${url}`);
             const response = yield axios_1.default.get(url, {
                 responseType: 'arraybuffer'
             });

package/lib/utils/VelaAvdUtils.js

@@ -13,17 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const emulator_1 = require("@aiot-toolkit/emulator");
-const constants_1 = require("@aiot-toolkit/emulator/lib/static/constants");
-const utils_1 = require("@aiot-toolkit/emulator/lib/utils");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const prompts_1 = require("@inquirer/prompts");
 const adm_zip_1 = __importDefault(require("adm-zip"));
 const axios_1 = __importDefault(require("axios"));
 const cli_progress_1 = __importDefault(require("cli-progress"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const dayjs_1 = __importDefault(require("dayjs"));
 class VelaAvdUtils {
     /** 校验AVD名称 */
     static validateAvdName(avdName) {
@@ -71,7 +69,7 @@ class VelaAvdUtils {
                 });
             }
             catch (e) {
-                ColorConsole_1.default.throw(`Download ${filename} failed`);
+                shared_utils_1.ColorConsole.throw(`Download ${filename} failed`);
                 reject();
             }
         }));
@@ -106,14 +104,14 @@ class VelaAvdUtils {
     /** 根据host获取模拟器下载地址 */
     static getEmulatorUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const hostArch = (0, utils_1.getSystemArch)();
+        const hostArch = (0, emulator_1.getSystemArch)();
         let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
         return `${VelaAvdUtils.emulatorBaseUrl}/v${version}/${hostOs}-${hostArch}.zip`;
     }
     /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
     static getEmulatorPlatform() {
         const systemOs = os_1.default.platform();
-        const hostArch = (0, utils_1.getSystemArch)();
+        const hostArch = (0, emulator_1.getSystemArch)();
         const hostOs = systemOs === 'win32' ? 'windows' : systemOs;
         return `${hostOs}-${hostArch}`;
     }
@@ -136,7 +134,7 @@ class VelaAvdUtils {
         }
         if (VelaAvdUtils.isZipInImageUrl(imageId)) {
             const stats = fs_extra_1.default.statSync(avdImagePath);
-            const version = constants_1.VelaImageVersionList.find((item) => item.value === imageId);
+            const version = emulator_1.VelaImageVersionList.find((item) => item.value === imageId);
             if (version && (0, dayjs_1.default)(version.time).isAfter(stats.mtime, 'day'))
                 return true;
         }
@@ -154,7 +152,7 @@ class VelaAvdUtils {
     /** 获取vela镜像的下载地址 */
     static getSystemImageUrl(version = 'vela-release-4.0') {
         if (VelaAvdUtils.isZipInImageUrl(version)) {
-            const velaImage = constants_1.VelaImageVersionList.find((item) => item.value = version);
+            const velaImage = emulator_1.VelaImageVersionList.find((item) => item.value === version);
             const dayOfTime = (0, dayjs_1.default)(velaImage === null || velaImage === void 0 ? void 0 : velaImage.time).format('YYYYMMDD');
             return `${VelaAvdUtils.systemImageBaseUrl}/${version}/${dayOfTime}/${version}.zip`;
         }
@@ -167,7 +165,7 @@ class VelaAvdUtils {
     /** 根据host获取ya-vm-file-server下载地址 */
     static getv9fsToolUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const arch = (0, utils_1.getSystemArch)();
+        const arch = (0, emulator_1.getSystemArch)();
         let v9fsTool = '';
         switch (systemOs) {
             case 'linux':
@@ -196,7 +194,7 @@ class VelaAvdUtils {
                 return stats.mtime;
             }
             else {
-                const time = (_a = constants_1.VelaImageVersionList.find((item) => item.value === imageId)) === null || _a === void 0 ? void 0 : _a.time;
+                const time = (_a = emulator_1.VelaImageVersionList.find((item) => item.value === imageId)) === null || _a === void 0 ? void 0 : _a.time;
                 return time;
             }
         }
@@ -221,7 +219,7 @@ class VelaAvdUtils {
             if (versionFileExist) {
                 currVersionInfo = fs_extra_1.default.readJSONSync(versionFile);
             }
-            const onlineVersionInfo = constants_1.EmulatorEnvVersion;
+            const onlineVersionInfo = emulator_1.EmulatorEnvVersion;
             // 模拟器各项资源（除了镜像）是否存在
             const emulatorExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'emulator', VelaAvdUtils.getEmulatorPlatform()));
             const qaExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'qa/font'));
@@ -238,12 +236,12 @@ class VelaAvdUtils {
                     }
                 });
                 // 镜像
-                const velaImage = (yield (0, prompts_1.select)({
+                const velaImage = yield (0, prompts_1.select)({
                     message: 'vela image.',
-                    choices: constants_1.VelaImageVersionList.map((item) => {
+                    choices: emulator_1.VelaImageVersionList.map((item) => {
                         return { value: item.value, name: item.label };
                     })
-                }));
+                });
                 // skin或者size
                 let avdSkin = '';
                 let avdWidth = '466';
@@ -258,8 +256,8 @@ class VelaAvdUtils {
                         if (!skinsExist || (currVersionInfo && currVersionInfo.skins < onlineVersionInfo.skins)) {
                             const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', onlineVersionInfo.skins);
                             yield VelaAvdUtils.downloadAndUnzip(skinsUrl, path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
-                            currVersionInfo.skins = constants_1.EmulatorEnvVersion.skins;
-                            ColorConsole_1.default.success(`Download skins succeed.`);
+                            currVersionInfo.skins = emulator_1.EmulatorEnvVersion.skins;
+                            shared_utils_1.ColorConsole.success(`Download skins succeed.`);
                         }
                         const skinList = VelaAvdUtils.velaAvdCls.getVelaSkinList();
                         avdSkin = yield (0, prompts_1.select)({
@@ -285,11 +283,12 @@ class VelaAvdUtils {
                     }
                 }
                 // 下载模拟器
-                if (!emulatorExist || (currVersionInfo && currVersionInfo.emulator < onlineVersionInfo.emulator)) {
+                if (!emulatorExist ||
+                    (currVersionInfo && currVersionInfo.emulator < onlineVersionInfo.emulator)) {
                     const emulatorDownloadUrl = VelaAvdUtils.getEmulatorUrl(onlineVersionInfo.emulator);
                     yield VelaAvdUtils.downloadAndUnzip(emulatorDownloadUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
-                    currVersionInfo.emulator = constants_1.EmulatorEnvVersion.emulator;
-                    ColorConsole_1.default.success(`Download emulator succeed.`);
+                    currVersionInfo.emulator = emulator_1.EmulatorEnvVersion.emulator;
+                    shared_utils_1.ColorConsole.success(`Download emulator succeed.`);
                 }
                 // 下载镜像
                 const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', velaImage);
@@ -297,43 +296,51 @@ class VelaAvdUtils {
                     const velaImageDownloadUrl = this.getSystemImageUrl(velaImage);
                     if (VelaAvdUtils.isZipInImageUrl(velaImage)) {
                         yield VelaAvdUtils.downloadAndUnzip(velaImageDownloadUrl, imageDir);
-                        currVersionInfo['system-images'] = constants_1.EmulatorEnvVersion['system-images'];
+                        currVersionInfo['system-images'] = emulator_1.EmulatorEnvVersion['system-images'];
                     }
                     else {
                         yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
                     }
-                    ColorConsole_1.default.success(`Download vela image succeed.`);
+                    shared_utils_1.ColorConsole.success(`Download vela image succeed.`);
                 }
                 // 下载快应用qa文件
                 if (!qaExist || (currVersionInfo && currVersionInfo.qa < onlineVersionInfo.qa)) {
                     const qaUrl = VelaAvdUtils.getDownloadUrl('qa', onlineVersionInfo.qa);
                     yield VelaAvdUtils.downloadAndUnzip(qaUrl, VelaAvdUtils.getEmulatorEnvHome('qa'));
-                    currVersionInfo.qa = constants_1.EmulatorEnvVersion.qa;
-                    ColorConsole_1.default.success(`Download quickapp font succeed.`);
+                    currVersionInfo.qa = emulator_1.EmulatorEnvVersion.qa;
+                    shared_utils_1.ColorConsole.success(`Download quickapp font succeed.`);
                 }
                 // 下载tools
                 if (!toolsExist || (currVersionInfo && currVersionInfo.tools < onlineVersionInfo.tools)) {
                     const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl();
                     const filename = os_1.default.platform() === 'win32' ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
                     yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, VelaAvdUtils.getEmulatorEnvHome('tools'), filename);
-                    currVersionInfo.tools = constants_1.EmulatorEnvVersion.tools;
-                    ColorConsole_1.default.success(`Download tools succeed.`);
+                    currVersionInfo.tools = emulator_1.EmulatorEnvVersion.tools;
+                    shared_utils_1.ColorConsole.success(`Download tools succeed.`);
                 }
                 // 下载modem_simulator
-                if (!modemSimulatorExist || currVersionInfo.modem_simulator < constants_1.EmulatorEnvVersion.modem_simulator) {
-                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', constants_1.EmulatorEnvVersion.modem_simulator);
+                if (!modemSimulatorExist ||
+                    currVersionInfo.modem_simulator < emulator_1.EmulatorEnvVersion.modem_simulator) {
+                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', emulator_1.EmulatorEnvVersion.modem_simulator);
                     yield VelaAvdUtils.downloadAndUnzip(modemSimulatorUrl, VelaAvdUtils.getEmulatorEnvHome('modem_simulator'));
-                    currVersionInfo.modem_simulator = constants_1.EmulatorEnvVersion.modem_simulator;
-                    ColorConsole_1.default.success(`Download modem simulator succeed.`);
+                    currVersionInfo.modem_simulator = emulator_1.EmulatorEnvVersion.modem_simulator;
+                    shared_utils_1.ColorConsole.success(`Download modem simulator succeed.`);
                 }
                 // 创建avd文本文件
                 const avdImagePath = imageDir;
-                const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch: emulator_1.IAvdArchType.arm, avdImagePath };
+                const avdParams = {
+                    avdName,
+                    avdSkin,
+                    avdWidth,
+                    avdHeight,
+                    avdArch: emulator_1.IAvdArchType.arm,
+                    avdImagePath
+                };
                 VelaAvdUtils.velaAvdCls.createVelaAvd(avdParams);
-                ColorConsole_1.default.success(`Create avd succeed.`);
+                shared_utils_1.ColorConsole.success(`Create avd succeed.`);
             }
             catch (e) {
-                ColorConsole_1.default.throw(`Create avd failed. Error: ${e.message}`);
+                shared_utils_1.ColorConsole.throw(`Create avd failed. Error: ${e.message}`);
             }
             finally {
                 // 写入versions.json
@@ -365,56 +372,57 @@ class VelaAvdUtils {
             const skinsExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
             const toolsExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'tools'));
             const modemSimulatorExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'modem_simulator/modem_nvram.json'));
-            const systemImageExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', constants_1.VelaImageVersionList[0].value, 'nuttx'));
+            const systemImageExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', emulator_1.VelaImageVersionList[0].value, 'nuttx'));
             try {
                 // 下载皮肤
-                if (!skinsExist || currVersionInfo.skins < constants_1.EmulatorEnvVersion.skins) {
-                    const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', constants_1.EmulatorEnvVersion.skins);
+                if (!skinsExist || currVersionInfo.skins < emulator_1.EmulatorEnvVersion.skins) {
+                    const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', emulator_1.EmulatorEnvVersion.skins);
                     yield VelaAvdUtils.downloadAndUnzip(skinsUrl, VelaAvdUtils.getEmulatorEnvHome('skins'));
-                    currVersionInfo.skins = constants_1.EmulatorEnvVersion.skins;
-                    ColorConsole_1.default.success(`Download skins succeed.`);
+                    currVersionInfo.skins = emulator_1.EmulatorEnvVersion.skins;
+                    shared_utils_1.ColorConsole.success(`Download skins succeed.`);
                 }
                 // 下载快应用font
-                if (!qaExist || currVersionInfo.qa < constants_1.EmulatorEnvVersion.qa) {
-                    const qaUrl = VelaAvdUtils.getDownloadUrl('qa', constants_1.EmulatorEnvVersion.qa);
+                if (!qaExist || currVersionInfo.qa < emulator_1.EmulatorEnvVersion.qa) {
+                    const qaUrl = VelaAvdUtils.getDownloadUrl('qa', emulator_1.EmulatorEnvVersion.qa);
                     yield VelaAvdUtils.downloadAndUnzip(qaUrl, VelaAvdUtils.getEmulatorEnvHome('qa'));
-                    currVersionInfo.qa = constants_1.EmulatorEnvVersion.qa;
-                    ColorConsole_1.default.success(`Download quickapp font succeed.`);
+                    currVersionInfo.qa = emulator_1.EmulatorEnvVersion.qa;
+                    shared_utils_1.ColorConsole.success(`Download quickapp font succeed.`);
                 }
                 // 下载工具
-                if (!toolsExist || currVersionInfo.tools < constants_1.EmulatorEnvVersion.tools) {
-                    const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl(constants_1.EmulatorEnvVersion.tools);
-                    const filename = (os_1.default.platform() === 'win32') ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
+                if (!toolsExist || currVersionInfo.tools < emulator_1.EmulatorEnvVersion.tools) {
+                    const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl(emulator_1.EmulatorEnvVersion.tools);
+                    const filename = os_1.default.platform() === 'win32' ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
                     yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, VelaAvdUtils.getEmulatorEnvHome('tools'), filename);
-                    currVersionInfo.tools = constants_1.EmulatorEnvVersion.tools;
-                    ColorConsole_1.default.success(`Download tools succeed.`);
+                    currVersionInfo.tools = emulator_1.EmulatorEnvVersion.tools;
+                    shared_utils_1.ColorConsole.success(`Download tools succeed.`);
                 }
                 // 下载模拟器
-                if (!emulatorExist || currVersionInfo.emulator < constants_1.EmulatorEnvVersion.emulator) {
-                    const emulatorUrl = VelaAvdUtils.getEmulatorUrl(constants_1.EmulatorEnvVersion.emulator);
+                if (!emulatorExist || currVersionInfo.emulator < emulator_1.EmulatorEnvVersion.emulator) {
+                    const emulatorUrl = VelaAvdUtils.getEmulatorUrl(emulator_1.EmulatorEnvVersion.emulator);
                     yield VelaAvdUtils.downloadAndUnzip(emulatorUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
-                    currVersionInfo.emulator = constants_1.EmulatorEnvVersion.emulator;
-                    ColorConsole_1.default.success(`Download emulator succeed.`);
+                    currVersionInfo.emulator = emulator_1.EmulatorEnvVersion.emulator;
+                    shared_utils_1.ColorConsole.success(`Download emulator succeed.`);
                 }
                 // 下载modem_simultor
-                if (!modemSimulatorExist || currVersionInfo.modem_simulator < constants_1.EmulatorEnvVersion.modem_simulator) {
-                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', constants_1.EmulatorEnvVersion.modem_simulator);
+                if (!modemSimulatorExist ||
+                    currVersionInfo.modem_simulator < emulator_1.EmulatorEnvVersion.modem_simulator) {
+                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', emulator_1.EmulatorEnvVersion.modem_simulator);
                     yield VelaAvdUtils.downloadAndUnzip(modemSimulatorUrl, VelaAvdUtils.getEmulatorEnvHome('modem_simulator'));
-                    currVersionInfo.modem_simulator = constants_1.EmulatorEnvVersion.modem_simulator;
-                    ColorConsole_1.default.success(`Download modem simulator succeed.`);
+                    currVersionInfo.modem_simulator = emulator_1.EmulatorEnvVersion.modem_simulator;
+                    shared_utils_1.ColorConsole.success(`Download modem simulator succeed.`);
                 }
                 // 下载vela镜像，默认只下载最新的vela正式版，dev版本需要创建模拟器的时候手动勾选
-                if (!systemImageExist || VelaAvdUtils.velaImageNeedUpdate(constants_1.VelaImageVersionList[0].value)) {
-                    const systemImageUrl = VelaAvdUtils.getSystemImageUrl(constants_1.VelaImageVersionList[0].value);
-                    const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', constants_1.VelaImageVersionList[0].value);
+                if (!systemImageExist || VelaAvdUtils.velaImageNeedUpdate(emulator_1.VelaImageVersionList[0].value)) {
+                    const systemImageUrl = VelaAvdUtils.getSystemImageUrl(emulator_1.VelaImageVersionList[0].value);
+                    const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', emulator_1.VelaImageVersionList[0].value);
                     yield VelaAvdUtils.downloadAndUnzip(systemImageUrl, imageDir);
-                    currVersionInfo['system-images'] = constants_1.EmulatorEnvVersion['system-images'];
-                    ColorConsole_1.default.success(`Download vela image succeed.`);
+                    currVersionInfo['system-images'] = emulator_1.EmulatorEnvVersion['system-images'];
+                    shared_utils_1.ColorConsole.success(`Download vela image succeed.`);
                 }
-                ColorConsole_1.default.success(`Create emulator environment succeed.`);
+                shared_utils_1.ColorConsole.success(`Create emulator environment succeed.`);
             }
             catch (e) {
-                ColorConsole_1.default.throw(`Create emulator environment failed. Error: ${e.message}`);
+                shared_utils_1.ColorConsole.throw(`Create emulator environment failed. Error: ${e.message}`);
             }
             finally {
                 // 写入versions.json