@zeppos/zeus-cli 1.3.4 → 1.3.6

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/{todo-list → fetch-api/todo-list}/app.json

@@ -34,6 +34,14 @@
       },
       "designWidth": 390,
       "platforms": [
+        {
+          "name": "gtr4",
+          "deviceSource": 7930112
+        },
+        {
+          "name": "gtr4-2",
+          "deviceSource": 7930113
+        },
         {
           "name": "gts4",
           "deviceSource": 7995648

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

@@ -1,9 +1,9 @@
-import * as hmUI from '@zos/ui'
+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 { readFileSync, writeFileSync } from './../../utils/fs'
 import { getScrollListDataConfig } from './../../utils/index'
 
 const logger = Logger.getLogger('todo-list-page')
@@ -15,7 +15,7 @@ Page({
     tipText: null,
     refreshText: null,
     addButton: null,
-    dataList: readFileSync()
+    dataList: localStorage.getItem('dataList', [])
   },
   onInit() {
     logger.debug('page onInit invoked')
@@ -26,12 +26,12 @@ Page({
     logger.debug('page build invoked')
 
     if (getDeviceInfo().screenShape !== SCREEN_SHAPE_SQUARE) {
-      this.state.title = hmUI.createWidget(hmUI.widget.TEXT, {
+      this.state.title = createWidget(widget.TEXT, {
         ...TITLE_TEXT_STYLE
       })
     }
 
-    this.state.addButton = hmUI.createWidget(hmUI.widget.BUTTON, {
+    this.state.addButton = createWidget(widget.BUTTON, {
       ...ADD_BUTTON,
       click_func: () => {
         this.addRandomTodoItem()
@@ -42,7 +42,7 @@ Page({
   },
   onDestroy() {
     logger.debug('page onDestroy invoked')
-    writeFileSync(this.state.dataList, false)
+    localStorage.setItem('dataList', this.state.dataList)
   },
   onMessage() {
     messageBuilder.on('call', ({ payload: buf }) => {
@@ -94,26 +94,26 @@ Page({
     if (showEmpty) {
       if (dataList.length === 0) {
         !this.state.tipText &&
-          (this.state.tipText = hmUI.createWidget(hmUI.widget.TEXT, {
+          (this.state.tipText = createWidget(widget.TEXT, {
             ...TIPS_TEXT_STYLE
           }))
       }
       const isTip = dataList.length === 0
 
-      this.state.refreshText && this.state.refreshText.setProperty(hmUI.prop.VISIBLE, false)
-      this.state.tipText && this.state.tipText.setProperty(hmUI.prop.VISIBLE, isTip)
-      this.state.scrollList && this.state.scrollList.setProperty(hmUI.prop.VISIBLE, !isTip)
+      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 = hmUI.createWidget(hmUI.widget.TEXT, {
+        (this.state.refreshText = createWidget(widget.TEXT, {
           ...TIPS_TEXT_STYLE,
           text: ' '
         }))
 
-      this.state.tipText && this.state.tipText.setProperty(hmUI.prop.VISIBLE, false)
-      this.state.refreshText.setProperty(hmUI.prop.VISIBLE, true)
-      this.state.scrollList && this.state.scrollList.setProperty(hmUI.prop.VISIBLE, false)
+      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) {
@@ -124,7 +124,7 @@ Page({
     this.changeUI(showEmpty)
     const dataTypeConfig = getScrollListDataConfig(dataList.length === 0 ? -1 : 0, dataList.length)
     if (scrollList) {
-      scrollList.setProperty(hmUI.prop.UPDATE_DATA, {
+      scrollList.setProperty(prop.UPDATE_DATA, {
         data_array: dataList,
         data_count: dataList.length,
         data_type_config: [{ start: 0, end: dataList.length, type_id: 2 }],
@@ -132,7 +132,7 @@ Page({
         on_page: 1
       })
     } else {
-      this.state.scrollList = hmUI.createWidget(hmUI.widget.SCROLL_LIST, {
+      this.state.scrollList = createWidget(widget.SCROLL_LIST, {
         ...(SCROLL_LIST || {}),
         data_array: dataList,
         data_count: dataList.length,

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

@@ -1,4 +1,4 @@
-import * as hmUI from '@zos/ui'
+import { align, text_style } from '@zos/ui'
 import { getText } from '@zos/i18n'
 import { getDeviceInfo } from '@zos/device'
 import { px } from '@zos/utils'
@@ -13,15 +13,15 @@ export const TITLE_TEXT_STYLE = {
   h: px(50),
   color: 0xffffff,
   text_size: 36,
-  align_h: hmUI.align.CENTER_H,
-  text_style: hmUI.text_style.WRAP
+  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(120),
+  w: px(80),
   h: px(50),
   normal_color: 0xfc6950,
   press_color: 0xfeb4a8,
@@ -36,9 +36,9 @@ export const TIPS_TEXT_STYLE = {
   h: DEVICE_HEIGHT - px(120),
   color: 0xffffff,
   text_size: 32,
-  align_h: hmUI.align.CENTER_H,
-  align_v: hmUI.align.CENTER_V,
-  text_style: hmUI.text_style.WRAP
+  align_h: align.CENTER_H,
+  align_v: align.CENTER_V,
+  text_style: text_style.WRAP,
 }
 
 export const SCROLL_LIST = {
@@ -58,8 +58,8 @@ export const SCROLL_LIST = {
           key: 'name',
           color: 0xffff00,
           text_size: px(36),
-          align_h: hmUI.align.LEFT
-        }
+          align_h: align.LEFT,
+        },
       ],
       text_view_count: 1,
       item_height: px(80)
@@ -77,8 +77,8 @@ export const SCROLL_LIST = {
           key: 'name',
           color: 0xff0000,
           text_size: px(36),
-          align_h: hmUI.align.LEFT
-        }
+          align_h: align.LEFT,
+        },
       ],
       text_view_count: 1,
       item_height: px(80)

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

@@ -1,6 +1,6 @@
 
 msgid "todoList"
-msgstr "todo List"
+msgstr "todoList"
 
 msgid "noData"
 msgstr "No data, please add it on the phone"

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/fetch-api/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/fetch-api/todo-list/utils/constants.js

@@ -0,0 +1 @@
+export const DEFAULT_TODO_LIST = ['Learn', 'Drink', 'Food']

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

@@ -25,15 +25,7 @@
     "gtr": {
       "module": {
         "page": {
-          "pages": [
-            "page/gtr/home/index.page"
-          ]
-        },
-        "app-side": {
-          "path": "app-side/index"
-        },
-        "setting": {
-          "path": "setting/index"
+          "pages": ["page/gtr/home/index.page"]
         }
       },
       "platforms": [
@@ -51,15 +43,7 @@
     "gts": {
       "module": {
         "page": {
-          "pages": [
-            "page/gts/home/index.page"
-          ]
-        },
-        "app-side": {
-          "path": "app-side/index"
-        },
-        "setting": {
-          "path": "setting/index"
+          "pages": ["page/gts/home/index.page"]
         }
       },
       "platforms": [

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/hello-world/page/gtr/home/index.page.js

@@ -1,12 +1,12 @@
-import * as hmUI from "@zos/ui";
-import { log as Logger } from "@zos/utils";
-import { TEXT_STYLE } from "./index.style";
+import { createWidget, widget } from '@zos/ui'
+import { log as Logger } from '@zos/utils'
+import { TEXT_STYLE } from './index.style'
 
 const logger = Logger.getLogger("helloworld");
 Page({
   build() {
-    logger.debug("page build invoked");
-    hmUI.createWidget(hmUI.widget.TEXT, {
+    logger.debug('page build invoked')
+    createWidget(widget.TEXT, {
       ...TEXT_STYLE,
     });
   },

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/hello-world/page/gtr/home/index.style.js

@@ -1,7 +1,7 @@
-import * as hmUI from "@zos/ui";
-import { getText } from "@zos/i18n";
-import { getDeviceInfo } from "@zos/device";
-import { px } from "@zos/utils";
+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();
 
@@ -13,6 +13,6 @@ export const TEXT_STYLE = {
   h: px(100),
   color: 0xffffff,
   text_size: px(36),
-  align_h: hmUI.align.CENTER_H,
-  text_style: hmUI.text_style.WRAP,
-};
+  align_h: align.CENTER_H,
+  text_style: text_style.WRAP,
+}

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/hello-world/page/gts/home/index.page.js

@@ -1,13 +1,13 @@
-import * as hmUI from "@zos/ui";
-import { log as Logger } from "@zos/utils";
-import { TEXT_STYLE } from "./index.style";
+import { createWidget, widget } from '@zos/ui'
+import { log as Logger } from '@zos/utils'
+import { TEXT_STYLE } from './index.style'
 
 const logger = Logger.getLogger("helloworld");
 
 Page({
   build() {
-    logger.debug("page build invoked");
-    hmUI.createWidget(hmUI.widget.TEXT, {
+    logger.debug('page build invoked')
+    createWidget(widget.TEXT, {
       ...TEXT_STYLE,
     });
   },

package/private-modules/zeppos-app-utils/dist/public/template/os2.0/app/hello-world/page/gts/home/index.style.js

@@ -1,6 +1,6 @@
-import * as hmUI from "@zos/ui";
-import { getText } from "@zos/i18n";
-import { getDeviceInfo } from "@zos/device";
+import { align, text_style } from '@zos/ui'
+import { getText } from '@zos/i18n'
+import { getDeviceInfo } from '@zos/device'
 
 export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = getDeviceInfo();
 
@@ -12,6 +12,6 @@ export const TEXT_STYLE = {
   h: 100,
   color: 0xffffff,
   text_size: 36,
-  align_h: hmUI.align.CENTER_H,
-  text_style: hmUI.text_style.WRAP,
-};
+  align_h: align.CENTER_H,
+  text_style: text_style.WRAP,
+}

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

@@ -47,7 +47,29 @@
             "page/sensor/sleep",
             "page/sensor/stand",
             "page/sensor/step",
-            "page/sensor/stress"
+            "page/sensor/stress",
+            "page/router/set_launch_app_timeout",
+            "page/interaction/on_digital_crown",
+            "page/interaction/on_key",
+            "page/ui/widget/text",
+            "page/ui/widget/img",
+            "page/ui/widget/button",
+            "page/ui/widget/fill_rect",
+            "page/ui/widget/stroke_rect",
+            "page/ui/widget/arc",
+            "page/ui/widget/img_anim",
+            "page/ui/widget/qrcode",
+            "page/ui/widget/dialog",
+            "page/ui/widget/histogram",
+            "page/ui/widget/polyline",
+            "page/ui/widget/radio_group",
+            "page/ui/widget/checkbox_group",
+            "page/ui/widget/slide_switch",
+            "page/ui/widget/pick_date",
+            "page/ui/widget/scroll_list",
+            "page/ui/widget/view_container",
+            "page/ui/widget/cycle_list",
+            "page/ui/widget/cycle_image_text_list"
           ]
         }
       },
@@ -59,14 +81,6 @@
         {
           "name": "gtr4-w",
           "deviceSource": 7930113
-        },
-        {
-          "name": "gts",
-          "deviceSource": 7995648
-        },
-        {
-          "name": "gts-w",
-          "deviceSource": 7995649
         }
       ],
       "designWidth": 480