@zeppos/zeus-cli 1.6.7-beta3 → 1.6.7

package/bin/main.js

@@ -50,7 +50,7 @@ var pre_check_1 = require("../utils/pre-check");
 var index_1 = require("../index");
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var tools_1 = require("../utils/tools");
-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, fetchDevices = zeppos_app_utils_1.modules.fetchDevices;
+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, devicesData = zeppos_app_utils_1.modules.fetchDevices;
 var context = {};
 var yargsCmdBuilderFunc = function (cmdName, useProxy, yargs) {
     if (useProxy === void 0) { useProxy = false; }
@@ -59,6 +59,17 @@ var yargsCmdBuilderFunc = function (cmdName, useProxy, yargs) {
         return index_1.yargsCmdBuilders[cmdName](yargs);
     }
 };
+var fetchDevices = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var zeusVer;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                zeusVer = (0, index_1.zeusCurrentVersion)();
+                return [4, devicesData(zeusVer)];
+            case 1: return [2, _a.sent()];
+        }
+    });
+}); };
 var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var res;
     return __generator(this, function (_a) {

package/modules/build.js

@@ -83,6 +83,7 @@ var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var tools_1 = require("../utils/tools");
+var chalk_1 = __importDefault(require("chalk"));
 var AppType = zeppos_app_utils_1.config.AppType, getDeviceConf = zeppos_app_utils_1.config.getDeviceConf;
 var appJsonPath = path.resolve('./app.json');
 var appJsonContent = fs_extra_1["default"].readJSONSync(appJsonPath, { throws: false });
@@ -163,6 +164,7 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                 case 3:
                     answers = _a;
                     return [2, {
+                            device: answers.device,
                             sources: (0, lodash_1.get)(targetDevices, "[".concat(answers.device, "].platforms"), []).reduce(function (list, item) {
                                 list.push(Number(item.deviceSource));
                                 return (0, lodash_1.uniq)((0, lodash_1.compact)(list));
@@ -321,7 +323,7 @@ var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, funct
 }); };
 exports.buildProd = buildProd;
 var buildPreview = function (args, callback) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, curCommand, curBridgeTarget, buildMode, appType, _b, _c, _d, buildInfo;
+    var _a, curCommand, curBridgeTarget, buildMode, appType, appName, appVersion, _b, _c, _d, buildDevice, buildInfo;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
@@ -331,11 +333,14 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
                     : BuildMode.PREVIEW;
                 zeppos_app_utils_1.logger.info('building...');
                 appType = (0, lodash_1.get)(appJsonContent, 'app.appType');
+                appName = (0, lodash_1.get)(appJsonContent, 'app.appName');
+                appVersion = (0, lodash_1.get)(appJsonContent, 'app.version.name');
                 _c = (_b = Object).assign;
                 _d = [args];
                 return [4, (0, exports.chooseBuildPackages)(BuildMode.PREVIEW, args)];
             case 1:
                 _c.apply(_b, _d.concat([_e.sent()]));
+                buildDevice = args.device;
                 return [4, zeppos_app_utils_1.modules.buildSupportV3Config(path.resolve('./'), buildMode, __assign(__assign({}, args), { renameWithAppId: (0, lodash_1.get)(appJsonContent, 'app.appId') }))];
             case 2:
                 buildInfo = _e.sent();
@@ -348,10 +353,11 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
                                 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"])()
+                                    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("This QR code will expire on ".concat((0, dayjs_1["default"])()
                                         .add(7, 'days')
                                         .format('YYYY-MM-DD HH:mm:ss'), "."));
+                                    zeppos_app_utils_1.logger.log("[".concat(chalk_1["default"].cyan(buildDevice), "] ").concat(appName, "-").concat(appVersion));
                                     qrcode_terminal_1["default"].generate(res.url, { small: true });
                                     callback && callback(res);
                                     return [3, 4];

package/modules/create.js

@@ -104,6 +104,9 @@ var inquirerFunc = function (args, _a) {
                                         {
                                             name: 'OS 3.0 API (Build products can run on devices with OS 3.0 and above)',
                                             value: 'v3'
+                                        }, {
+                                            name: 'OS 4.0 API (Build products can run on devices with OS 4.0 and above)',
+                                            value: 'v4'
                                         }];
                                     if (isWatchFace) {
                                         options = options.slice(0, 2);

package/modules/version.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 exports.__esModule = true;
-exports.version = void 0;
+exports.zeusCurrentVersion = exports.version = void 0;
 var node_child_process_1 = require("node:child_process");
 var appUtilPkg = require('zeppos-app-utils/package.json');
 var zeusVersion = require('../package.json').version;
@@ -34,3 +34,7 @@ function version() {
     ].join('\n');
 }
 exports.version = version;
+function zeusCurrentVersion() {
+    return zeusVersion;
+}
+exports.zeusCurrentVersion = zeusCurrentVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.6.7-beta3",
+  "version": "1.6.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.7.2",
-    "@zeppos/zpm": "^3.1.13-beta2",
+    "@zeppos/zpm": "^3.1.5",
     "axios": "^1.7.7",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
@@ -32,7 +32,7 @@
     "fs-extra": "^10.1.0",
     "get-port": "5.1.1",
     "inquirer": "^8.2.6",
-    "is-docker": "^2.1.1",
+    "is-docker": "^2.2.1",
     "is-wsl": "^2.2.0",
     "lodash": "^4.17.21",
     "parse-gitignore": "^2.0.0",

package/private-modules/zeppos-app-utils/dist/logger/index.js

@@ -36,16 +36,16 @@ var LoggerInstance = (function () {
         console.log.apply(console, args);
     };
     LoggerInstance.prototype.info = function (msg) {
-        console.log(chalk_1["default"].blue('info '), msg);
+        console.log(chalk_1["default"].blue('[ℹ]'), msg);
     };
     LoggerInstance.prototype.warn = function (msg) {
-        console.log(chalk_1["default"].keyword('orange')('warning '), msg);
+        console.log(chalk_1["default"].keyword('orange')('[⚠]'), msg);
     };
     LoggerInstance.prototype.success = function (msg) {
-        console.log(chalk_1["default"].green('success '), msg);
+        console.log(chalk_1["default"].green('[✔]'), msg);
     };
     LoggerInstance.prototype.error = function (msg) {
-        console.log(chalk_1["default"].red('error '), msg);
+        console.log(chalk_1["default"].red('[✘]'), msg);
     };
     return LoggerInstance;
 }());

package/private-modules/zeppos-app-utils/dist/modules/create/index.js

@@ -117,7 +117,8 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                         v1: (0, path_1.resolve)(templateDir, './os1.0'),
                         v2: (0, path_1.resolve)(templateDir, './os2.0'),
                         v3: (0, path_1.resolve)(templateDir, './os3.0'),
-                        'v3.5': (0, path_1.resolve)(templateDir, './os3.5')
+                        'v3.5': (0, path_1.resolve)(templateDir, './os3.5'),
+                        v4: (0, path_1.resolve)(templateDir, './os4.0')
                     };
                     localTemplates = Object.keys(localTemplatesDirMap).reduce(function (temps, osVersion) {
                         var dir = localTemplatesDirMap[osVersion];
@@ -131,14 +132,14 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                         };
                         return temps;
                     }, {});
-                    allOS = ['v1', 'v2', 'v3', 'v3.5'];
+                    allOS = ['v1', 'v2', 'v3', 'v3.5', 'v4'];
                     appTypes = ['watchface', 'app', 'workout-extension'];
                     genChoices = function () { return allOS.reduce(function (pre, osVersion) {
                         pre[osVersion] = [];
                         return pre;
                     }, {}); };
                     localChoices = genChoices();
-                    watchfaceTemplateChoices = { v1: [], v2: [], 'v3': [], 'v3.5': [] };
+                    watchfaceTemplateChoices = { v1: [], v2: [] };
                     appTemplateChoices = genChoices();
                     workoutExtTemplateChoices = { 'v3.5': [] };
                     getTemplateChoices = function (appType) {

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

@@ -52,8 +52,8 @@ var chalk_1 = __importDefault(require("chalk"));
 var accountEnv = (0, config_1.getLocalConfig)().account_env;
 var dayMS = 24 * 60 * 60 * 1000;
 var LOCAL_CACHE_DEVICE_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_devices");
-var serverPath = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
-var serverPathBeta = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.beta1.json';
+var serverPath = accountEnv === 'test' ? 'https://upload-testing-cdn.huami.com/zeppos/devkit/zeus/devices.json' : 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
+var serverPathBeta = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.beta.json';
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
@@ -82,41 +82,50 @@ var fetchDevicesData = function (cdnUrl) {
         });
     });
 };
-var fetchDevices = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var localContent, now, prodDevices, betaDevices;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                localContent = {};
-                if (fs_1["default"].existsSync(LOCAL_CACHE_DEVICE_PATH)) {
-                    try {
-                        localContent = fs_extra_1["default"].readJsonSync(LOCAL_CACHE_DEVICE_PATH);
+var fetchDevices = function (currentVersion) {
+    if (currentVersion === void 0) { currentVersion = ''; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var localContent, generatedVersion, now, prodDevices, betaDevices;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    localContent = {};
+                    if (fs_1["default"].existsSync(LOCAL_CACHE_DEVICE_PATH)) {
+                        try {
+                            localContent = fs_extra_1["default"].readJsonSync(LOCAL_CACHE_DEVICE_PATH);
+                        }
+                        catch (_e) { }
                     }
-                    catch (_e) { }
-                }
-                now = Date.now().valueOf();
-                if (!!((0, lodash_1.get)(localContent, 'expiredTime') > now)) return [3, 3];
-                logger_1.logger.log(chalk_1["default"].hex('#DB8C41')('Updating devices, waiting ...'));
-                return [4, fetchDevicesData(serverPath)];
-            case 1:
-                prodDevices = _a.sent();
-                return [4, fetchDevicesData(serverPathBeta)];
-            case 2:
-                betaDevices = _a.sent();
-                if (!(0, lodash_1.isEmpty)(prodDevices) || !(0, lodash_1.isEmpty)(betaDevices)) {
-                    fs_extra_1["default"].writeJsonSync(LOCAL_CACHE_DEVICE_PATH, {
-                        devices: prodDevices,
-                        devices_beta: betaDevices,
-                        expiredTime: now + 3 * dayMS
-                    });
-                }
-                else {
-                    return [2, {}];
-                }
-                return [3, 4];
-            case 3: return [2, {}];
-            case 4: return [2];
-        }
+                    generatedVersion = (0, lodash_1.get)(localContent, 'version') || '';
+                    if (generatedVersion === '' || generatedVersion !== currentVersion) {
+                        fs_extra_1["default"].removeSync(LOCAL_CACHE_DEVICE_PATH);
+                        localContent = {};
+                    }
+                    now = Date.now().valueOf();
+                    if (!!((0, lodash_1.get)(localContent, 'expiredTime') > now)) return [3, 3];
+                    logger_1.logger.log(chalk_1["default"].hex('#DB8C41')('Updating devices, waiting ...'));
+                    return [4, fetchDevicesData(serverPath)];
+                case 1:
+                    prodDevices = _a.sent();
+                    return [4, fetchDevicesData(serverPathBeta)];
+                case 2:
+                    betaDevices = _a.sent();
+                    if (!(0, lodash_1.isEmpty)(prodDevices) || !(0, lodash_1.isEmpty)(betaDevices)) {
+                        fs_extra_1["default"].writeJsonSync(LOCAL_CACHE_DEVICE_PATH, {
+                            devices: prodDevices,
+                            devices_beta: [],
+                            expiredTime: now + 3 * dayMS,
+                            version: currentVersion
+                        });
+                    }
+                    else {
+                        return [2, {}];
+                    }
+                    return [3, 4];
+                case 3: return [2, {}];
+                case 4: return [2];
+            }
+        });
     });
-}); };
+};
 exports.fetchDevices = fetchDevices;

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/_package.json

@@ -0,0 +1,17 @@
+{
+  "name": "calories",
+  "version": "1.0.0",
+  "description": "",
+  "main": "app.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@zeppos/device-types": "^3.0.0"
+  },
+  "dependencies": {
+    "@zeppos/zml": "^0.0.38"
+  }
+}

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/app.js

@@ -0,0 +1,27 @@
+import { log as Logger } from "@zos/utils";
+import LocalStorage from "./utils/storage";
+
+const logger = Logger.getLogger("calories-app");
+const fileName = "calorie_data.txt";
+
+App({
+  globalData: {
+    foodType: "chocolate",
+    localStorage: null,
+  },
+  onCreate() {
+    try {
+      this.globalData.localStorage = new LocalStorage(fileName);
+      const { foodType = "chocolate" } = this.globalData.localStorage.get();
+      this.globalData.foodType = foodType;
+    } catch (e) {
+      logger.log("--->e:", e);
+    }
+  },
+
+  onDestroy() {
+    this.globalData.localStorage.set({
+      foodType: getApp()._options.globalData.foodType,
+    });
+  },
+});

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/app.json

@@ -0,0 +1,52 @@
+{
+  "configVersion": "v3",
+  "app": {
+    "appId": 20001,
+    "appName": "Calories",
+    "appType": "app",
+    "version": {
+      "code": 1,
+      "name": "1.0.0"
+    },
+    "icon": "icon.png",
+    "vender": "zepp",
+    "description": "calories application"
+  },
+  "permissions": [
+    "data:os.device.info",
+    "device:os.local_storage",
+    "data:user.hd.calorie"
+  ],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "4.0",
+      "target": "4.0",
+      "minVersion": "4.0"
+    }
+  },
+  "targets": {
+    "gt": {
+      "module": {
+        "page": {
+          "pages": ["page/gt/index", "page/gt/food-list"]
+        }
+      },
+      "platforms": [
+        {
+          "st": "r",
+          "dw": 480
+        },
+        {
+          "st": "s",
+          "dw": 390
+        }
+      ]
+    }
+  },
+  "i18n": {
+    "en-US": {
+      "appName": "Calories"
+    }
+  },
+  "defaultLanguage": "en-US"
+}

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/global.d.ts

@@ -0,0 +1 @@
+/// <reference path="node_modules/@zeppos/device-types/dist/index.d.ts" />

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/jsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "checkJs": true
+  },
+  "exclude": ["node_modules", "**/node_modules/*"],
+  "files": ["node_modules/@zeppos/device-types/dist/index.d.ts"]
+}

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/page/gt/food-list.js

@@ -0,0 +1,107 @@
+import * as hmUI from "@zos/ui";
+import { back } from "@zos/router";
+import { log as Logger, px } from "@zos/utils";
+
+import {
+  COMMON_TITLE_TEXT,
+  FOOD_LIST_Y,
+  FOOD_LIST_ITEM_MARGIN,
+  FOOD_LIST_ITEM_HEIGHT,
+  FOOD_LIST_RADIOGROUP,
+  FOOD_LIST_RADIO_ITEM,
+  FOOD_LIST_RADIO_ITEM_TEXT,
+} from "zosLoader:./food-list.[pf].layout.js";
+import { FOOD_CALORIES, isSquare } from "../../utils/constants";
+const logger = Logger.getLogger("calories");
+const globalData = getApp()._options.globalData;
+
+Page({
+  state: {
+    activeIndex: -1,
+    isFinishInit: false,
+    radioGroup: null,
+    radioButtonsArray: [],
+  },
+  onInit() {
+    logger.log("onInit");
+  },
+  setPrograms(index) {
+    this.state.activeIndex = index;
+    globalData.foodType = FOOD_CALORIES[index].type;
+    back();
+  },
+  buildTitle() {
+    !isSquare && hmUI.createWidget(hmUI.widget.TEXT, COMMON_TITLE_TEXT);
+  },
+  buildFoodList() {
+    let activeIndex = 0;
+    const radioGroup = hmUI.createWidget(hmUI.widget.RADIO_GROUP, {
+      ...FOOD_LIST_RADIOGROUP,
+      check_func: (group, index, checked) => {
+        if (checked) {
+          this.state.isFinishInit && this.setPrograms(index);
+        }
+      },
+    });
+
+    this.state.radioGroup = radioGroup;
+
+    for (let index = 0; index < FOOD_CALORIES.length; index++) {
+      this.buildRadioButton(index);
+      this.buildRadioText(index);
+      activeIndex =
+        FOOD_CALORIES[index].type === globalData.foodType ? index : activeIndex;
+    }
+    this.state.activeIndex = activeIndex;
+    this.initRadioGroup();
+  },
+  buildElement() {
+    this.buildTitle();
+    this.buildFoodList();
+  },
+  buildRadioButton(index) {
+    const radio = this.state.radioGroup.createWidget(hmUI.widget.STATE_BUTTON, {
+      ...FOOD_LIST_RADIO_ITEM.styles,
+      y: px(index * (FOOD_LIST_ITEM_HEIGHT + FOOD_LIST_ITEM_MARGIN)),
+    });
+    this.state.radioButtonsArray.push(radio);
+  },
+  buildRadioText(index) {
+    const text = hmUI.createWidget(hmUI.widget.TEXT, {
+      ...FOOD_LIST_RADIO_ITEM_TEXT,
+      y: px(
+        FOOD_LIST_Y + index * (FOOD_LIST_ITEM_HEIGHT + FOOD_LIST_ITEM_MARGIN)
+      ),
+      text: `${FOOD_CALORIES[index].name[0].toUpperCase()}${FOOD_CALORIES[
+        index
+      ].name.slice(1)}`,
+    });
+    text.addEventListener(hmUI.event.SELECT, () => {
+      this.state.radioGroup.setProperty(
+        hmUI.prop.CHECKED,
+        this.state.radioButtonsArray[index]
+      );
+    });
+  },
+  initRadioGroup() {
+    this.state.radioGroup.setProperty(
+      hmUI.prop.INIT,
+      this.state.radioButtonsArray[0]
+    );
+    this.state.radioGroup.setProperty(
+      hmUI.prop.CHECKED,
+      this.state.radioButtonsArray[this.state.activeIndex]
+    );
+    this.state.isFinishInit = true;
+  },
+  build() {
+    this.buildElement();
+  },
+  onReady() {},
+
+  onShow() {},
+
+  onHide() {},
+
+  onDestroy() {},
+});

package/private-modules/zeppos-app-utils/dist/public/template/os4.0/app/calories/page/gt/food-list.r.layout.js

@@ -0,0 +1,48 @@
+import * as hmUI from "@zos/ui";
+import { getText } from "@zos/i18n";
+import { px } from "@zos/utils";
+
+import { DEVICE_WIDTH } from "../../utils/constants";
+
+export const COMMON_TITLE_TEXT = {
+  text: getText("calories"),
+  x: px(96),
+  y: px(40),
+  w: DEVICE_WIDTH - 2 * px(96),
+  h: px(46),
+  color: 0xffffff,
+  text_size: px(36),
+  align_h: hmUI.align.CENTER_H,
+  align_v: hmUI.align.CENTER_V,
+  text_style: hmUI.text_style.WRAP,
+};
+
+export const FOOD_LIST_Y = px(178);
+export const FOOD_LIST_ITEM_MARGIN = px(64);
+export const FOOD_LIST_ITEM_HEIGHT = px(64);
+export const FOOD_LIST_RADIOGROUP = {
+  select_src: "selected.png",
+  unselect_src: "unselected.png",
+  x: px(44),
+  y: px(FOOD_LIST_Y),
+  w: -1,
+  h: -1,
+};
+
+export const FOOD_LIST_RADIO_ITEM = {
+  x: 0,
+  y: 0,
+  w: px(FOOD_LIST_ITEM_HEIGHT),
+  h: px(FOOD_LIST_ITEM_HEIGHT),
+};
+
+export const FOOD_LIST_RADIO_ITEM_TEXT = {
+  x: px(120),
+  y: 0,
+  w: px(360),
+  h: px(64),
+  color: 0xffffff,
+  text_size: px(32),
+  align_h: hmUI.align.LEFT,
+  align_v: hmUI.align.CENTER_V,
+};