@zeppos/zeus-cli 1.3.7 → 1.3.8

package/bin/post-command.js

@@ -3,4 +3,4 @@ exports.__esModule = true;
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var bin = require('../package.json').bin;
 process.env.CMD_NAME = Object.keys(bin || {})[0] || 'zeus';
-process.env.ACCOUNT_ENV = zeppos_app_utils_1.globalStorage.get('account_env') || 'production';
+process.env.ACCOUNT_ENV = zeppos_app_utils_1.globalStorage.get('account_env') === 'test' ? 'test' : 'production';

package/package.json

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

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

@@ -71,7 +71,7 @@ var getLocalStorage = function () {
 exports.getLocalStorage = getLocalStorage;
 var getLocalConfig = function () {
     var zeusStorageInfo = (0, exports.getLocalStorage)();
-    var account_env = zeusStorageInfo.account_env || 'production';
+    var account_env = zeusStorageInfo.account_env === 'test' ? 'test' : 'production';
     var LOGIN_URL = new URL(getLoginURL[account_env]);
     var ANALYTICS_HOST = getAnalyticsHost[account_env];
     var accountPrefix = "____".concat(LOGIN_URL.host.replace(/\./g, '_'), "__");

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

@@ -33,8 +33,10 @@ var path = __importStar(require("path"));
 var fs = __importStar(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var lodash_1 = require("lodash");
+var config_1 = require("../config");
+var accountEnv = (0, config_1.getLocalConfig)().account_env;
 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 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 DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/.prettierrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  printWidth: 100,
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'none'
+}

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

@@ -0,0 +1,45 @@
+import { MessageBuilder } from '../shared/message-side'
+import { DEFAULT_TODO_LIST } from './../utils/constants'
+const messageBuilder = new MessageBuilder()
+
+function getTodoList() {
+  return settings.settingsStorage.getItem('todoList')
+    ? JSON.parse(settings.settingsStorage.getItem('todoList'))
+    : [...DEFAULT_TODO_LIST]
+}
+AppSideService({
+  onInit() {
+    messageBuilder.listen(() => {})
+    settings.settingsStorage.addListener('change', ({ key, newValue, oldValue }) => {
+      messageBuilder.call(getTodoList())
+    })
+    messageBuilder.on('request', (ctx) => {
+      const payload = messageBuilder.buf2Json(ctx.request.payload)
+      if (payload.method === 'GET_TODO_LIST') {
+        ctx.response({
+          data: { result: getTodoList() }
+        })
+      } else if (payload.method === 'ADD') {
+        // 这里补充一个
+        const todoList = getTodoList()
+        const newTodoList = [...todoList, String(Math.floor(Math.random() * 100))]
+        settings.settingsStorage.setItem('todoList', JSON.stringify(newTodoList))
+
+        ctx.response({
+          data: { result: newTodoList }
+        })
+      } else if (payload.method === 'DELETE') {
+        const { params: { index } = {} } = payload
+        const todoList = getTodoList()
+        const newTodoList = todoList.filter((_, i) => i !== index)
+        settings.settingsStorage.setItem('todoList', JSON.stringify(newTodoList))
+
+        ctx.response({
+          data: { result: newTodoList }
+        })
+      }
+    })
+  },
+  onRun() {},
+  onDestroy() {}
+})

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/app.js

@@ -0,0 +1,25 @@
+import './shared/device-polyfill'
+import { MessageBuilder } from './shared/message'
+import { getPackageInfo } from '@zos/app'
+import { log as Logger } from '@zos/utils'
+import * as ble from '@zos/ble'
+
+const logger = Logger.getLogger('todo-list-app')
+
+App({
+  globalData: {
+    messageBuilder: null
+  },
+  onCreate() {
+    logger.log('app onCreate invoked')
+    const { appId } = getPackageInfo()
+    const messageBuilder = new MessageBuilder({ appId, appDevicePort: 20, appSidePort: 0, ble })
+    this.globalData.messageBuilder = messageBuilder
+    messageBuilder.connect()
+  },
+
+  onDestroy() {
+    logger.log('app onDestroy invoked')
+    this.globalData.messageBuilder && this.globalData.messageBuilder.disConnect()
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/app.json

@@ -0,0 +1,64 @@
+{
+  "configVersion": "v2",
+  "app": {
+    "appType": "app",
+    "version": {
+      "code": 1,
+      "name": "1.0.0"
+    },
+    "appId": 20001,
+    "appName": "Todo List",
+    "icon": "icon.png",
+    "vender": "zepp",
+    "description": "todo list application"
+  },
+  "runtime": {
+    "apiVersion": {
+      "compatible": "2.0.0",
+      "target": "2.0.0",
+      "minVersion": "2.0"
+    }
+  },
+  "targets": {
+    "gts": {
+      "module": {
+        "page": {
+          "pages": ["page/home/index.page"]
+        },
+        "app-side": {
+          "path": "app-side/index"
+        },
+        "setting": {
+          "path": "setting/index"
+        }
+      },
+      "designWidth": 390,
+      "platforms": [
+        {
+          "name": "gtr4",
+          "deviceSource": 7930112
+        },
+        {
+          "name": "gtr4-2",
+          "deviceSource": 7930113
+        },
+        {
+          "name": "gts4",
+          "deviceSource": 7995648
+        },
+        {
+          "name": "gts4-w",
+          "deviceSource": 7995649
+        }
+      ]
+    }
+  },
+  "permissions": ["data:os.device.info", "device:os.local_storage"],
+  "i18n": {
+    "en-US": {
+      "name": "Todo List"
+    }
+  },
+  "defaultLanguage": "en-US",
+  "debug": false
+}

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/page/home/index.page.js

@@ -0,0 +1,155 @@
+import { createWidget, widget, prop } from '@zos/ui'
+import { getDeviceInfo, SCREEN_SHAPE_SQUARE } from '@zos/device'
+import { log as Logger } from '@zos/utils'
+import { localStorage } from '@zos/storage'
+
+import { TITLE_TEXT_STYLE, TIPS_TEXT_STYLE, SCROLL_LIST, ADD_BUTTON } from './index.style'
+import { getScrollListDataConfig } from './../../utils/index'
+
+const logger = Logger.getLogger('todo-list-page')
+const { messageBuilder } = getApp()._options.globalData
+
+Page({
+  state: {
+    scrollList: null,
+    tipText: null,
+    refreshText: null,
+    addButton: null,
+    dataList: localStorage.getItem('dataList', [])
+  },
+  onInit() {
+    logger.debug('page onInit invoked')
+    this.onMessage()
+    this.getTodoList()
+  },
+  build() {
+    logger.debug('page build invoked')
+
+    if (getDeviceInfo().screenShape !== SCREEN_SHAPE_SQUARE) {
+      this.state.title = createWidget(widget.TEXT, {
+        ...TITLE_TEXT_STYLE
+      })
+    }
+
+    this.state.addButton = createWidget(widget.BUTTON, {
+      ...ADD_BUTTON,
+      click_func: () => {
+        this.addRandomTodoItem()
+      }
+    })
+
+    this.createAndUpdateList()
+  },
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
+    localStorage.setItem('dataList', this.state.dataList)
+  },
+  onMessage() {
+    messageBuilder.on('call', ({ payload: buf }) => {
+      const data = messageBuilder.buf2Json(buf)
+      const dataList = data.map((i) => ({ name: i }))
+      logger.log('call dataList', dataList)
+      this.refreshAndUpdate(dataList)
+    })
+  },
+  getTodoList() {
+    messageBuilder
+      .request({
+        method: 'GET_TODO_LIST'
+      })
+      .then(({ result }) => {
+        this.state.dataList = result.map((d) => ({ name: d }))
+        logger.log('GET_TODO_LIST dataList', this.state.dataList)
+        this.createAndUpdateList()
+      })
+      .catch((res) => {})
+  },
+  addRandomTodoItem() {
+    messageBuilder
+      .request({
+        method: 'ADD'
+      })
+      .then(({ result }) => {
+        this.state.dataList = result.map((d) => ({ name: d }))
+        this.createAndUpdateList()
+      })
+      .catch((res) => {})
+  },
+  deleteTodoItem(index) {
+    messageBuilder
+      .request({
+        method: 'DELETE',
+        params: { index }
+      })
+      .then(({ result }) => {
+        const dataList = result.map((d) => ({ name: d }))
+
+        this.refreshAndUpdate(dataList)
+      })
+      .catch((res) => {})
+  },
+  changeUI(showEmpty) {
+    const { dataList } = this.state
+
+    if (showEmpty) {
+      if (dataList.length === 0) {
+        !this.state.tipText &&
+          (this.state.tipText = createWidget(widget.TEXT, {
+            ...TIPS_TEXT_STYLE
+          }))
+      }
+      const isTip = dataList.length === 0
+
+      this.state.refreshText && this.state.refreshText.setProperty(prop.VISIBLE, false)
+      this.state.tipText && this.state.tipText.setProperty(prop.VISIBLE, isTip)
+      this.state.scrollList && this.state.scrollList.setProperty(prop.VISIBLE, !isTip)
+    } else {
+      // 占位刷新
+      !this.state.refreshText &&
+        (this.state.refreshText = createWidget(widget.TEXT, {
+          ...TIPS_TEXT_STYLE,
+          text: ' '
+        }))
+
+      this.state.tipText && this.state.tipText.setProperty(prop.VISIBLE, false)
+      this.state.refreshText.setProperty(prop.VISIBLE, true)
+      this.state.scrollList && this.state.scrollList.setProperty(prop.VISIBLE, false)
+    }
+  },
+  createAndUpdateList(showEmpty = true) {
+    const _scrollListItemClick = (list, index) => {
+      this.deleteTodoItem(index)
+    }
+    const { scrollList, dataList } = this.state
+    this.changeUI(showEmpty)
+    const dataTypeConfig = getScrollListDataConfig(dataList.length === 0 ? -1 : 0, dataList.length)
+    if (scrollList) {
+      scrollList.setProperty(prop.UPDATE_DATA, {
+        data_array: dataList,
+        data_count: dataList.length,
+        data_type_config: [{ start: 0, end: dataList.length, type_id: 2 }],
+        data_type_config_count: dataTypeConfig.length,
+        on_page: 1
+      })
+    } else {
+      this.state.scrollList = createWidget(widget.SCROLL_LIST, {
+        ...(SCROLL_LIST || {}),
+        data_array: dataList,
+        data_count: dataList.length,
+        data_type_config: dataTypeConfig,
+        data_type_config_count: dataTypeConfig.length,
+        on_page: 1,
+        item_click_func: _scrollListItemClick
+      })
+    }
+  },
+  refreshAndUpdate(dataList = []) {
+    this.state.dataList = []
+    this.createAndUpdateList(false)
+
+    setTimeout(() => {
+      this.state.dataList = dataList
+      this.createAndUpdateList()
+    }, 20)
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/page/home/index.page.json

@@ -0,0 +1 @@
+{}

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/page/home/index.style.js

@@ -0,0 +1,92 @@
+import { align, text_style } from '@zos/ui'
+import { getText } from '@zos/i18n'
+import { getDeviceInfo } from '@zos/device'
+import { px } from '@zos/utils'
+
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = getDeviceInfo()
+
+export const TITLE_TEXT_STYLE = {
+  text: getText('todoList'),
+  x: px(42),
+  y: px(65),
+  w: DEVICE_WIDTH - px(42 * 2),
+  h: px(50),
+  color: 0xffffff,
+  text_size: 36,
+  align_h: align.CENTER_H,
+  text_style: text_style.WRAP,
+}
+
+export const ADD_BUTTON = {
+  text: getText('add'),
+  x: px(30),
+  y: px(65),
+  w: px(80),
+  h: px(50),
+  normal_color: 0xfc6950,
+  press_color: 0xfeb4a8,
+  radius: px(12)
+}
+
+export const TIPS_TEXT_STYLE = {
+  text: getText('noData'),
+  x: px(15),
+  y: px(120),
+  w: DEVICE_WIDTH - px(15 * 2),
+  h: DEVICE_HEIGHT - px(120),
+  color: 0xffffff,
+  text_size: 32,
+  align_h: align.CENTER_H,
+  align_v: align.CENTER_V,
+  text_style: text_style.WRAP,
+}
+
+export const SCROLL_LIST = {
+  item_height: px(80),
+  item_space: px(6),
+  item_config: [
+    {
+      type_id: 1,
+      item_bg_color: 0x333333,
+      item_bg_radius: px(10),
+      text_view: [
+        {
+          x: px(80),
+          y: px(0),
+          w: px(360),
+          h: px(80),
+          key: 'name',
+          color: 0xffff00,
+          text_size: px(36),
+          align_h: align.LEFT,
+        },
+      ],
+      text_view_count: 1,
+      item_height: px(80)
+    },
+    {
+      type_id: 2,
+      item_bg_color: 0x333333,
+      item_bg_radius: px(10),
+      text_view: [
+        {
+          x: px(80),
+          y: px(0),
+          w: px(360),
+          h: px(80),
+          key: 'name',
+          color: 0xff0000,
+          text_size: px(36),
+          align_h: align.LEFT,
+        },
+      ],
+      text_view_count: 1,
+      item_height: px(80)
+    }
+  ],
+  item_config_count: 2,
+  x: px(30),
+  y: px(120),
+  h: DEVICE_HEIGHT - px(180),
+  w: DEVICE_WIDTH - px(30) * 2
+}

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/page/i18n/en-US.po

@@ -0,0 +1,9 @@
+
+msgid "todoList"
+msgstr "todoList"
+
+msgid "noData"
+msgstr "No data, please add it on the phone"
+
+msgid "add"
+msgstr "Add"

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/secondary-widget/index.js

@@ -0,0 +1,160 @@
+import { createWidget, widget, prop } from '@zos/ui'
+import { getDeviceInfo, SCREEN_SHAPE_SQUARE } from '@zos/device'
+import { log as Logger } from '@zos/utils'
+
+import { TITLE_TEXT_STYLE, TIPS_TEXT_STYLE, SCROLL_LIST, ADD_BUTTON } from '../page/home/index.style'
+import { readFileSync, writeFileSync } from '../utils/fs'
+import { getScrollListDataConfig } from '../utils/index'
+
+const logger = Logger.getLogger('todo-list-page')
+const { messageBuilder } = getApp()._options.globalData
+
+SecondaryWidget({
+  state: {
+    scrollList: null,
+    tipText: null,
+    refreshText: null,
+    addButton: null,
+    dataList: readFileSync()
+  },
+  onInit() {
+    logger.debug('page onInit invoked')
+    this.onMessage()
+    this.getTodoList()
+  },
+  build() {
+    logger.debug('page build invoked')
+
+    try {
+      if (getDeviceInfo().screenShape !== SCREEN_SHAPE_SQUARE) {
+        this.state.title = createWidget(widget.TEXT, {
+          ...TITLE_TEXT_STYLE
+        })
+      } 
+  
+      this.state.addButton = createWidget(widget.BUTTON, {
+        ...ADD_BUTTON,
+        click_func: () => {
+          this.addRandomTodoItem()
+        }
+      })
+  
+      this.createAndUpdateList()  
+    } catch (e) {
+      console.log('LifeCycle Error', e)
+      e && e.stack && e.stack.split(/\n/).forEach((i) => console.log('error stack', i))
+    }
+  },
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
+    writeFileSync(this.state.dataList, false)
+  },
+  onMessage() {
+    messageBuilder.on('call', ({ payload: buf }) => {
+      const data = messageBuilder.buf2Json(buf)
+      const dataList = data.map((i) => ({ name: i }))
+      logger.log('call dataList', dataList)
+      this.refreshAndUpdate(dataList)
+    })
+  },
+  getTodoList() {
+    messageBuilder
+      .request({
+        method: 'GET_TODO_LIST'
+      })
+      .then(({ result }) => {
+        this.state.dataList = result.map((d) => ({ name: d }))
+        logger.log('GET_TODO_LIST dataList', this.state.dataList)
+        this.createAndUpdateList()
+      })
+      .catch((res) => {})
+  },
+  addRandomTodoItem() {
+    messageBuilder
+      .request({
+        method: 'ADD'
+      })
+      .then(({ result }) => {
+        this.state.dataList = result.map((d) => ({ name: d }))
+        this.createAndUpdateList()
+      })
+      .catch((res) => {})
+  },
+  deleteTodoItem(index) {
+    messageBuilder
+      .request({
+        method: 'DELETE',
+        params: { index }
+      })
+      .then(({ result }) => {
+        const dataList = result.map((d) => ({ name: d }))
+
+        this.refreshAndUpdate(dataList)
+      })
+      .catch((res) => {})
+  },
+  changeUI(showEmpty) {
+    const { dataList } = this.state
+
+    if (showEmpty) {
+      if (dataList.length === 0) {
+        !this.state.tipText &&
+          (this.state.tipText = createWidget(widget.TEXT, {
+            ...TIPS_TEXT_STYLE
+          }))
+      }
+      const isTip = dataList.length === 0
+
+      this.state.refreshText && this.state.refreshText.setProperty(prop.VISIBLE, false)
+      this.state.tipText && this.state.tipText.setProperty(prop.VISIBLE, isTip)
+      this.state.scrollList && this.state.scrollList.setProperty(prop.VISIBLE, !isTip)
+    } else {
+      // 占位刷新
+      !this.state.refreshText &&
+        (this.state.refreshText = createWidget(widget.TEXT, {
+          ...TIPS_TEXT_STYLE,
+          text: ' '
+        }))
+
+      this.state.tipText && this.state.tipText.setProperty(prop.VISIBLE, false)
+      this.state.refreshText.setProperty(prop.VISIBLE, true)
+      this.state.scrollList && this.state.scrollList.setProperty(prop.VISIBLE, false)
+    }
+  },
+  createAndUpdateList(showEmpty = true) {
+    const _scrollListItemClick = (list, index) => {
+      this.deleteTodoItem(index)
+    }
+    const { scrollList, dataList } = this.state
+    this.changeUI(showEmpty)
+    const dataTypeConfig = getScrollListDataConfig(dataList.length === 0 ? -1 : 0, dataList.length)
+    if (scrollList) {
+      scrollList.setProperty(prop.UPDATE_DATA, {
+        data_array: dataList,
+        data_count: dataList.length,
+        data_type_config: [{ start: 0, end: dataList.length, type_id: 2 }],
+        data_type_config_count: dataTypeConfig.length,
+        on_page: 1
+      })
+    } else {
+      this.state.scrollList = createWidget(widget.SCROLL_LIST, {
+        ...(SCROLL_LIST || {}),
+        data_array: dataList,
+        data_count: dataList.length,
+        data_type_config: dataTypeConfig,
+        data_type_config_count: dataTypeConfig.length,
+        on_page: 1,
+        item_click_func: _scrollListItemClick
+      })
+    }
+  },
+  refreshAndUpdate(dataList = []) {
+    this.state.dataList = []
+    this.createAndUpdateList(false)
+
+    setTimeout(() => {
+      this.state.dataList = dataList
+      this.createAndUpdateList()
+    }, 20)
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/todo-list/setting/i18n/en-US.po

@@ -0,0 +1,5 @@
+msgid "addTodo"
+msgstr "ADD TODO"
+
+msgid "delete"
+msgstr "DELETE"