diff --git a/app.json b/app.json index 98377bb..9205419 100644 --- a/app.json +++ b/app.json @@ -6,7 +6,7 @@ "appType": "watchface", "version": { "code": 1, - "name": "1.0.2" + "name": "1.0.3" }, "icon": "icon.png", "vender": "zepp", diff --git a/package.json b/package.json index dcea276..c063b55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vhs-watch", - "version": "1.0.2", + "version": "1.0.3", "description": "vhs watch for Zepp OS 3.0 (GTS 4)", "main": "app.js", "scripts": { diff --git a/watchface/index.js b/watchface/index.js index fa91a09..1210357 100644 --- a/watchface/index.js +++ b/watchface/index.js @@ -6,15 +6,14 @@ import heartRateModule from "./modules/heartRate" WatchFace({ onInit() { - + clockModule() + dateModule() + batteryModule() + heartRateModule() + distanceModule() }, build() { - clockModule() - dateModule() - batteryModule() - heartRateModule() - distanceModule() }, onDestroy() { diff --git a/watchface/modules/battery.js b/watchface/modules/battery.js index 239fe6d..352716e 100644 --- a/watchface/modules/battery.js +++ b/watchface/modules/battery.js @@ -1,3 +1,4 @@ +import { getScene, SCENE_AOD } from '@zos/app' import * as hmSensor from '@zos/sensor' import * as hmUI from '@zos/ui' import fontArray from '../fontData/secondaryFont' @@ -5,28 +6,31 @@ import fontArray from '../fontData/secondaryFont' let batteryWg; const moduleX = 310 const moduleY = 10 -export default function(){ - console.log("[modules]: battery module init") - let battery = new hmSensor.Battery() - updateBatteryWidget(battery.getCurrent()) - battery.onChange(() => updateBatteryWidget(battery.getCurrent())) +export default function () { + console.log("[modules]: battery module init") + let battery = new hmSensor.Battery() + updateBatteryWidget(battery.getCurrent()) + battery.onChange(() => updateBatteryWidget(battery.getCurrent())) + if (getScene() != SCENE_AOD) hmUI.createWidget(hmUI.widget.IMG, { - x: moduleX, - y: moduleY, - src: 'date/perc.PNG' - }) + x: moduleX, + y: moduleY, + src: 'date/perc.PNG' + }) } -function updateBatteryWidget(batteryPercentage){ - if(batteryWg){ - hmUI.deleteWidget(batteryWg) - } - batteryWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, { - x: moduleX - 85, - y: moduleY, - type: hmUI.data_type.BATTERY, - font_array: fontArray, - h_space: 1, - align_h: hmUI.align.RIGHT, - text: batteryPercentage - }) +function updateBatteryWidget(batteryPercentage) { + if (batteryWg) + hmUI.deleteWidget(batteryWg) + + if (getScene() != SCENE_AOD) { + batteryWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, { + x: moduleX - 85, + y: moduleY, + type: hmUI.data_type.BATTERY, + font_array: fontArray, + h_space: 1, + align_h: hmUI.align.RIGHT, + text: batteryPercentage + }) + } } \ No newline at end of file diff --git a/watchface/modules/clock.js b/watchface/modules/clock.js index aab576d..e27fa84 100644 --- a/watchface/modules/clock.js +++ b/watchface/modules/clock.js @@ -1,29 +1,33 @@ import * as hmUI from '@zos/ui' +import { getScene, SCENE_AOD } from '@zos/app' import timeArray from '../fontData/primaryFont' -export default function(){ - console.log("[modules]: clock module init") + +export default function () { + console.log("[modules]: clock module init") + hmUI.createWidget(hmUI.widget.IMG_TIME, { + hour_zero: 1, // Whether to make up zero. + hour_startX: 10, + hour_startY: 50, + hour_array: timeArray, + hour_space: 1, + hour_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V, //Я хз работает ли это + show_level: hmUI.show_level.ONLY_NORMAL | hmUI.show_level.ONAL_AOD + }) + hmUI.createWidget(hmUI.widget.IMG_TIME, { + minute_startX: 118, //120 - space on center(2) + minute_startY: 170, + minute_array: timeArray, + minute_space: 1, + minute_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V, + show_level: hmUI.show_level.ONLY_NORMAL | hmUI.show_level.ONAL_AOD + }) + if (getScene() != SCENE_AOD) { hmUI.createWidget(hmUI.widget.IMG_TIME, { - hour_zero: 1, // Whether to make up zero. - hour_startX: 10, - hour_startY: 50, - hour_array: timeArray, - hour_space: 1, - hour_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V, //Я хз работает ли это - show_level: hmUI.show_level.ONLY_NORMAL | hmUI.show_level.ONAL_AOD - }) - hmUI.createWidget(hmUI.widget.IMG_TIME, { - minute_startX: 118, //120 - space on center(2) - minute_startY: 170, - minute_array: timeArray, - minute_space: 1, - minute_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V, - show_level: hmUI.show_level.ONLY_NORMAL | hmUI.show_level.ONAL_AOD - }) - hmUI.createWidget(hmUI.widget.IMG_TIME, { - second_startX: 220, - second_startY: 290, - second_array: timeArray, - second_space: 1, - second_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V - }) + second_startX: 220, + second_startY: 290, + second_array: timeArray, + second_space: 1, + second_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V + }) + } } \ No newline at end of file diff --git a/watchface/modules/distance.js b/watchface/modules/distance.js index d41c877..d58a13f 100644 --- a/watchface/modules/distance.js +++ b/watchface/modules/distance.js @@ -1,3 +1,4 @@ +import { getScene, SCENE_AOD } from '@zos/app' import * as hmSensor from '@zos/sensor' import * as hmUI from '@zos/ui'; import secondaryFont from '../fontData/secondaryFont'; @@ -5,32 +6,36 @@ import secondaryFont from '../fontData/secondaryFont'; let distWg; const moduleX = 50 const moduleY = 405 -export default function(){ +export default function () { console.log("[modules]: distance module init") let distance = new hmSensor.Distance(); updateDistance(distance.getCurrent()) distance.onChange(() => updateDistance(distance.getCurrent())) - hmUI.createWidget(hmUI.widget.IMG, { - x: moduleX, - y: moduleY, - src: 'misc/dist.PNG' - }) + if (getScene() != SCENE_AOD) { + hmUI.createWidget(hmUI.widget.IMG, { + x: moduleX, + y: moduleY, + src: 'misc/dist.PNG' + }) + } } -function updateDistance(dist){ - if(!dist){ +function updateDistance(dist) { + if (!dist) dist = 0 - } - if(distWg){ + + if (distWg) hmUI.deleteWidget(distWg) + + if (getScene() != SCENE_AOD) { + distWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, { + x: moduleX + 150, + y: moduleY, + type: hmUI.data_type.DISTANCE, + font_array: secondaryFont, + h_space: 1, + align_h: hmUI.align.LEFT, + text: dist + }) } - distWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, { - x: moduleX + 150, - y: moduleY, - type: hmUI.data_type.DISTANCE, - font_array: secondaryFont, - h_space: 1, - align_h: hmUI.align.LEFT, - text: dist - }) } \ No newline at end of file diff --git a/watchface/modules/heartRate.js b/watchface/modules/heartRate.js index a22a759..ec70d91 100644 --- a/watchface/modules/heartRate.js +++ b/watchface/modules/heartRate.js @@ -1,34 +1,38 @@ +import { getScene, SCENE_AOD } from '@zos/app' import * as hmSensor from '@zos/sensor' import * as hmUI from '@zos/ui'; import secondaryFont from '../fontData/secondaryFont'; let heartRateWg; -export default function(){ +export default function () { console.log("[modules]: heartrate module init") let heart = new hmSensor.HeartRate(); updateHeartWidget(heart.getCurrent()) heart.onCurrentChange(() => updateHeartWidget(heart.getCurrent())) - hmUI.createWidget(hmUI.widget.IMG, { - x: 10, - y: 365, - src: 'misc/hb.PNG' - }) + if (!getScene() != SCENE_AOD) + hmUI.createWidget(hmUI.widget.IMG, { + x: 10, + y: 365, + src: 'misc/hb.PNG' + }) } -function updateHeartWidget(hbpm){ - if(!hbpm){ +function updateHeartWidget(hbpm) { + if (!hbpm) { hbpm = 0 } - if(heartRateWg){ + if (heartRateWg) { hmUI.deleteWidget(heartRateWg) } - heartRateWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, { - x: 100, - y: 365, - type: hmUI.data_type.BATTERY, - font_array: secondaryFont, - h_space: 1, - align_h: hmUI.align.LEFT, - text: hbpm - }) + if (!getScene() != SCENE_AOD) { + heartRateWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, { + x: 100, + y: 365, + type: hmUI.data_type.BATTERY, + font_array: secondaryFont, + h_space: 1, + align_h: hmUI.align.LEFT, + text: hbpm + }) + } } \ No newline at end of file