@zeppos/zeus-cli 1.6.5 → 1.6.6

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "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.3",
+    "@zeppos/zpm": "^3.1.4",
     "axios": "^1.7.7",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",

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,7 +132,7 @@ 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] = [];

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,
+};

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

@@ -0,0 +1,33 @@
+import * as hmUI from "@zos/ui";
+import { px } from "@zos/utils";
+
+export const COMMON_TITLE_TEXT = null;
+export const FOOD_LIST_Y = px(96);
+export const FOOD_LIST_ITEM_MARGIN = px(60);
+export const FOOD_LIST_ITEM_HEIGHT = px(52);
+export const FOOD_LIST_RADIOGROUP = {
+  select_src: "selected.png",
+  unselect_src: "unselected.png",
+  x: px(30),
+  y: FOOD_LIST_Y,
+  w: -1,
+  h: -1,
+};
+
+export const FOOD_LIST_RADIO_ITEM = {
+  x: 0,
+  y: FOOD_LIST_Y,
+  w: FOOD_LIST_ITEM_HEIGHT,
+  h: FOOD_LIST_ITEM_HEIGHT,
+};
+
+export const FOOD_LIST_RADIO_ITEM_TEXT = {
+  x: px(106),
+  y: px(97),
+  w: px(254),
+  h: FOOD_LIST_ITEM_HEIGHT,
+  color: 0xffffff,
+  text_size: px(32),
+  align_h: hmUI.align.LEFT,
+  align_v: hmUI.align.CENTER_V,
+};

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

@@ -0,0 +1,127 @@
+import * as hmUI from "@zos/ui";
+import { push } from "@zos/router";
+import { getText } from "@zos/i18n";
+import { Calorie } from "@zos/sensor";
+import { log as Logger, px } from "@zos/utils";
+
+import {
+  CALORIE_TEXT,
+  CALORIE_TEXT_SIZE,
+  COMMON_TITLE_TEXT,
+  UNIT_TEXT,
+  UNIT_TEXT_SIZE,
+  TOTAL_CONSUME_TEXT,
+  CONSUME_ICON,
+  CONSUME_ICON_WIDTH,
+  ALIGN_DESC_GROUP,
+  IMGAE_CALORIES_MARIN,
+  CALORIES_UNIT_MARIN,
+  EQUIVALENT_TO_BUTTON,
+  EQUIVALENT_TO_FOOD_ICON,
+  EQUIVALENT_MORE_X,
+  EQUIVALENT_MARGIN,
+  EQUIVALENT_TO_FOOD_ICON_WIDTH,
+  EQUIVALENT_MORE_FOOD_ICON,
+  EQUIVALENT_MORE_FOOD_NUM,
+} from "zosLoader:./index.[pf].layout.js";
+import { FOOD_CALORIES, DEVICE_WIDTH, isSquare } from "../../utils/constants";
+const logger = Logger.getLogger("calories");
+const globalData = getApp()._options.globalData;
+
+Page({
+  buildTopContent(calories) {
+    const { width: w1 } = hmUI.getTextLayout("" + calories, {
+      text_size: CALORIE_TEXT_SIZE,
+      text_width: 0,
+      wrapped: 0,
+    });
+    const { width: w2 } = hmUI.getTextLayout(getText("unit"), {
+      text_size: UNIT_TEXT_SIZE,
+      text_width: 0,
+      wrapped: 0,
+    });
+
+    const w =
+      w1 + w2 + CONSUME_ICON_WIDTH + IMGAE_CALORIES_MARIN + CALORIES_UNIT_MARIN;
+    const x = Math.round((DEVICE_WIDTH - w) / 2);
+
+    const group = hmUI.createWidget(hmUI.widget.GROUP, {
+      ...ALIGN_DESC_GROUP,
+      x,
+      w,
+    });
+
+    group.createWidget(hmUI.widget.TEXT, {
+      ...CALORIE_TEXT,
+      text: `${calories}`,
+      x: CONSUME_ICON_WIDTH + IMGAE_CALORIES_MARIN,
+      w: w1,
+    });
+    group.createWidget(hmUI.widget.TEXT, {
+      ...UNIT_TEXT,
+      x: w - w2,
+      w: w2,
+    });
+    group.createWidget(hmUI.widget.IMG, CONSUME_ICON);
+  },
+  build() {
+    let calories = new Calorie().getCurrent(); // Math.floor(Math.random() * 1000)
+    let currentFood = globalData.foodType;
+
+    !isSquare && hmUI.createWidget(hmUI.widget.TEXT, COMMON_TITLE_TEXT);
+    hmUI.createWidget(hmUI.widget.TEXT, TOTAL_CONSUME_TEXT);
+
+    this.buildTopContent(calories);
+
+    let activeIndex = FOOD_CALORIES.findIndex(
+      (item) => item.type === currentFood
+    );
+    this.calculate(calories, FOOD_CALORIES[activeIndex]);
+    hmUI.createWidget(hmUI.widget.BUTTON, {
+      ...EQUIVALENT_TO_BUTTON,
+      click_func: () => {
+        push({
+          url: "page/gt/food-list",
+        });
+      },
+    });
+  },
+  calculate(currentCalories, foodData) {
+    let { value, type } = foodData;
+    let count = Math.floor(currentCalories / value);
+    if (count === 1 || count === 2 || count === 3) {
+      let x =
+        (DEVICE_WIDTH -
+          EQUIVALENT_TO_FOOD_ICON_WIDTH * count -
+          EQUIVALENT_MARGIN * (count - 1)) /
+        2;
+      for (let index = 0; index < count; index++) {
+        this.drawFood(
+          x + (EQUIVALENT_MARGIN + EQUIVALENT_TO_FOOD_ICON_WIDTH) * index,
+          type
+        ); // icon
+      }
+    } else {
+      this.drawFood(EQUIVALENT_MORE_X, type); // icon
+      hmUI.createWidget(hmUI.widget.IMG, EQUIVALENT_MORE_FOOD_ICON);
+      hmUI.createWidget(hmUI.widget.TEXT, {
+        ...EQUIVALENT_MORE_FOOD_NUM,
+        text: `${count}`,
+      });
+    }
+  },
+  drawFood(x, type) {
+    hmUI.createWidget(hmUI.widget.IMG, {
+      ...EQUIVALENT_TO_FOOD_ICON,
+      x: px(x),
+      src: `food/${type}.png`,
+    });
+  },
+  onReady() {},
+
+  onShow() {},
+
+  onHide() {},
+
+  onDestroy() {},
+});

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

@@ -0,0 +1,110 @@
+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 ALIGN_DESC_GROUP = {
+  x: 0,
+  y: px(118),
+  w: 0,
+  h: px(100),
+};
+export const IMGAE_CALORIES_MARIN = 0;
+export const CALORIES_UNIT_MARIN = px(8);
+export const CALORIE_TEXT_SIZE = px(100);
+export const CALORIE_TEXT = {
+  text: "",
+  x: 0,
+  y: 0,
+  w: 0,
+  h: px(100),
+  color: 0xffffff,
+  text_size: CALORIE_TEXT_SIZE,
+  align_h: hmUI.align.LEFT,
+  align_v: hmUI.align.CENTER_V,
+};
+export const UNIT_TEXT_SIZE = px(28);
+export const UNIT_TEXT = {
+  text: getText("unit"),
+  x: 0,
+  y: px(63),
+  w: 0,
+  h: px(34),
+  color: 0x999999,
+  text_size: UNIT_TEXT_SIZE,
+  align_h: hmUI.align.LEFT,
+  align_v: hmUI.align.CENTER_V,
+};
+
+export const TOTAL_CONSUME_TEXT = {
+  text: getText("consumption"),
+  x: px(40),
+  y: px(218),
+  w: DEVICE_WIDTH - 2 * px(40),
+  h: px(38),
+  color: 0x999999,
+  text_size: px(28),
+  align_h: hmUI.align.CENTER_H,
+  align_v: hmUI.align.CENTER_V,
+};
+
+export const EQUIVALENT_TO_BUTTON = {
+  text: getText("equivalent"),
+  press_color: 0x333333,
+  normal_color: 0x1a1a1a,
+  x: px(108),
+  y: px(376),
+  w: DEVICE_WIDTH - 2 * px(108),
+  h: px(56),
+  color: 0xffffff,
+  text_size: px(32),
+  radius: px(28),
+};
+
+export const CONSUME_ICON_WIDTH = px(48);
+export const CONSUME_ICON = {
+  src: "consume.png",
+  x: 0,
+  y: px(53),
+};
+
+export const EQUIVALENT_MARGIN = px(8);
+export const EQUIVALENT_MORE_X = px(155);
+export const EQUIVALENT_TO_FOOD_ICON_WIDTH = px(80);
+
+export const EQUIVALENT_TO_FOOD_ICON = {
+  src: "food/hamburger.png",
+  x: 0,
+  y: px(288),
+};
+
+export const EQUIVALENT_MORE_FOOD_ICON = {
+  src: "multiply.png",
+  x: px(243),
+  y: px(304),
+};
+
+export const EQUIVALENT_MORE_FOOD_NUM = {
+  text: "",
+  x: px(299),
+  y: px(294),
+  w: px(100),
+  h: px(60),
+  color: 0xee801e,
+  text_size: px(55),
+  align_h: hmUI.align.LEFT,
+  align_v: hmUI.align.CENTER_V,
+};