@zeppos/zeus-cli 1.3.0 → 1.3.1

package/modules/create.js

@@ -193,7 +193,7 @@ var inquirerFunc = function (args, _a) {
                                     new inquirer_1["default"].Separator(),
                                     new inquirer_1["default"].Separator('Choose the shape of the device'),
                                     { name: 'Round-screen smartwatch device', value: 'r', checked: true },
-                                    { name: 'Square-screen smartwatch device")', value: 's' },
+                                    { name: 'Square-screen smartwatch device', value: 's' },
                                     { name: 'Band device', value: 'b' },
                                 ],
                                 "default": 'r',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",

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

@@ -269,7 +269,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 466
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a[DeviceTarget.LILLE] = {
     deviceName: 'GTS 4',
@@ -289,7 +290,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 450
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a[DeviceTarget.VIENNA] = {
     deviceName: 'Falcon',
@@ -330,7 +332,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 454
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a[DeviceTarget.MONACO] = {
     deviceName: 'Amazfit Balance',
@@ -354,7 +357,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 480
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '3.99.99'
     }
 }, _a[DeviceTarget.SWIFT] = {
     deviceName: 'Runner (Round)',
@@ -409,7 +413,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         min: '1.0.0'
     }
 }, _a[DeviceTarget.HANNOVER] = {
-    deviceName: 'GTS 5 Active',
+    deviceName: 'Amazfit Active',
     platforms: [
         {
             name: DevicePlatformName.HANNOVER,
@@ -458,7 +462,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 380
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a), device_server_1["default"]);
 exports.OSV2Devices = Object.values(exports.deviceTargets).reduce(function (targetDevices, target) {

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

@@ -98,13 +98,10 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
                 fs_extra_1["default"].remove((0, path_1.resolve)(workDir, "./page/index.".concat(shape, ".layout.js")));
                 var platformsPathStr = 'targets.gt.platforms';
                 var platforms = lodash_1["default"].get(appJson, platformsPathStr);
-                console.log(platforms);
                 if (!Array.isArray(platforms))
                     return;
                 var filteredPlatforms = lodash_1["default"].filter(platforms, function (platform) { return platform.st !== shape; });
-                console.log('filteredPlatforms', filteredPlatforms);
                 lodash_1["default"].set(appJson, platformsPathStr, filteredPlatforms);
-                console.log(JSON.stringify(appJson));
             });
         }
         if (buildTargets && buildTargets.length) {

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

@@ -3,7 +3,7 @@ import { MessageBuilder } from "../shared/message";
 const messageBuilder = new MessageBuilder();
 
 // Simulating an asynchronous network request using Promise
-const mockAPI = async () => {
+async function mockAPI() {
   return new Promise((resolve, reject) => {
     setTimeout(() => {
       resolve({
@@ -17,17 +17,17 @@ const mockAPI = async () => {
   });
 };
 
-const fetchData = async (ctx) => {
+async function fetchData(ctx) {
   try {
     // Requesting network data using the fetch API
     // The sample program is for simulation only and does not request real network data, so it is commented here
     // Example of a GET method request
-    // const { body: { data = {} } = {} } = await fetch({
+    // const res = await fetch({
     //   url: 'https://xxx.com/api/xxx',
     //   method: 'GET'
     // })
     // Example of a POST method request
-    // const { body: { data = {} } = {} } = await fetch({
+    // const res = await fetch({
     //   url: 'https://xxx.com/api/xxx',
     //   method: 'POST',
     //   headers: {
@@ -39,11 +39,13 @@ const fetchData = async (ctx) => {
     // })
 
     // A network request is simulated here
-    const { body: { data = {} } = {} } = await mockAPI();
+    const res = await mockAPI()
+    const resBody = typeof res.body === 'string' ? JSON.parse(res.body) : res.body
 
     ctx.response({
-      data: { result: data },
-    });
+      data: { result: resBody.data },
+    })
+
   } catch (error) {
     ctx.response({
       data: { result: "ERROR" },
@@ -53,7 +55,7 @@ const fetchData = async (ctx) => {
 
 AppSideService({
   onInit() {
-    messageBuilder.listen(() => {});
+    messageBuilder.listen(() => { });
 
     messageBuilder.on("request", (ctx) => {
       const jsonRpc = messageBuilder.buf2Json(ctx.request.payload);
@@ -63,7 +65,7 @@ AppSideService({
     });
   },
 
-  onRun() {},
+  onRun() { },
 
-  onDestroy() {},
+  onDestroy() { },
 });

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

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

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/watchface/timer/watchface/round/index.js

@@ -269,7 +269,7 @@ WatchFace({
       centerSecondPointer.setProperty(hmUI.prop.VISIBLE, true);
       for (let n = 0; n < 8; n++) {
         bigNumObject[n].setProperty(hmUI.prop.VISIBLE, true); //false隐藏 true显示
-        smallNumObject[n].setProperty(hmUI.prop.VISIBLE, true); //false隐藏 true显示  
+        smallNumObject[n].setProperty(hmUI.prop.VISIBLE, true); //false隐藏 true显示
         if (n == 0 || n == 1 || n == 3 || n == 4 || n == 6 || n == 7) {
           bigNumObject[n].setProperty(hmUI.prop.SRC, img('bigNum/0.png'))
           smallNumObject[n].setProperty(hmUI.prop.SRC, img('smallNum/0.png'))
@@ -282,14 +282,14 @@ WatchFace({
       constSecond = 0
       constMin = 0
       backBtn.setProperty(hmUI.prop.VISIBLE, true); //false隐藏 true显示
-      green_red_btn.setProperty(hmUI.prop.VISIBLE, true); //false隐藏 true显示 
+      green_red_btn.setProperty(hmUI.prop.VISIBLE, true); //false隐藏 true显示
       flag = true
     }));
 
     backBtn.addEventListener(hmUI.event.CLICK_UP, (function (info) {
       timer.stopTimer(hsTimer)
       timer.stopTimer(sTimer)
-      green_red_btn.setProperty(hmUI.prop.SRC, img('btn/lv.png')); //false隐藏 true显示 
+      green_red_btn.setProperty(hmUI.prop.SRC, img('btn/lv.png')); //false隐藏 true显示
       for (let n = 0; n < 8; n++) {
         bigNumObject[n].setProperty(hmUI.prop.VISIBLE, false); //false隐藏 true显示
         smallNumObject[n].setProperty(hmUI.prop.VISIBLE, false); //false隐藏 true显示
@@ -312,7 +312,7 @@ WatchFace({
       minPoint.setProperty(hmUI.prop.ANGLE, 0)
       hourPoint.setProperty(hmUI.prop.ANGLE, 0)
       if (flag) {
-        green_red_btn.setProperty(hmUI.prop.SRC, img("btn/lv.png")); //false隐藏 true显示 
+        green_red_btn.setProperty(hmUI.prop.SRC, img("btn/lv.png")); //false隐藏 true显示
         timer.stopTimer(hsTimer)
         timer.stopTimer(sTimer)
         bigNumObject[0].setProperty(hmUI.prop.SRC, img("bigNum/0.png"))
@@ -335,7 +335,7 @@ WatchFace({
         smallNumObject[7].setProperty(hmUI.prop.SRC, rootPath + "smallNum/" + hmFS
           .SysProGetInt("t7") + ".png")
       } else {
-        green_red_btn.setProperty(hmUI.prop.SRC, img("btn/red.png")); //false隐藏 true显示 
+        green_red_btn.setProperty(hmUI.prop.SRC, img("btn/red.png")); //false隐藏 true显示
         hmFS.SysProSetInt("t0", 0);
         hmFS.SysProSetInt("t1", 0);
         hmFS.SysProSetInt("t3", 0);
@@ -408,7 +408,6 @@ WatchFace({
     }
 
     function timerSample() {
-      console.log('999999')
       hsTimer = timer.createTimer(
         10, 10, setHaomiao, {})
       sTimer = timer.createTimer(

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/fetch-api/app-side/index.js

@@ -3,7 +3,7 @@ import { MessageBuilder } from "../shared/message-side";
 const messageBuilder = new MessageBuilder();
 
 // Simulating an asynchronous network request using Promise
-const mockAPI = async () => {
+async function mockAPI() {
   return new Promise((resolve, reject) => {
     setTimeout(() => {
       resolve({
@@ -17,17 +17,17 @@ const mockAPI = async () => {
   });
 };
 
-const fetchData = async (ctx) => {
+async function fetchData(ctx) {
   try {
     // Requesting network data using the fetch API
     // The sample program is for simulation only and does not request real network data, so it is commented here
     // Example of a GET method request
-    // const { body: { data = {} } = {} } = await fetch({
+    // const res = await fetch({
     //   url: 'https://xxx.com/api/xxx',
     //   method: 'GET'
     // })
     // Example of a POST method request
-    // const { body: { data = {} } = {} } = await fetch({
+    // const res = await fetch({
     //   url: 'https://xxx.com/api/xxx',
     //   method: 'POST',
     //   headers: {
@@ -39,11 +39,13 @@ const fetchData = async (ctx) => {
     // })
 
     // A network request is simulated here
-    const { body: { data = {} } = {} } = await mockAPI();
+    const res = await mockAPI()
+    const resBody = typeof res.body === 'string' ? JSON.parse(res.body) : res.body
 
     ctx.response({
-      data: { result: data },
-    });
+      data: { result: resBody.data },
+    })
+
   } catch (error) {
     ctx.response({
       data: { result: "ERROR" },
@@ -53,7 +55,7 @@ const fetchData = async (ctx) => {
 
 AppSideService({
   onInit() {
-    messageBuilder.listen(() => {});
+    messageBuilder.listen(() => { });
 
     messageBuilder.on("request", (ctx) => {
       const jsonRpc = messageBuilder.buf2Json(ctx.request.payload);
@@ -63,7 +65,7 @@ AppSideService({
     });
   },
 
-  onRun() {},
+  onRun() { },
 
-  onDestroy() {},
+  onDestroy() { },
 });

package/private-modules/zeppos-app-utils/dist/public/template/os3.0/app/fetch-api/app-side/index.js

@@ -18,7 +18,7 @@ const formatDate = (date = new Date()) => {
   )}:${padStart(s, 2)}`;
 };
 // Simulating an asynchronous network request using Promise
-const mockAPI = async () => {
+async function mockAPI() {
   return new Promise((resolve, reject) => {
     setTimeout(() => {
       resolve({
@@ -32,7 +32,7 @@ const mockAPI = async () => {
   });
 };
 
-const fetchData = async (res) => {
+async function fetchData(res) {
   try {
     // Requesting network data using the fetch API
     // The sample program is for simulation only and does not request real network data, so it is commented here

package/private-modules/zeppos-app-utils/dist/public/template/v1/hello-world/app.json

@@ -1,144 +0,0 @@
-{
-  "configVersion": "v2",
-  "app": {
-    "appId": 20001,
-    "appName": "hello world",
-    "appType": "app",
-    "version": {
-      "code": 1,
-      "name": "1.0.1"
-    },
-    "icon": "icon.png",
-    "vender": "zepp",
-    "description": "hello world app"
-  },
-  "permissions": [],
-  "runtime": {
-    "apiVersion": {
-      "compatible": "1.0.0",
-      "target": "1.0.1",
-      "minVersion": "1.0.0"
-    }
-  },
-  "debug": false,
-  "targets": {
-    "gtr3-pro": {
-      "module": {
-        "page": {
-          "pages": [
-            "page/gtr3-pro/home/index.page"
-          ]
-        },
-        "app-side": {
-          "path": "app-side/index"
-        },
-        "setting": {
-          "path": "setting/index"
-        }
-      },
-      "platforms": [
-        {
-          "name": "gtr3-pro",
-          "deviceSource": 229
-        },
-        {
-          "name": "gtr3-pro-w",
-          "deviceSource": 230
-        }
-      ],
-      "designWidth": 480
-    },
-    "gtr3": {
-      "module": {
-        "page": {
-          "pages": [
-            "page/gtr3/home/index.page"
-          ]
-        },
-        "app-side": {
-          "path": "app-side/index"
-        },
-        "setting": {
-          "path": "setting/index"
-        }
-      },
-      "platforms": [
-        {
-          "name": "gtr3",
-          "deviceSource": 226
-        },
-        {
-          "name": "gtr3-w",
-          "deviceSource": 227
-        },
-        {
-          "name": "t-rex2",
-          "deviceSource": 418
-        },
-        {
-          "name": "t-rex2-w",
-          "deviceSource": 419
-        }
-      ],
-      "designWidth": 454
-    },
-    "gts3": {
-      "module": {
-        "page": {
-          "pages": [
-            "page/gts3/home/index.page"
-          ]
-        },
-        "app-side": {
-          "path": "app-side/index"
-        },
-        "setting": {
-          "path": "setting/index"
-        }
-      },
-      "platforms": [
-        {
-          "name": "gts3",
-          "deviceSource": 224
-        },
-        {
-          "name": "gts3-w",
-          "deviceSource": 225
-        }
-      ],
-      "designWidth": 390
-    },
-    "teide": {
-      "module": {
-        "page": {
-          "pages": [
-            "page/t-rex2/home/index.page"
-          ]
-        },
-        "app-side": {
-          "path": "app-side/index"
-        },
-        "setting": {
-          "path": "setting/index"
-        }
-      },
-      "platforms": [
-        {
-          "name": "t-rex2",
-          "deviceSource": 418
-        },
-        {
-          "name": "t-rex2-w",
-          "deviceSource": 419
-        }
-      ],
-      "designWidth": 454
-    }
-  },
-  "i18n": {
-    "en-US": {
-      "appName": "Hello World"
-    }
-  },
-  "defaultLanguage": "en-US"
-}