@zeppos/zeus-cli 1.3.0-beta.5 → 1.3.0-beta.7

package/modules/build.js

@@ -112,20 +112,27 @@ 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, targetDevices, deviceNames, answers;
+        var apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, answers;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     checkAppJson();
                     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', []));
+                    }, []);
+                    usefulScreenTypes = (0, lodash_1.compact)(Object.keys((0, lodash_1.groupBy)(platforms, 'st')));
+                    usefulDeviceSource = (0, lodash_1.compact)(Object.keys((0, lodash_1.groupBy)(platforms, 'deviceSource')));
                     targetDevices = {};
                     Object.values(deviceTargets).forEach(function (device) {
                         var _a;
-                        var _b = device.apiLevelLimit || {}, _c = _b.min, min = _c === void 0 ? '1.0.0' : _c, _d = _b.max, max = _d === void 0 ? '99.99.99' : _d;
-                        if ((0, tools_1.compareVersion)(min, apiLevel) >= 0 && (0, tools_1.compareVersion)(max, apiLevel) <= 0) {
-                            Object.assign(targetDevices, (_a = {},
-                                _a[device.deviceName] = device,
-                                _a));
+                        var _b = device.apiLevelLimit || {}, min = _b.min, max = _b.max;
+                        if (usefulScreenTypes.includes((0, lodash_1.get)(device, 'screen.type', '')) || (0, lodash_1.find)(device.platforms, function (o) { return usefulDeviceSource.includes("".concat(o.deviceSource)); })) {
+                            if ((0, tools_1.compareVersion)(min || '1.0.0', apiLevel) >= 0 && (0, tools_1.compareVersion)(max || '99.99.99', apiLevel) < 0) {
+                                Object.assign(targetDevices, (_a = {},
+                                    _a[device.deviceName] = device,
+                                    _a));
+                            }
                         }
                     });
                     deviceNames = Object.keys(targetDevices);
@@ -139,7 +146,7 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                                 type: 'list',
                                 message: 'Which device would you like to preview?',
                                 choices: deviceNames
-                            }
+                            },
                         ])];
                 case 1:
                     answers = _a.sent();
@@ -173,7 +180,8 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                 unsupportedTargets_1.push(target);
                             }
                         });
-                        unsupportedTargets_1.length && zeppos_app_utils_1.logger.warn("Unsupported targets(".concat(unsupportedTargets_1.join(', '), ") have been removed."));
+                        unsupportedTargets_1.length &&
+                            zeppos_app_utils_1.logger.warn("Unsupported targets(".concat(unsupportedTargets_1.join(', '), ") have been removed."));
                     }
                     targets = Object.keys((0, lodash_1.get)(appJsonContent, 'targets', {}));
                     returnRes = [];
@@ -206,7 +214,9 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                 name: 'target',
                                 type: 'checkbox',
                                 when: function (args) {
-                                    var arr = typeof promptTarget_1 === 'string' ? (0, lodash_1.intersection)(targets, promptTarget_1.split(',')) : [];
+                                    var arr = typeof promptTarget_1 === 'string'
+                                        ? (0, lodash_1.intersection)(targets, promptTarget_1.split(','))
+                                        : [];
                                     var bool = !!arr.length;
                                     if (bool) {
                                         args.target = arr;
@@ -219,11 +229,12 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                     checked: true
                                 }); }),
                                 message: 'Which targets would you like to build?'
-                            }
+                            },
                         ])];
                 case 3:
                     answers = _b.sent();
-                    returnRes = typeof answers.target === 'string' ? [answers.target] : answers.target;
+                    returnRes =
+                        typeof answers.target === 'string' ? [answers.target] : answers.target;
                     _b.label = 4;
                 case 4:
                     if (!process.env._targetDeviceToBuild) {
@@ -298,7 +309,9 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
         switch (_e.label) {
             case 0:
                 _a = args._, curCommand = _a[0], curBridgeTarget = _a[1];
-                buildMode = (curBridgeTarget && curBridgeTarget === 'simulator') ? BuildMode.DEV : BuildMode.PREVIEW;
+                buildMode = curBridgeTarget && curBridgeTarget === 'simulator'
+                    ? BuildMode.DEV
+                    : BuildMode.PREVIEW;
                 zeppos_app_utils_1.logger.info('building...');
                 appType = (0, lodash_1.get)(appJsonContent, 'app.appType');
                 _c = (_b = Object).assign;
@@ -310,14 +323,18 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
             case 2:
                 buildInfo = _e.sent();
                 zeppos_app_utils_1.logger.info('getting package...');
-                return [4, zeppos_app_utils_1.modules.previewBuild(path.resolve('./'), args, "./dist/".concat(buildInfo), appType, curCommand).then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4, zeppos_app_utils_1.modules
+                        .previewBuild(path.resolve('./'), args, "./dist/".concat(buildInfo), appType, curCommand)
+                        .then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     if (!(res.type === 'preview')) return [3, 1];
                                     zeppos_app_utils_1.logger.info('Generating preview QR code...');
                                     zeppos_app_utils_1.logger.success("Please use Zepp APP to scan the following QR code to preview your ".concat(appType === AppType.WATCHFACE ? 'WatchFace' : 'application', "."));
-                                    zeppos_app_utils_1.logger.success("The QR code will expire on ".concat((0, dayjs_1["default"])().add(2, 'hour').format('YYYY-MM-DD HH:mm:ss'), "."));
+                                    zeppos_app_utils_1.logger.success("The QR code will expire on ".concat((0, dayjs_1["default"])()
+                                        .add(2, 'hour')
+                                        .format('YYYY-MM-DD HH:mm:ss'), "."));
                                     qrcode_terminal_1["default"].generate(res.url, { small: true });
                                     callback && callback(res);
                                     return [3, 4];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.3.0-beta.5",
+  "version": "1.3.0-beta.7",
   "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": "^2.9.13-beta",
+    "@zeppos/zpm": "^2.9.18-beta",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",

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

@@ -0,0 +1,113 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.DeviceScreenType = void 0;
+var axios_1 = __importDefault(require("axios"));
+var os = __importStar(require("os"));
+var path = __importStar(require("path"));
+var fs = __importStar(require("fs"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
+var lodash_1 = require("lodash");
+var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_device");
+var serverPath = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
+var DeviceScreenType;
+(function (DeviceScreenType) {
+    DeviceScreenType["R"] = "r";
+    DeviceScreenType["S"] = "s";
+    DeviceScreenType["B"] = "b";
+})(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
+var shapeMap = {
+    square: DeviceScreenType.S,
+    round: DeviceScreenType.R,
+    bar: DeviceScreenType.B
+};
+var localContent = {};
+if (fs.existsSync(LOCAL_CACHE_DEVICE_PATH)) {
+    try {
+        localContent = fs_extra_1["default"].readJsonSync(LOCAL_CACHE_DEVICE_PATH);
+    }
+    catch (_e) { }
+}
+var now = Date.now().valueOf();
+if (!((0, lodash_1.get)(localContent, 'expiredTime') > now)) {
+    axios_1["default"].get(serverPath).then(function (res) {
+        if (res.status === 200) {
+            var data = res.data;
+            if (!(0, lodash_1.isEmpty)(data)) {
+                fs_extra_1["default"].writeJsonSync(LOCAL_CACHE_DEVICE_PATH, {
+                    devices: data,
+                    expiredTime: now + 24 * 60 * 60 * 1000
+                });
+            }
+        }
+    });
+}
+var deviceList = (0, lodash_1.get)(localContent, 'devices', []);
+var deviceGroup = (0, lodash_1.groupBy)(deviceList, 'productName');
+var deviceInfo = {};
+Object.values(deviceGroup).forEach(function (devices) {
+    var _a;
+    var info = {
+        deviceName: '',
+        platforms: [],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 0,
+            height: 0
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    };
+    var deviceInnerName = devices.reduce(function (acc, cur) {
+        !info.deviceName && (info.deviceName = cur.productName);
+        var screenType = (0, lodash_1.get)(shapeMap, (0, lodash_1.get)(cur, 'value.shape'));
+        var _a = (0, lodash_1.get)(cur, 'value.screen.size', '').split('*'), width = _a[0], height = _a[1];
+        if (screenType) {
+            info.screen.type = screenType;
+        }
+        if (width && height) {
+            info.screen.width = Number(width);
+            info.screen.height = Number(height);
+        }
+        info.platforms.push({
+            name: cur.code,
+            deviceSource: cur.deviceSource
+        });
+        Object.assign(info.apiLevelLimit, {
+            min: (0, lodash_1.get)(cur, 'value.os.apiLevelLimitMin', '1.0.0'),
+            max: (0, lodash_1.get)(cur, 'value.os.apiLevelLimitMax', '')
+        });
+        return cur.code.length < acc.length ? cur.code : acc;
+    }, devices[0].code);
+    var lowerName = (0, lodash_1.toLower)(deviceInnerName.replace(/[^a-zA-Z]/g, ''));
+    lowerName && Object.assign(deviceInfo, (_a = {},
+        _a[lowerName] = info,
+        _a));
+});
+exports["default"] = deviceInfo;

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

@@ -1,7 +1,24 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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;
+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";
@@ -12,10 +29,12 @@ var DeviceTarget;
     DeviceTarget["BARI"] = "bari";
     DeviceTarget["BERLIN"] = "berlin";
     DeviceTarget["LILLE"] = "lille";
+    DeviceTarget["VIENNA"] = "vienna";
+    DeviceTarget["ANDES"] = "andes";
     DeviceTarget["MONACO"] = "monaco";
     DeviceTarget["SWIFT"] = "swift";
-    DeviceTarget["SWORDFISH"] = "swordfish";
-    DeviceTarget["CHEETAH"] = "cheetah";
+    DeviceTarget["SWORDFISH"] = "swordfishw";
+    DeviceTarget["CHEETAH"] = "cheetahw";
     DeviceTarget["HANNOVER"] = "hannover";
     DeviceTarget["ETNA"] = "etna";
     DeviceTarget["ALTAI"] = "altai";
@@ -40,6 +59,10 @@ var DevicePlatformName;
     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";
@@ -72,6 +95,10 @@ var DeviceSource;
     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";
@@ -88,343 +115,362 @@ var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
     DeviceScreenType["S"] = "s";
+    DeviceScreenType["B"] = "b";
 })(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
-exports.deviceTargets = (_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'
-        }
+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
     },
-    _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'
-        }
+    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
     },
-    _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'
-        }
+    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
     },
-    _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'
-        }
+    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
     },
-    _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'
-        }
+    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
     },
-    _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.S,
-            width: 194,
-            height: 368
-        },
-        apiLevelLimit: {
-            min: '1.0.0',
-            max: '1.99.99'
-        }
+    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
     },
-    _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'
-        }
+    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
     },
-    _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'
-        }
+    apiLevelLimit: {
+        min: '1.0.0'
+    }
+}, _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
     },
-    _a[DeviceTarget.MONACO] = {
-        deviceName: 'GTR 5',
-        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'
-        }
+    apiLevelLimit: {
+        min: '1.0.0'
+    }
+}, _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
     },
-    _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'
-        }
+    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
     },
-    _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'
-        }
+    apiLevelLimit: {
+        min: '1.0.0'
+    }
+}, _a[DeviceTarget.MONACO] = {
+    deviceName: 'GTR 5',
+    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
     },
-    _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'
-        }
+    apiLevelLimit: {
+        min: '1.0.0'
+    }
+}, _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
     },
-    _a[DeviceTarget.HANNOVER] = {
-        deviceName: 'GTS 5 Active',
-        platforms: [
-            {
-                name: DevicePlatformName.HANNOVER,
-                deviceSource: DeviceSource.HANNOVER
-            }
-        ],
-        screen: {
-            type: DeviceScreenType.S,
-            width: 390,
-            height: 450
-        },
-        apiLevelLimit: {
-            min: '1.0.0'
-        }
+    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
     },
-    _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'
-        }
+    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
     },
-    _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'
-        }
+    apiLevelLimit: {
+        min: '1.0.0'
+    }
+}, _a[DeviceTarget.HANNOVER] = {
+    deviceName: 'GTS 5 Active',
+    platforms: [
+        {
+            name: DevicePlatformName.HANNOVER,
+            deviceSource: DeviceSource.HANNOVER
+        },
+    ],
+    screen: {
+        type: DeviceScreenType.S,
+        width: 390,
+        height: 450
     },
-    _a);
-exports.OSV2Devices = [
-    DeviceSource.BERLIN,
-    DeviceSource.BERLIN_W,
-    DeviceSource.LILLE,
-    DeviceSource.LILLE_W,
-    DeviceSource.MONACO,
-    DeviceSource.MONACO_WN,
-    DeviceSource.MONACO_W,
-    DeviceSource.SWIFT,
-    DeviceSource.SWIFT_W,
-    DeviceSource.SWORDFISH_W,
-    DeviceSource.CHEETAH_W,
-    DeviceSource.HANNOVER,
-    DeviceSource.ETNA,
-    DeviceSource.ETNA_W,
-    DeviceSource.ALTAI
-];
+    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'
+    }
+}, _a), 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;
+    if (!(0, lodash_1.isEmpty)(platforms) &&
+        (0, tools_1.compareVersion)(min || '1.0.0', '2.0.0') >= 0 &&
+        (0, tools_1.compareVersion)(max || '99.99.99', '2.0.0') < 0) {
+        targetDevices.push.apply(targetDevices, platforms.reduce(function (list, o) { return (0, lodash_1.compact)(list.concat([o.deviceSource])); }, []));
+    }
+    return targetDevices;
+}, []);
 exports.OSV2DeviceTargetNames = Object.keys(exports.deviceTargets).reduce(function (targetNames, target) {
     var flag = true;
     var _a = exports.deviceTargets[target].platforms, platforms = _a === void 0 ? [] : _a;

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v2/empty/page/index.js

@@ -1,7 +1,7 @@
-import { gettext } from 'i18n'
+import { getText } from '@zos/i18n'
 
 Page({
   build() {
-    console.log(gettext('example'))
+    console.log(getText('example'))
   }
 })

package/private-modules/zeppos-app-utils/dist/public/template/v2/empty/page/index.js

@@ -1,7 +1,7 @@
-import { gettext } from 'i18n'
+import { getText } from '@zos/i18n'
 
 Page({
   build() {
-    console.log(gettext('example'))
+    console.log(getText('example'))
   }
 })

package/private-modules/zeppos-app-utils/dist/tools/tools.js

@@ -0,0 +1,14 @@
+"use strict";
+exports.__esModule = true;
+exports.compareVersion = exports.versionToCode = void 0;
+var versionToCode = function (version) {
+    if (!version)
+        return 0;
+    var _a = version.split('.').map(function (val) { return Number(val); }), _b = _a[0], p0 = _b === void 0 ? 0 : _b, _c = _a[1], p1 = _c === void 0 ? 0 : _c, _d = _a[2], p2 = _d === void 0 ? 0 : _d;
+    return p0 * 10000 + p1 * 100 + p2;
+};
+exports.versionToCode = versionToCode;
+var compareVersion = function (version1, version2) {
+    return (0, exports.versionToCode)(version2) - (0, exports.versionToCode)(version1);
+};
+exports.compareVersion = compareVersion;

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

@@ -12,7 +12,7 @@
     "clean": "rm -rf node_modules && rm -rf dist"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.9.13-beta",
+    "@zeppos/zpm": "^2.9.18-beta",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",