@zeppos/zeus-cli 1.3.6 → 1.3.7

package/bin/main.js

@@ -49,7 +49,7 @@ var argv = hideBin(process.argv);
 var pre_check_1 = require("../utils/pre-check");
 var index_1 = require("../index");
 var zeppos_app_utils_1 = require("zeppos-app-utils");
-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;
+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, fetchDevicesWrap = zeppos_app_utils_1.modules.fetchDevicesWrap;
 var context = {};
 var yargsCmdBuilderFunc = function (cmdName, useProxy, yargs) {
     if (useProxy === void 0) { useProxy = false; }
@@ -84,15 +84,15 @@ yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [arg
     .alias('h', 'help').describe('help', 'Display help information.')
     .alias('v', 'version').describe('version', 'Display version number.')
     .group(['help', 'version'], "Base Options")
-    .command('init', 'Init a new project in current directory.', proxy, index_1.create)
-    .command('create <projectName>', 'Named the <projectName> project and add to the current directory.', proxy, index_1.create)
+    .command('init', 'Init a new project in current directory.', proxy, fetchDevicesWrap(index_1.create))
+    .command('create <projectName>', 'Named the <projectName> project and add to the current directory.', proxy, fetchDevicesWrap(index_1.create))
     .command('login', 'Login to your account.', proxy, login)
     .command('logout', 'Sign out of your account.', proxy, logout)
-    .command('dev', 'Run this project in development mode. Use "zeus dev -h" to see more information', yargsCmdBuilderFunc.bind(null, 'dev', true), index_1.run)
-    .command('preview', 'Preview this project in your device.', proxy, index_1.buildPreview)
-    .command('build', 'Build this project for production.', proxy, index_1.buildProd)
+    .command('dev', 'Run this project in development mode. Use "zeus dev -h" to see more information', yargsCmdBuilderFunc.bind(null, 'dev', true), fetchDevicesWrap(index_1.run))
+    .command('preview', 'Preview this project in your device.', proxy, fetchDevicesWrap(index_1.buildPreview))
+    .command('build', 'Build this project for production.', proxy, fetchDevicesWrap(index_1.buildProd))
     .command('status', 'View information such as login and emulator connection status.', proxy, status)
-    .command('bridge', "Connect the online App or Simulator for development and debugging.", proxy, index_1.bridge)
-    .command('config', "Operation config value.\n    e.g.\n      set <key>=<value> [<key>=<value> ...]\n      get <key> [<key> ...]\n      delete <key> [<key> ...]\n      list [--json]", proxy, modulesConfig)
+    .command('bridge', "Connect the online App or Simulator for development and debugging.", proxy, fetchDevicesWrap(index_1.bridge))
+    .command('config', "Operation config value.\n    e.g.\n      set <key>=<value> [<key>=<value> ...]\n      get <key> [<key> ...]\n      delete <key> [<key> ...]\n      list [--json]", proxy, fetchDevicesWrap(modulesConfig))
     .epilogue('For more information, see https://docs.zepp.com/')
     .parse(argv, context);

package/modules/build.js

@@ -83,7 +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 AppType = zeppos_app_utils_1.config.AppType, deviceTargets = zeppos_app_utils_1.config.deviceTargets, OSV2Devices = zeppos_app_utils_1.config.OSV2Devices;
+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 });
 var BuildMode;
@@ -112,12 +112,13 @@ var checkAppJson = function () {
 var chooseBuildTargetsV3Config = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var target, apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, isValidDevice, answers, _a;
+        var target, deviceTargets, apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, isValidDevice, answers, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     checkAppJson();
                     target = args.target;
+                    deviceTargets = getDeviceConf().deviceTargets;
                     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', []));
@@ -174,11 +175,12 @@ var chooseBuildTargetsV3Config = function (mode, args) {
 var chooseBuildTargetsV2Config = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var jsonTargets_1, unsupportedTargets_1, targets, returnRes, _a, promptTarget_1, answers;
+        var OSV2Devices, jsonTargets_1, unsupportedTargets_1, targets, returnRes, _a, promptTarget_1, answers;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     checkAppJson();
+                    OSV2Devices = getDeviceConf().OSV2Devices;
                     if (isV2ApiVersion(appJsonContent)) {
                         jsonTargets_1 = (0, lodash_1.get)(appJsonContent, 'targets', {});
                         unsupportedTargets_1 = [];

package/modules/create.js

@@ -53,15 +53,16 @@ var lodash_1 = require("lodash");
 var inquirer_1 = __importDefault(require("inquirer"));
 var path_1 = require("path");
 var zeppos_app_utils_1 = require("zeppos-app-utils");
-var AppType = zeppos_app_utils_1.config.AppType, deviceTargets = zeppos_app_utils_1.config.deviceTargets, OSV2DeviceTargetNames = zeppos_app_utils_1.config.OSV2DeviceTargetNames;
+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;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, promptAppType, _c, promptOsVersion, _d, promptTemplate, _e, promptWithAppSide, _f, promptWithSettings, _g, promptBuildTargets, _h, configVersion;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _b, promptAppType, _c, promptOsVersion, _d, promptTemplate, _e, promptWithAppSide, _f, promptWithSettings, _g, promptBuildTargets, _h, configVersion, _j, deviceTargets, OSV2DeviceTargetNames;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     _b = args.appType, promptAppType = _b === void 0 ? '' : _b, _c = args.OSVersion, promptOsVersion = _c === void 0 ? '' : _c, _d = args.template, promptTemplate = _d === void 0 ? '' : _d, _e = args.withAppSide, promptWithAppSide = _e === void 0 ? false : _e, _f = args.withSettings, promptWithSettings = _f === void 0 ? false : _f, _g = args.buildTargets, promptBuildTargets = _g === void 0 ? [] : _g, _h = args.configVersion, configVersion = _h === void 0 ? 'v2' : _h;
+                    _j = getDeviceConf(), deviceTargets = _j.deviceTargets, OSV2DeviceTargetNames = _j.OSV2DeviceTargetNames;
                     return [4, inquirer_1["default"].prompt([
                             {
                                 name: 'appType',
@@ -241,7 +242,7 @@ var inquirerFunc = function (args, _a) {
                                 }
                             });
                         }); })];
-                case 1: return [2, _j.sent()];
+                case 1: return [2, _k.sent()];
             }
         });
     });

package/package.json

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

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

@@ -1,62 +1,122 @@
 "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 };
 };
 exports.__esModule = true;
-exports.deviceInternalCodeName = exports.OSV2DeviceTargetNames = exports.OSV2Devices = exports.deviceTargets = exports.DeviceScreenType = void 0;
+exports.getDeviceConf = exports.DeviceScreenType = void 0;
 var lodash_1 = require("lodash");
-var device_server_1 = __importDefault(require("./device-server"));
+var path_1 = __importDefault(require("path"));
+var os_1 = __importDefault(require("os"));
+var fs_1 = __importDefault(require("fs"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
 var tools_1 = require("../tools/tools");
+var LOCAL_CACHE_DEVICE_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_devices");
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
     DeviceScreenType["S"] = "s";
     DeviceScreenType["B"] = "b";
 })(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
-exports.deviceTargets = __assign({}, 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 &&
-        max && (0, tools_1.compareVersion)(max, '2.0.0') <= 0) {
-        targetDevices.push.apply(targetDevices, platforms.reduce(function (list, o) { return (0, lodash_1.compact)(list.concat([o.deviceSource])); }, []));
+var shapeMap = {
+    square: DeviceScreenType.S,
+    round: DeviceScreenType.R,
+    bar: DeviceScreenType.B
+};
+function getDeviceInfo() {
+    var localContent = {};
+    if (fs_1["default"].existsSync(LOCAL_CACHE_DEVICE_PATH)) {
+        try {
+            localContent = fs_extra_1["default"].readJsonSync(LOCAL_CACHE_DEVICE_PATH);
+        }
+        catch (_e) { }
     }
-    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;
-    if (platforms && platforms.length) {
+    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.version', '')
+            });
+            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));
+    });
+    return deviceInfo;
+}
+var getDeviceConf = function () {
+    var deviceTargets = getDeviceInfo();
+    var OSV2Devices = Object.values(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 &&
+            max && (0, tools_1.compareVersion)(max, '2.0.0') <= 0) {
+            targetDevices.push.apply(targetDevices, platforms.reduce(function (list, o) { return (0, lodash_1.compact)(list.concat([o.deviceSource])); }, []));
+        }
+        return targetDevices;
+    }, []);
+    var OSV2DeviceTargetNames = Object.keys(deviceTargets).reduce(function (targetNames, target) {
+        var flag = true;
+        var _a = deviceTargets[target].platforms, platforms = _a === void 0 ? [] : _a;
+        if (platforms && platforms.length) {
+            platforms.forEach(function (_a) {
+                var deviceSource = _a.deviceSource;
+                if (!OSV2Devices.includes(deviceSource)) {
+                    flag = false;
+                }
+            });
+        }
+        else {
+            flag = false;
+        }
+        flag && targetNames.push(target);
+        return targetNames;
+    }, []);
+    var deviceInternalCodeName = Object.keys(deviceTargets).reduce(function (deviceSources, target) {
+        var _a = deviceTargets[target].platforms, platforms = _a === void 0 ? [] : _a;
         platforms.forEach(function (_a) {
             var deviceSource = _a.deviceSource;
-            if (!exports.OSV2Devices.includes(deviceSource)) {
-                flag = false;
-            }
+            deviceSource && (deviceSources[deviceSource] = target);
         });
-    }
-    else {
-        flag = false;
-    }
-    flag && targetNames.push(target);
-    return targetNames;
-}, []);
-exports.deviceInternalCodeName = Object.keys(exports.deviceTargets).reduce(function (deviceSources, target) {
-    var _a = exports.deviceTargets[target].platforms, platforms = _a === void 0 ? [] : _a;
-    platforms.forEach(function (_a) {
-        var deviceSource = _a.deviceSource;
-        deviceSource && (deviceSources[deviceSource] = target);
-    });
-    return deviceSources;
-}, {});
+        return deviceSources;
+    }, {});
+    return {
+        deviceTargets: deviceTargets,
+        OSV2Devices: OSV2Devices,
+        OSV2DeviceTargetNames: OSV2DeviceTargetNames,
+        deviceInternalCodeName: deviceInternalCodeName
+    };
+};
+exports.getDeviceConf = getDeviceConf;

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

@@ -57,11 +57,12 @@ var path_1 = require("path");
 var fs_1 = __importDefault(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var index_1 = require("../../index");
-var TemplateCopyType = index_1.config.TemplateCopyType, deviceTargets = index_1.config.deviceTargets;
+var TemplateCopyType = index_1.config.TemplateCopyType, getDeviceConf = index_1.config.getDeviceConf;
 var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, shapeOfPlatform, appJsonPath, appJson, appID, defaultTarget, targets, shapes, needDelShapeConfig, defaultAssetsPath_1;
+    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, shapeOfPlatform, deviceTargets, appJsonPath, appJson, appID, defaultTarget, targets, shapes, needDelShapeConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
         workDir = args.workDir, templateInfo = args.templateInfo, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType, shapeOfPlatform = args.shapeOfPlatform;
+        deviceTargets = getDeviceConf().deviceTargets;
         fs_extra_1["default"].copySync(templateInfo.path, workDir);
         if (fs_extra_1["default"].existsSync((0, path_1.resolve)(workDir, "./_package.json"))) {
             fs_1["default"].renameSync((0, path_1.resolve)(workDir, "./_package.json"), (0, path_1.resolve)(workDir, "./package.json"));

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

@@ -0,0 +1,87 @@
+"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.fetchDevicesWrap = exports.fetchDevices = 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_devices");
+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 fetchDevices = function () {
+    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();
+    return new Promise(function (resolve) {
+        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 + 2 * 60 * 60 * 1000
+                        });
+                        resolve({});
+                    }
+                }
+            })["catch"](function (e) {
+                console.log(e);
+                resolve({});
+                process.exit(1);
+            });
+        }
+        else {
+            resolve({});
+        }
+    });
+};
+exports.fetchDevices = fetchDevices;
+var fetchDevicesWrap = function (func) {
+    return function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        return (0, exports.fetchDevices)().then(function () { return func.apply(void 0, args); });
+    };
+};
+exports.fetchDevicesWrap = fetchDevicesWrap;

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

@@ -18,4 +18,5 @@ __exportStar(require("./login"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./status"), exports);
 __exportStar(require("./build"), exports);
+__exportStar(require("./fetchDevices"), exports);
 __exportStar(require("./create/index"), exports);

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

@@ -2,21 +2,6 @@ import { MessageBuilder } from "../shared/message";
 
 const messageBuilder = new MessageBuilder();
 
-// Simulating an asynchronous network request using Promise
-async function mockAPI() {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      resolve({
-        body: {
-          data: {
-            text: "HELLO ZEPPOS",
-          },
-        },
-      });
-    }, 1000);
-  });
-};
-
 async function fetchData(ctx) {
   try {
     // Requesting network data using the fetch API
@@ -38,12 +23,15 @@ async function fetchData(ctx) {
     //   })
     // })
 
-    // A network request is simulated here
-    const res = await mockAPI()
+    // A network request is simulated here, Reference documentation: https://jsonplaceholder.typicode.com/
+    const res = await fetch({
+      url: 'https://jsonplaceholder.typicode.com/todos/1',
+      method: 'GET'
+    })
     const resBody = typeof res.body === 'string' ? JSON.parse(res.body) : res.body
 
     ctx.response({
-      data: { result: resBody.data },
+      data: { result: resBody },
     })
 
   } catch (error) {

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

@@ -34,19 +34,19 @@ Page({
       .then((data) => {
         logger.log("receive data");
         const { result = {} } = data;
-        const { text } = result;
+        const text = JSON.stringify(result);
 
         hmUI.createWidget(hmUI.widget.TEXT, {
-          x: px(96),
-          y: px(100),
-          w: px(288),
-          h: px(46),
+          x: px(56),
+          y: px(74),
+          w: DEVICE_WIDTH - 2 * px(56),
+          h: px(200),
           color: 0xffffff,
           text_size: px(36),
           align_h: hmUI.align.CENTER_H,
           align_v: hmUI.align.CENTER_V,
           text_style: hmUI.text_style.NONE,
-          text,
+          text: text,
         });
       });
   },

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

@@ -2,21 +2,6 @@ import { MessageBuilder } from "../shared/message-side";
 
 const messageBuilder = new MessageBuilder();
 
-// Simulating an asynchronous network request using Promise
-async function mockAPI() {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      resolve({
-        body: {
-          data: {
-            text: "HELLO ZEPPOS",
-          },
-        },
-      });
-    }, 1000);
-  });
-};
-
 async function fetchData(ctx) {
   try {
     // Requesting network data using the fetch API
@@ -38,12 +23,15 @@ async function fetchData(ctx) {
     //   })
     // })
 
-    // A network request is simulated here
-    const res = await mockAPI()
+    // A network request is simulated here, Reference documentation: https://jsonplaceholder.typicode.com/
+    const res = await fetch({
+      url: 'https://jsonplaceholder.typicode.com/todos/1',
+      method: 'GET'
+    })
     const resBody = typeof res.body === 'string' ? JSON.parse(res.body) : res.body
 
     ctx.response({
-      data: { result: resBody.data },
+      data: { result: resBody },
     })
 
   } catch (error) {

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

@@ -36,13 +36,13 @@ Page({
       .then((data) => {
         logger.log("receive data");
         const { result = {} } = data;
-        const { text } = result;
+        const text = JSON.stringify(result);
 
         createWidget(widget.TEXT, {
-          x: px(50),
-          y: px(100),
-          w: DEVICE_WIDTH - 2 * px(50),
-          h: px(46),
+          x: px(56),
+          y: px(74),
+          w: DEVICE_WIDTH - 2 * px(56),
+          h: px(200),
           color: 0xffffff,
           text_size: px(36),
           align_h: align.CENTER_H,
@@ -52,5 +52,5 @@ Page({
         })
           .catch((res) => { });
       })
-    }
+  }
 })

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

@@ -1,37 +1,5 @@
 import { BaseSideService } from "@zeppos/zml/base-side";
 
-const padStart = (str, maxLength, fillStr = "0") => {
-  return str.toString().padStart(maxLength, fillStr);
-};
-
-const formatDate = (date = new Date()) => {
-  const y = date.getFullYear();
-  const m = date.getMonth() + 1;
-  const d = date.getDate();
-  const h = date.getHours();
-  const mm = date.getMinutes();
-  const s = date.getSeconds();
-
-  return `${y}-${padStart(m, 2)}-${padStart(d, 2)} ${padStart(h, 2)}:${padStart(
-    mm,
-    2
-  )}:${padStart(s, 2)}`;
-};
-// Simulating an asynchronous network request using Promise
-async function mockAPI() {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      resolve({
-        body: {
-          data: {
-            text: "HELLO ZEPPOS: " + formatDate(),
-          },
-        },
-      });
-    }, 1000);
-  });
-};
-
 async function fetchData(res) {
   try {
     // Requesting network data using the fetch API
@@ -53,11 +21,15 @@ async function fetchData(res) {
     //   })
     // })
 
-    // A network request is simulated here
-    const { body: { data = {} } = {} } = await mockAPI();
+    // A network request is simulated here, Reference documentation: https://jsonplaceholder.typicode.com/
+    const response = await fetch({
+      url: 'https://jsonplaceholder.typicode.com/todos/1',
+      method: 'GET'
+    })
+    const resBody = typeof response.body === 'string' ? JSON.parse(response.body) : response.body
 
     res(null, {
-      result: data,
+      result: resBody,
     });
   } catch (error) {
     res(null, {

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

@@ -28,7 +28,7 @@ Page(
         .then((data) => {
           logger.log("receive data");
           const { result = {} } = data;
-          const { text } = result;
+          const text = JSON.stringify(result);
 
           if (!textWidget) {
             textWidget = hmUI.createWidget(hmUI.widget.TEXT, {

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

@@ -8,10 +8,10 @@ import {
 import { DEVICE_WIDTH } from "../utils/config/device";
 
 export const FETCH_BUTTON = {
-  x: (DEVICE_WIDTH - px(400)) / 2,
-  y: px(260),
-  w: px(400),
-  h: px(100),
+  x: (DEVICE_WIDTH - px(360)) / 2,
+  y: px(300),
+  w: px(360),
+  h: px(80),
   text_size: px(36),
   radius: px(12),
   normal_color: DEFAULT_COLOR,
@@ -20,10 +20,10 @@ export const FETCH_BUTTON = {
 };
 
 export const FETCH_RESULT_TEXT = {
-  x: px(50),
-  y: px(100),
-  w: DEVICE_WIDTH - 2 * px(50),
-  h: px(120),
+  x: px(56),
+  y: px(74),
+  w: DEVICE_WIDTH - 2 * px(56),
+  h: px(200),
   color: 0xffffff,
   text_size: px(36),
   align_h: hmUI.align.CENTER_H,

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

@@ -11,7 +11,7 @@ export const FETCH_BUTTON = {
   x: (DEVICE_WIDTH - px(340)) / 2,
   y: px(280),
   w: px(340),
-  h: px(100),
+  h: px(80),
   text_size: px(36),
   radius: px(12),
   normal_color: DEFAULT_COLOR,

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

@@ -67,9 +67,9 @@ var yargs_parser_1 = __importDefault(require("yargs-parser"));
 var path = __importStar(require("path"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var index_1 = require("../index");
-var deviceInternalCodeName = index_1.config.deviceInternalCodeName;
 var fs_1 = require("fs");
 var rd = __importStar(require("rd"));
+var getDeviceConf = index_1.config.getDeviceConf;
 var parserZeusCommand = function (command) {
     return (0, yargs_parser_1["default"])(command.replace(/^(zeus )/, ''));
 };
@@ -88,6 +88,7 @@ var getDeviceInfoFromAppJson = function (root) {
     var deviceSourceArr = platforms.map(function (item) {
         return item.deviceSource;
     });
+    var deviceInternalCodeName = getDeviceConf().deviceInternalCodeName;
     return {
         deviceSource: deviceSource,
         appId: appId,