Merge pull request #3 from mmolotov/develop

v 1.0.1
mmolotov · Sep 19, 2023 · 46c7c57 · 46c7c57
2 parents f1a6362 + 1e1840e
commit 46c7c57
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 29 deletions.
diff --git a/app.json b/app.json
@@ -6,7 +6,7 @@
     "appType": "app",
     "version": {
       "code": 1,
-      "name": "1.0.0"
+      "name": "1.0.1"
     },
     "icon": "icon.png",
     "vender": "zepp",

diff --git a/page/create_timer/create_timer.js b/page/create_timer/create_timer.js
@@ -1,4 +1,4 @@
-import {push} from '@zos/router'
+import {replace} from '@zos/router'
 
 import {CONSTANTS, getText} from '../common'
 import CreateNewTimerPage from './create_timer_template'
@@ -8,6 +8,6 @@ CreateNewTimerPage({
     pageKey:        'create.timer',
     confirmHandler: function (timer) {
         getApp()._options.globalData.timerModel.timer = timer
-        push({url: CONSTANTS.pages.SELECT_INTERVAL})
+        replace({url: CONSTANTS.pages.SELECT_INTERVAL})
     }
 })
diff --git a/page/create_timer/create_timer_template.js b/page/create_timer/create_timer_template.js
@@ -1,4 +1,3 @@
-import {back} from '@zos/router'
 import {Vibrator, VIBRATOR_SCENE_SHORT_LIGHT} from '@zos/sensor'
 import {localStorage} from '@zos/storage'
 import {createWidget, deleteWidget, event, prop, widget} from '@zos/ui'
@@ -23,9 +22,6 @@ function CreateNewTimerPage(args) {
 
     Page({
         onInit() {
-            if (getApp()._options.globalData.openMain) {
-                back()
-            }
         },
         build() {
             this.hh = localStorage.getItem(`${pageKey}.hh`) ? localStorage.getItem(`${pageKey}.hh`) : 0

diff --git a/page/select_predefined/select_interval.js b/page/select_predefined/select_interval.js
@@ -19,11 +19,13 @@ const standardTimers = [
 ]
 
 SelectPredefinedTimerPage({
-    header:        getText(CONSTANTS.i18n.SELECT_INTERVAL_HEADER),
-    timersList:    standardTimers,
-    addButtonLink: CONSTANTS.pages.CREATE_INTERVAL,
-    timerHandler:  function (button) {
+    header:           getText(CONSTANTS.i18n.SELECT_INTERVAL_HEADER),
+    timersList:       standardTimers,
+    timerHandler:     function (button) {
         getApp()._options.globalData.timerModel.interval = button.getProperty(prop.DATASET).timer
         replace({url: CONSTANTS.pages.TIMER_PROGRESS})
+    },
+    addButtonHandler: function () {
+        replace({url: CONSTANTS.pages.CREATE_INTERVAL})
     }
 })
diff --git a/page/select_predefined/select_predefined_template.js b/page/select_predefined/select_predefined_template.js
@@ -1,6 +1,5 @@
 import {Vibrator, VIBRATOR_SCENE_SHORT_LIGHT} from '@zos/sensor'
 import {createWidget, event, prop, widget} from '@zos/ui'
-import {push} from '@zos/router'
 
 import {CONSTANTS, getText} from '../common'
 import {COMMON, SELECT_PREDEFINED} from '../style/style'
@@ -13,12 +12,11 @@ function SelectPredefinedTimerPage(args) {
         addButtonStyle = COMMON.STANDARD_BOTTOM_BUTTON_STYLE(CONSTANTS.img.PLUS, CONSTANTS.img.PLUS_PRESSED),
         timerHandler,
         timersList,
-        addButtonLink
+        addButtonHandler
     } = args
 
     Page({
         onInit() {
-            getApp()._options.globalData.openMain = false
         },
 
         build() {
@@ -60,7 +58,7 @@ function SelectPredefinedTimerPage(args) {
             const addButton = createWidget(widget.BUTTON, addButtonStyle)
             addButton.addEventListener(event.CLICK_DOWN, (e) => {
                 this.doVibro()
-                push({url: addButtonLink})
+                addButtonHandler()
             })
         }
     })

diff --git a/page/select_predefined/select_timer.js b/page/select_predefined/select_timer.js
@@ -18,12 +18,14 @@ const standardTimers = [
 ]
 
 SelectPredefinedTimerPage({
-    header:        getText(CONSTANTS.i18n.SELECT_TIMER_HEADER),
-    timersList:    standardTimers,
-    addButtonLink: CONSTANTS.pages.CREATE_TIMER,
-    timerHandler:  function (button) {
+    header:           getText(CONSTANTS.i18n.SELECT_TIMER_HEADER),
+    timersList:       standardTimers,
+    timerHandler:     function (button) {
         getApp()._options.globalData.timerModel.timer = button.getProperty(prop.DATASET).timer
         push({url: CONSTANTS.pages.SELECT_INTERVAL})
+    },
+    addButtonHandler: function () {
+        push({url: CONSTANTS.pages.CREATE_TIMER})
     }
 })
 
diff --git a/page/timer_progress/timer_progress.js b/page/timer_progress/timer_progress.js
@@ -1,6 +1,6 @@
 import {back} from '@zos/router'
 import {createWidget, deleteWidget, prop, widget} from '@zos/ui'
-import {Time, Vibrator, VIBRATOR_SCENE_TIMER} from '@zos/sensor'
+import {Time, Vibrator, VIBRATOR_SCENE_DURATION_LONG, VIBRATOR_SCENE_SHORT_LIGHT, VIBRATOR_SCENE_TIMER} from '@zos/sensor'
 import {pausePalmScreenOff, resetPalmScreenOff} from '@zos/display'
 
 import {CONSTANTS, getText, zeroPad} from '../common'
@@ -59,7 +59,7 @@ Page({
                 this.startBlinkInterval()
                 this.createStopButton()
                 this.deleteAdditionalButtons()
-                this.doVibro()
+                this.doVibro(VIBRATOR_SCENE_TIMER)
             } else {
                 this.notifyOnInterval(remainingSeconds)
             }
@@ -82,7 +82,7 @@ Page({
             if (this.lastReminder) {
                 const now = this.time.getTime()
                 if (now - this.lastReminder >= this.interval.valueSeconds * CONSTANTS.seconds.mili) {
-                    this.doVibro()
+                    this.doVibro(VIBRATOR_SCENE_DURATION_LONG)
                     this.switchTimerDisplayColor(true)
                     this.lastReminder = now
                 } else {
@@ -124,32 +124,30 @@ Page({
         }
     },
 
-    doVibro() {
+    doVibro(scene = VIBRATOR_SCENE_SHORT_LIGHT) {
         this.vibro.stop()
-        this.vibro.setMode(VIBRATOR_SCENE_TIMER)
+        this.vibro.setMode(scene)
         this.vibro.start()
     },
 
     createStopButton() {
         return createWidget(widget.BUTTON,
                 COMMON.STANDARD_BOTTOM_BUTTON_STYLE_ACTION(CONSTANTS.img.STOP, CONSTANTS.img.STOP_PRESSED, (arg) => {
-                    getApp()._options.globalData.openMain = true
                     back()
                 }))
     },
 
     createCancelButton() {
         return createWidget(widget.BUTTON, TIMER_PROGRESS.CANCEL_BUTTON((arg) => {
-            this.doVibro()
-            getApp()._options.globalData.openMain = true
+            this.doVibro(VIBRATOR_SCENE_SHORT_LIGHT)
             back()
         }))
     },
 
     createPauseButton() {
         return createWidget(widget.BUTTON,
                 TIMER_PROGRESS.PAUSE_RESUME_BUTTON(CONSTANTS.img.PAUSE, CONSTANTS.img.PAUSE_PRESSED, (button) => {
-                    this.doVibro()
+                    this.doVibro(VIBRATOR_SCENE_SHORT_LIGHT)
                     this.stopProcesses()
                     this.pause = this.time.getTime()
                     this.resumeButton = this.createResumeButton()
@@ -160,7 +158,7 @@ Page({
     createResumeButton() {
         return createWidget(widget.BUTTON,
                 TIMER_PROGRESS.PAUSE_RESUME_BUTTON(CONSTANTS.img.RESUME, CONSTANTS.img.RESUME_PRESSED, (button) => {
-                    this.doVibro()
+                    this.doVibro(VIBRATOR_SCENE_SHORT_LIGHT)
                     const pauseTime = this.time.getTime() - this.pause
                     this.end += pauseTime
                     this.lastReminder += pauseTime