npm - @zeppos/zeus-cli - Versions diffs - 1.3.2 → 1.3.4 - Mend

@zeppos/zeus-cli 1.3.2 → 1.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/bin/main.js CHANGED Viewed

@@ -51,6 +51,13 @@ var index_1 = require("../index");
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var login = zeppos_app_utils_1.modules.login, logout = zeppos_app_utils_1.modules.logout, status = zeppos_app_utils_1.modules.status, modulesConfig = zeppos_app_utils_1.modules.config;
 var context = {};
+var yargsCmdBuilderFunc = function (cmdName, useProxy, yargs) {
+    if (useProxy === void 0) { useProxy = false; }
+    useProxy && proxy(yargs);
+    if (cmdName in index_1.yargsCmdBuilders) {
+        return index_1.yargsCmdBuilders[cmdName](yargs);
+    }
+};
 var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var res;
     return __generator(this, function (_a) {
@@ -72,6 +79,8 @@ yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [arg
     .demandCommand(1, 'A command is required. Pass --help to see all available commands and options.')
     .recommendCommands()
     .help()
+    .version(false)
+    .version((0, index_1.version)())
     .alias('h', 'help').describe('help', 'Display help information.')
     .alias('v', 'version').describe('version', 'Display version number.')
     .group(['help', 'version'], "Base Options")
@@ -79,7 +88,7 @@ yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [arg
     .command('create <projectName>', 'Named the <projectName> project and add to the current directory.', proxy, index_1.create)
     .command('login', 'Login to your account.', proxy, login)
     .command('logout', 'Sign out of your account.', proxy, logout)
-    .command('dev', 'Run this project in development mode.', proxy, index_1.run)
+    .command('dev', 'Run this project in development mode. Use "zeus dev -h" to see more information', yargsCmdBuilderFunc.bind(null, 'dev', true), index_1.run)
     .command('preview', 'Preview this project in your device.', proxy, index_1.buildPreview)
     .command('build', 'Build this project for production.', proxy, index_1.buildProd)
     .command('status', 'View information such as login and emulator connection status.', proxy, status)

package/index.js CHANGED Viewed

@@ -19,3 +19,5 @@ __exportStar(require("./modules/run"), exports);
 __exportStar(require("./modules/build"), exports);
 __exportStar(require("./modules/create"), exports);
 __exportStar(require("./modules/bridge"), exports);
+__exportStar(require("./modules/version"), exports);
+__exportStar(require("./modules/yargsCmdBuilders"), exports);

package/modules/bridge.js CHANGED Viewed

@@ -137,21 +137,28 @@ var connectWSCB = function () {
         });
     }); });
     vorpal
-        .command('install', 'Install applications or watch face.')
+        .command('install', 'Install applications or watch faces.')
+        .option('-t, --target "<target>"', 'Setting the installation target')
+        .types({
+        string: ['t', 'target']
+    })
         .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var target;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (!hasConnectDevice) return [3, 2];
-                    return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus' }, function (params) {
+                    target = ((_a = args === null || args === void 0 ? void 0 : args.options) === null || _a === void 0 ? void 0 : _a.target) || '';
+                    return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus', target: target }, function (params) {
                             client.sendMessage(params, { method: 'packagePush' });
                         })];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     return [3, 3];
                 case 2:
                     vorpal.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
-                    _a.label = 3;
+                    _b.label = 3;
                 case 3:
                     (0, zeppos_app_utils_2.HM_Analytics)("ZEPP_CLI_BRIDGE_INSTALL_C");
                     cb();

package/modules/build.js CHANGED Viewed

@@ -112,11 +112,12 @@ var checkAppJson = function () {
 var chooseBuildTargetsV3Config = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, answers;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var target, apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, isValidDevice, answers, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     checkAppJson();
+                    target = args.target;
                     apiLevel = (0, lodash_1.get)(appJsonContent, 'runtime.apiVersion.minVersion', '1.0.0');
                     platforms = Object.values((0, lodash_1.get)(appJsonContent, 'targets', {})).reduce(function (list, item) {
                         return list.concat((0, lodash_1.get)(item, 'platforms', []));
@@ -140,16 +141,26 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                         zeppos_app_utils_1.logger.error("The current project's API Level version is too high and there is no available device for debugging currently.");
                         process.exit(1);
                     }
-                    return [4, inquirer_1["default"].prompt([
-                            {
-                                name: 'device',
-                                type: 'list',
-                                message: 'Which device would you like to preview?',
-                                choices: deviceNames
-                            },
-                        ])];
-                case 1:
-                    answers = _a.sent();
+                    isValidDevice = deviceNames.includes(target);
+                    if (target && !isValidDevice) {
+                        zeppos_app_utils_1.logger.warn("'".concat(target, "' is not a valid device, it must be one of ").concat(JSON.stringify(deviceNames)));
+                    }
+                    if (!isValidDevice) return [3, 1];
+                    _a = target;
+                    return [3, 3];
+                case 1: return [4, inquirer_1["default"].prompt([
+                        {
+                            name: 'device',
+                            type: 'list',
+                            message: 'Which device would you like to preview?',
+                            choices: deviceNames
+                        },
+                    ])];
+                case 2:
+                    _a = _b.sent();
+                    _b.label = 3;
+                case 3:
+                    answers = _a;
                     return [2, {
                             sources: (0, lodash_1.get)(targetDevices, "[".concat(answers.device, "].platforms"), []).reduce(function (list, item) {
                                 list.push(Number(item.deviceSource));
@@ -205,6 +216,9 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                     if (bool) {
                                         args.target = promptTarget_1;
                                     }
+                                    else if (promptTarget_1) {
+                                        zeppos_app_utils_1.logger.warn("'".concat(promptTarget_1, "' is not a valid target, it must be one of ").concat(JSON.stringify(targets)));
+                                    }
                                     return mode !== BuildMode.PROD && !bool;
                                 },
                                 message: 'Which target would you like to preview?',

package/modules/version.js ADDED Viewed

@@ -0,0 +1,14 @@
+"use strict";
+var _a;
+exports.__esModule = true;
+exports.version = void 0;
+var appUtilPkg = require('zeppos-app-utils/package.json');
+var zeusVersion = require('../package.json').version;
+var zpmVersion = ((_a = appUtilPkg === null || appUtilPkg === void 0 ? void 0 : appUtilPkg.dependencies) === null || _a === void 0 ? void 0 : _a['@zeppos/zpm']) || '';
+function version() {
+    var versionNum = zpmVersion.match(/(\d+\.){2}\d+/);
+    var zpmVersionTip = Array.isArray(versionNum) ? "\u001B[2m(zpm v".concat(versionNum[0], ")\u001B[0m") : '';
+    var stdout = "".concat(zeusVersion, " ").concat(zpmVersionTip);
+    return stdout;
+}
+exports.version = version;

package/modules/yargsCmdBuilders.js ADDED Viewed

@@ -0,0 +1,15 @@
+"use strict";
+exports.__esModule = true;
+exports.yargsCmdBuilders = void 0;
+exports.yargsCmdBuilders = {
+    dev: function (yargs) {
+        return yargs
+            .usage('$0 dev -t, --target "<target>"')
+            .option('target', {
+            alias: 't',
+            type: 'string',
+            describe: 'Setting the preview target'
+        })
+            .help();
+    }
+};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",
@@ -21,7 +21,7 @@
     "qrcode-terminal": "^0.12.0",
     "vorpal": "^1.12.0",
     "yargs": "^17.5.1",
-    "@zeppos/zpm": "^3.0.0",
+    "@zeppos/zpm": "^3.0.1",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",

package/private-modules/zeppos-app-utils/dist/config/device-server.js CHANGED Viewed

@@ -33,7 +33,6 @@ var path = __importStar(require("path"));
 var fs = __importStar(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var lodash_1 = require("lodash");
-var logger_1 = require("../logger");
 var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_devices");
 var serverPath = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
 var DeviceScreenType;
@@ -66,9 +65,8 @@ if (!((0, lodash_1.get)(localContent, 'expiredTime') > now)) {
                 });
             }
         }
-    })["catch"](function () {
-        console.log();
-        logger_1.logger.error('[Fetch remote device list]: please check network status');
+    })["catch"](function (e) {
+        console.log(e);
         process.exit(1);
     });
 }

package/private-modules/zeppos-app-utils/dist/config/device.js CHANGED Viewed

@@ -13,459 +13,18 @@ var __assign = (this && this.__assign) || function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 exports.__esModule = true;
-exports.deviceInternalCodeName = exports.OSV2DeviceTargetNames = exports.OSV2Devices = exports.deviceTargets = exports.DeviceScreenType = exports.DeviceSource = exports.DevicePlatformName = exports.DeviceTarget = void 0;
+exports.deviceInternalCodeName = exports.OSV2DeviceTargetNames = exports.OSV2Devices = exports.deviceTargets = exports.DeviceScreenType = void 0;
 var lodash_1 = require("lodash");
 var device_server_1 = __importDefault(require("./device-server"));
 var tools_1 = require("../tools/tools");
-var DeviceTarget;
-(function (DeviceTarget) {
-    DeviceTarget["MADRID"] = "madrid";
-    DeviceTarget["VERONA"] = "verona";
-    DeviceTarget["ZURICH"] = "zurich";
-    DeviceTarget["TEIDE"] = "teide";
-    DeviceTarget["PROVENCE"] = "provence";
-    DeviceTarget["BARI"] = "bari";
-    DeviceTarget["BERLIN"] = "berlin";
-    DeviceTarget["LILLE"] = "lille";
-    DeviceTarget["VIENNA"] = "vienna";
-    DeviceTarget["ANDES"] = "andes";
-    DeviceTarget["MONACO"] = "monaco";
-    DeviceTarget["SWIFT"] = "swift";
-    DeviceTarget["SWORDFISH"] = "swordfishw";
-    DeviceTarget["CHEETAH"] = "cheetahw";
-    DeviceTarget["HANNOVER"] = "hannover";
-    DeviceTarget["ETNA"] = "etna";
-    DeviceTarget["ALTAI"] = "altai";
-})(DeviceTarget = exports.DeviceTarget || (exports.DeviceTarget = {}));
-var DevicePlatformName;
-(function (DevicePlatformName) {
-    DevicePlatformName["MADRID"] = "gtr3-pro";
-    DevicePlatformName["MADRIDW"] = "gtr3-pro-w";
-    DevicePlatformName["Madrid2"] = "gtr3-pro-meilin";
-    DevicePlatformName["VERONA"] = "gtr3";
-    DevicePlatformName["VERONAW"] = "gtr3-w";
-    DevicePlatformName["ZURICH"] = "gts3";
-    DevicePlatformName["ZURICHW"] = "gts3-w";
-    DevicePlatformName["TEIDE"] = "t-rex2";
-    DevicePlatformName["TEIDEW"] = "t-rex2-w";
-    DevicePlatformName["PROVENCE"] = "gts4-mini";
-    DevicePlatformName["PROVENCEW"] = "gts4-mini-w";
-    DevicePlatformName["BARI_NFC"] = "amazfit-band7-nfc";
-    DevicePlatformName["BARI"] = "amazfit-band7";
-    DevicePlatformName["BARI_W"] = "amazfit-band7-w";
-    DevicePlatformName["BERLIN"] = "gtr4";
-    DevicePlatformName["BERLIN_W"] = "gtr4-w";
-    DevicePlatformName["LILLE"] = "gts4";
-    DevicePlatformName["LILLE_W"] = "gts4-w";
-    DevicePlatformName["VIENNA"] = "falcon";
-    DevicePlatformName["VIENNA_W"] = "falcon-w";
-    DevicePlatformName["ANDES"] = "t-rex-ultra";
-    DevicePlatformName["ANDES_W"] = "t-rex-ultra-w";
-    DevicePlatformName["MONACO"] = "monaco";
-    DevicePlatformName["MONACO_WN"] = "monaco-wn";
-    DevicePlatformName["MONACO_W"] = "monaco-w";
-    DevicePlatformName["SWIFT"] = "swift";
-    DevicePlatformName["SWIFT_W"] = "swift-w";
-    DevicePlatformName["SWORDFISH_W"] = "swordfish-w";
-    DevicePlatformName["CHEETAH_W"] = "cheetah-w";
-    DevicePlatformName["HANNOVER"] = "hannover";
-    DevicePlatformName["ETNA"] = "etna";
-    DevicePlatformName["ETNA_W"] = "etna-w";
-    DevicePlatformName["ALTAI"] = "altai";
-})(DevicePlatformName = exports.DevicePlatformName || (exports.DevicePlatformName = {}));
-var DeviceSource;
-(function (DeviceSource) {
-    DeviceSource[DeviceSource["MADRID"] = 229] = "MADRID";
-    DeviceSource[DeviceSource["MADRIDW"] = 230] = "MADRIDW";
-    DeviceSource[DeviceSource["Madrid2"] = 6095106] = "Madrid2";
-    DeviceSource[DeviceSource["VERONA"] = 226] = "VERONA";
-    DeviceSource[DeviceSource["VERONAW"] = 227] = "VERONAW";
-    DeviceSource[DeviceSource["ZURICH"] = 224] = "ZURICH";
-    DeviceSource[DeviceSource["ZURICHW"] = 225] = "ZURICHW";
-    DeviceSource[DeviceSource["TEIDE"] = 418] = "TEIDE";
-    DeviceSource[DeviceSource["TEIDEW"] = 419] = "TEIDEW";
-    DeviceSource[DeviceSource["PROVENCE"] = 246] = "PROVENCE";
-    DeviceSource[DeviceSource["PROVENCEW"] = 247] = "PROVENCEW";
-    DeviceSource[DeviceSource["BARI_NFC"] = 252] = "BARI_NFC";
-    DeviceSource[DeviceSource["BARI"] = 253] = "BARI";
-    DeviceSource[DeviceSource["BARI_W"] = 254] = "BARI_W";
-    DeviceSource[DeviceSource["BERLIN"] = 7930112] = "BERLIN";
-    DeviceSource[DeviceSource["BERLIN_W"] = 7930113] = "BERLIN_W";
-    DeviceSource[DeviceSource["LILLE"] = 7995648] = "LILLE";
-    DeviceSource[DeviceSource["LILLE_W"] = 7995649] = "LILLE_W";
-    DeviceSource[DeviceSource["VIENNA"] = 414] = "VIENNA";
-    DeviceSource[DeviceSource["VIENNA_W"] = 415] = "VIENNA_W";
-    DeviceSource[DeviceSource["ANDES"] = 6553856] = "ANDES";
-    DeviceSource[DeviceSource["ANDES_W"] = 6553857] = "ANDES_W";
-    DeviceSource[DeviceSource["MONACO"] = 8519936] = "MONACO";
-    DeviceSource[DeviceSource["MONACO_WN"] = 8519937] = "MONACO_WN";
-    DeviceSource[DeviceSource["MONACO_W"] = 8519939] = "MONACO_W";
-    DeviceSource[DeviceSource["SWIFT"] = 8192256] = "SWIFT";
-    DeviceSource[DeviceSource["SWIFT_W"] = 8192257] = "SWIFT_W";
-    DeviceSource[DeviceSource["SWORDFISH_W"] = 8257793] = "SWORDFISH_W";
-    DeviceSource[DeviceSource["CHEETAH_W"] = 8126721] = "CHEETAH_W";
-    DeviceSource[DeviceSource["HANNOVER"] = 8323329] = "HANNOVER";
-    DeviceSource[DeviceSource["ETNA"] = 8388864] = "ETNA";
-    DeviceSource[DeviceSource["ETNA_W"] = 8388865] = "ETNA_W";
-    DeviceSource[DeviceSource["ALTAI"] = 8454401] = "ALTAI";
-})(DeviceSource = exports.DeviceSource || (exports.DeviceSource = {}));
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
     DeviceScreenType["S"] = "s";
     DeviceScreenType["B"] = "b";
 })(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
-exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
-    deviceName: 'GTR3 Pro',
-    platforms: [
-        {
-            name: DevicePlatformName.MADRID,
-            deviceSource: DeviceSource.MADRID
-        },
-        {
-            name: DevicePlatformName.MADRIDW,
-            deviceSource: DeviceSource.MADRIDW
-        },
-        {
-            name: DevicePlatformName.Madrid2,
-            deviceSource: DeviceSource.Madrid2
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 480,
-        height: 480
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.VERONA] = {
-    deviceName: 'GTR3',
-    platforms: [
-        {
-            name: DevicePlatformName.VERONA,
-            deviceSource: DeviceSource.VERONA
-        },
-        {
-            name: DevicePlatformName.VERONAW,
-            deviceSource: DeviceSource.VERONAW
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 454,
-        height: 454
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.ZURICH] = {
-    deviceName: 'GTS3',
-    platforms: [
-        {
-            name: DevicePlatformName.ZURICH,
-            deviceSource: DeviceSource.ZURICH
-        },
-        {
-            name: DevicePlatformName.ZURICHW,
-            deviceSource: DeviceSource.ZURICHW
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 390,
-        height: 450
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.TEIDE] = {
-    deviceName: 'T-Rex2',
-    platforms: [
-        {
-            name: DevicePlatformName.TEIDE,
-            deviceSource: DeviceSource.TEIDE
-        },
-        {
-            name: DevicePlatformName.TEIDEW,
-            deviceSource: DeviceSource.TEIDEW
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 454,
-        height: 454
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.PROVENCE] = {
-    deviceName: 'GTS4 mini',
-    platforms: [
-        {
-            name: DevicePlatformName.PROVENCE,
-            deviceSource: DeviceSource.PROVENCE
-        },
-        {
-            name: DevicePlatformName.PROVENCEW,
-            deviceSource: DeviceSource.PROVENCEW
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 336,
-        height: 384
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.BARI] = {
-    deviceName: 'Amazfit Band 7',
-    platforms: [
-        {
-            name: DevicePlatformName.BARI_NFC,
-            deviceSource: DeviceSource.BARI_NFC
-        },
-        {
-            name: DevicePlatformName.BARI,
-            deviceSource: DeviceSource.BARI
-        },
-        {
-            name: DevicePlatformName.BARI_W,
-            deviceSource: DeviceSource.BARI_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.B,
-        width: 194,
-        height: 368
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.BERLIN] = {
-    deviceName: 'GTR 4',
-    platforms: [
-        {
-            name: DevicePlatformName.BERLIN,
-            deviceSource: DeviceSource.BERLIN
-        },
-        {
-            name: DevicePlatformName.BERLIN_W,
-            deviceSource: DeviceSource.BERLIN_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 466,
-        height: 466
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '2.99.99'
-    }
-}, _a[DeviceTarget.LILLE] = {
-    deviceName: 'GTS 4',
-    platforms: [
-        {
-            name: DevicePlatformName.LILLE,
-            deviceSource: DeviceSource.LILLE
-        },
-        {
-            name: DevicePlatformName.LILLE_W,
-            deviceSource: DeviceSource.LILLE_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 390,
-        height: 450
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '2.99.99'
-    }
-}, _a[DeviceTarget.VIENNA] = {
-    deviceName: 'Falcon',
-    platforms: [
-        {
-            name: DevicePlatformName.VIENNA,
-            deviceSource: DeviceSource.VIENNA
-        },
-        {
-            name: DevicePlatformName.VIENNA_W,
-            deviceSource: DeviceSource.VIENNA_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 416,
-        height: 416
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '1.99.99'
-    }
-}, _a[DeviceTarget.ANDES] = {
-    deviceName: 'T-Rex Ultra',
-    platforms: [
-        {
-            name: DevicePlatformName.ANDES,
-            deviceSource: DeviceSource.ANDES
-        },
-        {
-            name: DevicePlatformName.ANDES_W,
-            deviceSource: DeviceSource.ANDES_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 454,
-        height: 454
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '2.99.99'
-    }
-}, _a[DeviceTarget.MONACO] = {
-    deviceName: 'Amazfit Balance',
-    platforms: [
-        {
-            name: DevicePlatformName.MONACO,
-            deviceSource: DeviceSource.MONACO
-        },
-        {
-            name: DevicePlatformName.MONACO_WN,
-            deviceSource: DeviceSource.MONACO_WN
-        },
-        {
-            name: DevicePlatformName.MONACO_W,
-            deviceSource: DeviceSource.MONACO_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 480,
-        height: 480
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '3.99.99'
-    }
-}, _a[DeviceTarget.SWIFT] = {
-    deviceName: 'Runner (Round)',
-    platforms: [
-        {
-            name: DevicePlatformName.SWIFT,
-            deviceSource: DeviceSource.SWIFT
-        },
-        {
-            name: DevicePlatformName.SWIFT_W,
-            deviceSource: DeviceSource.SWIFT_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 454,
-        height: 454
-    },
-    apiLevelLimit: {
-        min: '1.0.0'
-    }
-}, _a[DeviceTarget.SWORDFISH] = {
-    deviceName: 'Runner (Square)',
-    platforms: [
-        {
-            name: DevicePlatformName.SWORDFISH_W,
-            deviceSource: DeviceSource.SWORDFISH_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 390,
-        height: 450
-    },
-    apiLevelLimit: {
-        min: '1.0.0'
-    }
-}, _a[DeviceTarget.CHEETAH] = {
-    deviceName: 'Runner Pro',
-    platforms: [
-        {
-            name: DevicePlatformName.CHEETAH_W,
-            deviceSource: DeviceSource.CHEETAH_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.R,
-        width: 480,
-        height: 480
-    },
-    apiLevelLimit: {
-        min: '1.0.0'
-    }
-}, _a[DeviceTarget.HANNOVER] = {
-    deviceName: 'Amazfit Active',
-    platforms: [
-        {
-            name: DevicePlatformName.HANNOVER,
-            deviceSource: DeviceSource.HANNOVER
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 390,
-        height: 450
-    },
-    apiLevelLimit: {
-        min: '1.0.0'
-    }
-}, _a[DeviceTarget.ETNA] = {
-    deviceName: 'GTR Shock',
-    platforms: [
-        {
-            name: DevicePlatformName.ETNA,
-            deviceSource: DeviceSource.ETNA
-        },
-        {
-            name: DevicePlatformName.ETNA_W,
-            deviceSource: DeviceSource.ETNA_W
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 360,
-        height: 360
-    },
-    apiLevelLimit: {
-        min: '1.0.0'
-    }
-}, _a[DeviceTarget.ALTAI] = {
-    deviceName: 'Bip 5s',
-    platforms: [
-        {
-            name: DevicePlatformName.ALTAI,
-            deviceSource: DeviceSource.ALTAI
-        },
-    ],
-    screen: {
-        type: DeviceScreenType.S,
-        width: 320,
-        height: 380
-    },
-    apiLevelLimit: {
-        min: '1.0.0',
-        max: '2.99.99'
-    }
-}, _a), device_server_1["default"]);
+exports.deviceTargets = __assign({}, device_server_1["default"]);
 exports.OSV2Devices = Object.values(exports.deviceTargets).reduce(function (targetDevices, target) {
     var _a = target.platforms, platforms = _a === void 0 ? [] : _a, _b = target.apiLevelLimit, apiLevelLimit = _b === void 0 ? {} : _b;
     var min = apiLevelLimit.min, max = apiLevelLimit.max;

package/private-modules/zeppos-app-utils/dist/modules/create/local-app.js CHANGED Viewed

@@ -71,8 +71,10 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         }
         appJsonPath = (0, path_1.resolve)(workDir, './app.json');
         appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
-        appID = Math.floor(Math.random() * 10001) + 20000;
-        lodash_1["default"].set(appJson, 'app.appId', appID);
+        if (args.OSVersion !== 'v1') {
+            appID = Math.floor(Math.random() * 10001) + 20000;
+            lodash_1["default"].set(appJson, 'app.appId', appID);
+        }
         if (templateInfo.copyType !== TemplateCopyType.EDIT) {
             fs_extra_1["default"].writeJson(appJsonPath, appJson, {
                 spaces: 2,

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/app/fetch-api/app.js CHANGED Viewed

@@ -1,20 +1,27 @@
 import "./shared/device-polyfill";
 import { MessageBuilder } from "./shared/message";
-const appId = 27280;
-const messageBuilder = new MessageBuilder({ appId });
 App({
   globalData: {
-    messageBuilder: messageBuilder,
+    messageBuilder: null
   },
   onCreate(options) {
     console.log("app on create invoke");
-    messageBuilder.connect();
+    let appId;
+    if (!hmApp.packageInfo) {
+      // appId = XXX // Modify appId
+      throw new Error('Set appId,  appId needs to be the same as the configuration in app.json');
+    } else {
+      appId = hmApp.packageInfo().appId;
+    }
+    this.globalData.messageBuilder = new MessageBuilder({
+      appId,
+    });
+    this.globalData.messageBuilder.connect();
   },
   onDestroy(options) {
     console.log("app on destroy invoke");
-    messageBuilder.disConnect();
+    this.globalData.messageBuilder.disConnect();
   },
 });

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/app/fetch-api/shared/message.js CHANGED Viewed

@@ -207,7 +207,7 @@ export class MessageBuilder extends EventBus {
     hmBle &&
       hmBle.createConnect((index, data, size) => {
         // logger.warn('[RAW] [R] receive index=>%d size=>%d bin=>%s', index, size, this.bin2hex(data))
-        // console.log('createConnect-------', size)
+        console.log('createConnect-------', size)
         this.onFragmentData(data)
       })
@@ -384,7 +384,7 @@ export class MessageBuilder extends EventBus {
   sendBin(buf) {
     // hmBle 发送消息
     // logger.warn('[RAW] [S] send size=%d bin=%s', buf.byteLength, this.bin2hex(buf.buffer))
-    // console.log('sendBin-------', buf.byteLength)
+    console.log('sendBin-------', buf.byteLength)
     hmBle.send(buf.buffer, buf.byteLength)
   }

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/app/todo-list/app.js CHANGED Viewed

@@ -2,26 +2,27 @@ import './shared/device-polyfill'
 import { MessageBuilder } from './shared/message'
 const logger = DeviceRuntimeCore.HmLogger.getLogger('todo-list-app')
-const appDevicePort = 20
-const appSidePort = 0
-const appId = 20001
-const messageBuilder = new MessageBuilder({
-  appId,
-  appDevicePort,
-  appSidePort
-})
 App({
   globalData: {
-    messageBuilder: messageBuilder
+    messageBuilder: null
   },
   onCreate() {
-    logger.log('app onCreate invoked')
-    messageBuilder.connect()
+    logger.log('app onCreate invoked');
+    let appId;
+    if (!hmApp.packageInfo) {
+      // appid = XXX // Modify appId
+      throw new Error('Set appId,  appId needs to be the same as the configuration in app.json');
+    } else {
+      appId = hmApp.packageInfo().appId;
+    }
+    this.globalData.messageBuilder = new MessageBuilder({
+      appId,
+    });
+    this.globalData.messageBuilder.connect();
   },
   onDestroy() {
-    logger.log('app onDestroy invoked')
-    messageBuilder.disConnect()
+    logger.log('app onDestroy invoked');
+    this.globalData.messageBuilder.disConnect();
   }
 })

package/private-modules/zeppos-app-utils/package.json CHANGED Viewed

@@ -13,7 +13,7 @@
     "dev": "nodemon -e ts,tsx --exec \"rm -rf dist && tsc && ts-node build.ts\" --ignore types/ --ignore dist/"
   },
   "dependencies": {
-    "@zeppos/zpm": "^3.0.0",
+    "@zeppos/zpm": "^3.0.1",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",