@zeppos/zeus-cli 1.5.14 → 1.5.16

package/modules/create.js

@@ -55,7 +55,7 @@ var path_1 = require("path");
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var AppType = zeppos_app_utils_1.config.AppType, getDeviceConf = zeppos_app_utils_1.config.getDeviceConf;
 var inquirerFunc = function (args, _a) {
-    var appTemplateChoices = _a.appTemplateChoices, watchfaceTemplateChoices = _a.watchfaceTemplateChoices;
+    var appTemplateChoices = _a.appTemplateChoices, workoutExtTemplateChoices = _a.workoutExtTemplateChoices, watchfaceTemplateChoices = _a.watchfaceTemplateChoices;
     return __awaiter(void 0, void 0, void 0, function () {
         var _b, promptAppType, _c, promptOsVersion, _d, promptTemplate, _e, promptWithAppSide, _f, promptWithSettings, _g, promptBuildTargets, _h, configVersion, _j, deviceTargets, OSV2DeviceTargetNames;
         return __generator(this, function (_k) {
@@ -81,11 +81,14 @@ var inquirerFunc = function (args, _a) {
                                 name: 'OSVersion',
                                 type: 'list',
                                 when: function (args) {
+                                    var isWorkoutExtension = args.appType.toLowerCase() === AppType.WORKOUT_EXTENSION;
                                     var bool = !promptOsVersion || !['v1', 'v2'].includes(promptOsVersion);
                                     if (!bool) {
                                         args.OSVersion = promptOsVersion;
                                     }
-                                    return bool;
+                                    if (isWorkoutExtension)
+                                        args.OSVersion = 'v3.5';
+                                    return bool && !isWorkoutExtension;
                                 },
                                 message: 'Which OS version API to develop with?',
                                 choices: function (args) {
@@ -135,6 +138,29 @@ var inquirerFunc = function (args, _a) {
                                     ], val, true);
                                 }
                             },
+                            {
+                                name: 'template',
+                                type: 'list',
+                                when: function (args) {
+                                    var isWorkoutExtension = args.appType.toLowerCase() === AppType.WORKOUT_EXTENSION;
+                                    var objMap = workoutExtTemplateChoices[args.OSVersion].find(function (val) {
+                                        var name = val.name === 'Hello World' ? 'Hello_World' : val.name;
+                                        return name === promptTemplate;
+                                    });
+                                    if (isWorkoutExtension && objMap) {
+                                        args.template = objMap.value;
+                                    }
+                                    return isWorkoutExtension && !objMap;
+                                },
+                                message: 'Which app template do you want to use?',
+                                choices: function (args) {
+                                    var val = workoutExtTemplateChoices[args.OSVersion] || [];
+                                    return __spreadArray([
+                                        new inquirer_1["default"].Separator(),
+                                        new inquirer_1["default"].Separator('Choose a app template')
+                                    ], val, true);
+                                }
+                            },
                             {
                                 name: 'template',
                                 type: 'list',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "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.24",
+    "@zeppos/zpm": "^3.0.25",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",

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

@@ -12,6 +12,7 @@ var fs_extra_1 = __importDefault(require("fs-extra"));
 var AppType;
 (function (AppType) {
     AppType["APP"] = "app";
+    AppType["WORKOUT_EXTENSION"] = "workout_extension";
     AppType["WATCHFACE"] = "watchface";
 })(AppType = exports.AppType || (exports.AppType = {}));
 var AppSourceType;

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

@@ -101,7 +101,7 @@ var projectPreInstall = function (dir) {
 var createX = function (cwdPath, args, func, beforeFiles) {
     if (beforeFiles === void 0) { beforeFiles = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var cmd, _a, projectName, _b, configVersion, workDir, templateDir, localTemplatesDirMap, localTemplates, allOS, appTypes, genChoices, localChoices, watchfaceTemplateChoices, appTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
+        var cmd, _a, projectName, _b, configVersion, workDir, templateDir, localTemplatesDirMap, localTemplates, allOS, appTypes, genChoices, localChoices, watchfaceTemplateChoices, appTemplateChoices, workoutExtTemplateChoices, getTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -112,20 +112,23 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     localTemplatesDirMap = {
                         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: (0, path_1.resolve)(templateDir, './os3.0'),
+                        'v3.5': (0, path_1.resolve)(templateDir, './os3.5')
                     };
                     localTemplates = Object.keys(localTemplatesDirMap).reduce(function (temps, osVersion) {
                         var dir = localTemplatesDirMap[osVersion];
                         var appDir = "".concat(dir, "/app");
                         var watchfaceDir = "".concat(dir, "/watchface");
+                        var workoutExtensionDir = "".concat(dir, "/workout-extension");
                         temps[osVersion] = {
                             app: (0, fs_1.existsSync)(appDir) ? (0, fs_1.readdirSync)(appDir) : [],
-                            watchface: (0, fs_1.existsSync)(watchfaceDir) ? (0, fs_1.readdirSync)(watchfaceDir) : []
+                            watchface: (0, fs_1.existsSync)(watchfaceDir) ? (0, fs_1.readdirSync)(watchfaceDir) : [],
+                            'workout-extension': (0, fs_1.existsSync)(workoutExtensionDir) ? (0, fs_1.readdirSync)(workoutExtensionDir) : []
                         };
                         return temps;
                     }, {});
-                    allOS = ['v1', 'v2', 'v3'];
-                    appTypes = ['watchface', 'app'];
+                    allOS = ['v1', 'v2', 'v3', 'v3.5'];
+                    appTypes = ['watchface', 'app', 'workout-extension'];
                     genChoices = function () { return allOS.reduce(function (pre, osVersion) {
                         pre[osVersion] = [];
                         return pre;
@@ -133,9 +136,17 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     localChoices = genChoices();
                     watchfaceTemplateChoices = { v1: [], v2: [] };
                     appTemplateChoices = genChoices();
+                    workoutExtTemplateChoices = { 'v3.5': [] };
+                    getTemplateChoices = function (appType) {
+                        switch (appType) {
+                            case 'app': return appTemplateChoices;
+                            case 'watchface': return watchfaceTemplateChoices;
+                            case 'workout-extension': return workoutExtTemplateChoices;
+                        }
+                    };
                     templatesInit = function (os, dir) {
                         var initTemp = function (appType, dirPath, dirName) {
-                            var tempChoices = appType === 'app' ? appTemplateChoices : watchfaceTemplateChoices;
+                            var tempChoices = getTemplateChoices(appType);
                             var tempName = (0, lodash_1.startCase)(dirName);
                             var chooseItem = {
                                 name: tempName,
@@ -201,18 +212,25 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     };
                     choicesValueFormat(localChoices);
                     choicesValueFormat(appTemplateChoices);
+                    choicesValueFormat(workoutExtTemplateChoices);
                     choicesValueFormat(watchfaceTemplateChoices);
                     return [4, func(args, {
                             appTemplateChoices: appTemplateChoices,
+                            workoutExtTemplateChoices: workoutExtTemplateChoices,
                             watchfaceTemplateChoices: watchfaceTemplateChoices
                         })];
                 case 1:
                     answer = _c.sent();
                     answer.appType = answer.appType || AppType.APP;
                     answer.workDir = workDir;
-                    choosePkg = answer.appType.toLowerCase() === AppType.APP
-                        ? appTemplateChoices[answer.OSVersion][answer.template]
-                        : watchfaceTemplateChoices[answer.OSVersion][answer.template];
+                    choosePkg = (function (appType) {
+                        switch (appType.toLowerCase()) {
+                            case AppType.APP: return appTemplateChoices[answer.OSVersion][answer.template];
+                            case AppType.WORKOUT_EXTENSION: return workoutExtTemplateChoices[answer.OSVersion][answer.template];
+                            case AppType.WATCHFACE: return watchfaceTemplateChoices[answer.OSVersion][answer.template];
+                            default: return appTemplateChoices[answer.OSVersion][answer.template];
+                        }
+                    })(answer.appType || AppType.APP);
                     index_1.logger.info('fetching template...');
                     return [4, (0, index_1.sleep)(100)];
                 case 2:

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

@@ -87,7 +87,10 @@ var fetchDevicesData = function (cdnUrl) {
             reject(new Error('CDN URL is missing'));
             process.exit(1);
         }
-        axios_1["default"].get(cdnUrl).then(function (res) {
+        cdnUrl = cdnUrl + (cdnUrl.includes('?') ? '&' : '?') + 'no-cache=' + Date.now();
+        axios_1["default"].get(cdnUrl, {
+            headers: { 'Cache-Control': 'no-cache' }
+        }).then(function (res) {
             if (res.status === 200) {
                 var data = res.data;
                 resolve(data);

package/private-modules/zeppos-app-utils/dist/public/template/os3.5/workout-extension/running-pace-master/_package.json

@@ -0,0 +1,14 @@
+{
+  "name": "RunningPaceMaster",
+  "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"
+  }
+}

package/private-modules/zeppos-app-utils/dist/public/template/os3.5/workout-extension/running-pace-master/app.js

@@ -0,0 +1,17 @@
+App({
+  globalData: {},
+
+  onCreate(options) {},
+
+  onShow(options) {},
+
+  onHide(options) {},
+
+  onDestroy(options) {},
+
+  onError(error) {},
+
+  onPageNotFound(obj) {},
+
+  onUnhandledRejection(obj) {},
+});

package/private-modules/zeppos-app-utils/dist/public/template/os3.5/workout-extension/running-pace-master/app.json

@@ -0,0 +1,365 @@
+{
+  "configVersion": "v3",
+  "app": {
+    "appId": 1047460,
+    "appName": "Running Pace Master",
+    "appType": "app",
+    "extType": "workout",
+    "version": {
+      "code": 1,
+      "name": "1.0.1"
+    },
+    "icon": "icon.png",
+    "vender": "huami",
+    "description": ""
+  },
+  "permissions": [],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "3.6",
+      "target": "3.6",
+      "minVersion": "3.6"
+    }
+  },
+  "targets": {
+    "common": {
+      "module": {
+        "data-widget": {
+          "widgets": [
+            {
+              "path": "data-widget/common/index",
+              "name": "Running Pace Master",
+              "icon": "icon.png",
+              "window": {
+                "isPinned": 1
+              },
+              "runtime": {
+                "ability": [
+                  {
+                    "type": 1,
+                    "subType": []
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      },
+      "platforms": [
+        {
+          "st": "r"
+        }
+      ],
+      "designWidth": 480
+    }
+  },
+  "i18n": {
+    "ar-EG": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "ca-ES": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "cs-CZ": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "da-DK": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "de-DE": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "el-GR": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "en-US": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "es-ES": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "fi-FI": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "fr-FR": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "iw-IL": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "hi-IN": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "hu-HU": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "id-ID": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "it-IT": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "ja-JP": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "ko-KR": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "ms-MY": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "nb-NO": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "nl-NL": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "pl-PL": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "pt-PT": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "pt-BR": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "ro-RO": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "ru-RU": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "sk-SK": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "sr-RS": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "sv-SE": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "th-TH": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "tr-TR": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "uk-UA": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "vi-VN": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "Running Pace Master"
+          }
+        ]
+      }
+    },
+    "zh-CN": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "跑步配速大师"
+          }
+        ]
+      }
+    },
+    "zh-TW": {
+      "data-widget": {
+        "widgets": [
+          {
+            "name": "跑步配速大師"
+          }
+        ]
+      }
+    }
+  },
+  "defaultLanguage": "en-US"
+}

package/private-modules/zeppos-app-utils/dist/public/template/os3.5/workout-extension/running-pace-master/data-widget/common/index.js

@@ -0,0 +1,141 @@
+import { createWidget, widget, align, text_style, sport_data, edit_widget_group_type } from '@zos/ui'
+
+DataWidget({
+  init() {
+    const bg = createWidget(widget.IMG, {
+      x: 0,
+      y: 0,
+      src: 'bg.png'
+    })
+    const text = createWidget(widget.TEXT, {
+      x: 240,
+      y: 82,
+      w: 150,
+      h: 85,
+      color: 0xffffff,
+      text_size: 30,
+      align_h: align.CENTER_H,
+      align_v: align.CENTER_V,
+      text_style: text_style.NONE,
+      text: 'BPM'
+    })
+
+    // Calorie
+    const widgetOptionalArray1 = [sport_data.CONSUME]
+    createWidget(widget.SPORT_DATA, {
+      edit_id: 1,
+      x: 60,
+      y: 310,
+      w: 104,
+      h: 120,
+      category: edit_widget_group_type.SPORTS,
+      default_type: sport_data.CONSUME,
+      optional_types: widgetOptionalArray1,
+      count: widgetOptionalArray1.length,
+      rect_visible: false,
+      line_color: 0x000000,
+      text_size: 50,
+      text_color: 0xffffff,
+      text_x: 0,
+      text_y: 0,
+      text_w: 170,
+      text_h: 85,
+      sub_text_visible: true,
+      sub_text_size: 24,
+      sub_text_color: 0x999999,
+      sub_text_x: 35,
+      sub_text_y: 80,
+      sub_text_w: 100,
+      sub_text_h: 30
+    })
+
+    // Distance
+    const widgetOptionalArray2 = [sport_data.DISTANCE_TOTAL]
+    createWidget(widget.SPORT_DATA, {
+      edit_id: 2,
+      x: 195,
+      y: 310,
+      w: 104,
+      h: 120,
+      category: edit_widget_group_type.SPORTS,
+      default_type: sport_data.DISTANCE_TOTAL,
+      optional_types: widgetOptionalArray2,
+      count: widgetOptionalArray2.length,
+      line_color: 0x000000,
+      text_size: 50,
+      rect_visible: false,
+      text_color: 0xffffff,
+      text_x: 0,
+      text_y: 0,
+      text_w: 210,
+      text_h: 85,
+      sub_text_visible: true,
+      sub_text_size: 24,
+      sub_text_color: 0x999999,
+      sub_text_x: 60,
+      sub_text_y: 80,
+      sub_text_w: 100,
+      sub_text_h: 30
+    })
+
+    // Pace
+    const widgetOptionalArray3 = [sport_data.PACE]
+    createWidget(widget.SPORT_DATA, {
+      edit_id: 3,
+      x: -5,
+      y: 170,
+      w: 168,
+      h: 135,
+      category: edit_widget_group_type.SPORTS,
+      default_type: sport_data.PACE,
+      optional_types: widgetOptionalArray3,
+      count: widgetOptionalArray3.length,
+      line_width: 0,
+      rect_visible: false,
+      line_color: 0xc1e002,
+      text_size: 90,
+      text_color: 0x000000,
+      text_x: 0,
+      text_y: 0,
+      text_w: 300,
+      text_h: 100,
+      sub_text_visible: true,
+      sub_text_size: 40,
+      sub_text_color: 0xffffff,
+      sub_text_x: 330,
+      sub_text_y: 15,
+      sub_text_w: 100,
+      sub_text_h: 100
+    })
+
+    // Heartrate
+    const widgetOptionalArray = [sport_data.HR]
+    createWidget(widget.SPORT_DATA, {
+      edit_id: 4,
+      x: 160,
+      y: 82,
+      w: 89,
+      h: 84,
+      category: edit_widget_group_type.SPORTS,
+      default_type: sport_data.HR,
+      optional_types: widgetOptionalArray,
+      count: widgetOptionalArray.length,
+      rect_visible: false,
+      line_color: 0x000000,
+      text_size: 50,
+      text_color: 0xffffff,
+      text_x: 0,
+      text_y: 0,
+      text_w: 130,
+      text_h: 85,
+      sub_text_visible: false
+    })
+  },
+
+  build() {
+    this.init()
+  },
+  onInit() {},
+
+  onDestroy() {}
+})

package/private-modules/zeppos-app-utils/dist/public/template/os3.5/workout-extension/running-pace-master/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/os3.5/workout-extension/running-pace-master/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/package.json

@@ -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.24",
+    "@zeppos/zpm": "^3.0.25",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",