fix: cleanup, AOD fixes
This commit is contained in:
parent
dd8aa149af
commit
0c961f777a
2
app.json
2
app.json
@ -6,7 +6,7 @@
|
||||
"appType": "watchface",
|
||||
"version": {
|
||||
"code": 1,
|
||||
"name": "1.0.2"
|
||||
"name": "1.0.3"
|
||||
},
|
||||
"icon": "icon.png",
|
||||
"vender": "zepp",
|
||||
|
@ -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": {
|
||||
|
@ -6,10 +6,6 @@ import heartRateModule from "./modules/heartRate"
|
||||
|
||||
WatchFace({
|
||||
onInit() {
|
||||
|
||||
},
|
||||
|
||||
build() {
|
||||
clockModule()
|
||||
dateModule()
|
||||
batteryModule()
|
||||
@ -17,6 +13,9 @@ WatchFace({
|
||||
distanceModule()
|
||||
},
|
||||
|
||||
build() {
|
||||
},
|
||||
|
||||
onDestroy() {
|
||||
|
||||
}
|
||||
|
@ -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,21 +6,23 @@ import fontArray from '../fontData/secondaryFont'
|
||||
let batteryWg;
|
||||
const moduleX = 310
|
||||
const moduleY = 10
|
||||
export default function(){
|
||||
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'
|
||||
})
|
||||
}
|
||||
function updateBatteryWidget(batteryPercentage){
|
||||
if(batteryWg){
|
||||
function updateBatteryWidget(batteryPercentage) {
|
||||
if (batteryWg)
|
||||
hmUI.deleteWidget(batteryWg)
|
||||
}
|
||||
|
||||
if (getScene() != SCENE_AOD) {
|
||||
batteryWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, {
|
||||
x: moduleX - 85,
|
||||
y: moduleY,
|
||||
@ -29,4 +32,5 @@ function updateBatteryWidget(batteryPercentage){
|
||||
align_h: hmUI.align.RIGHT,
|
||||
text: batteryPercentage
|
||||
})
|
||||
}
|
||||
}
|
@ -1,6 +1,8 @@
|
||||
import * as hmUI from '@zos/ui'
|
||||
import { getScene, SCENE_AOD } from '@zos/app'
|
||||
import timeArray from '../fontData/primaryFont'
|
||||
export default function(){
|
||||
|
||||
export default function () {
|
||||
console.log("[modules]: clock module init")
|
||||
hmUI.createWidget(hmUI.widget.IMG_TIME, {
|
||||
hour_zero: 1, // Whether to make up zero.
|
||||
@ -19,6 +21,7 @@ export default function(){
|
||||
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, {
|
||||
second_startX: 220,
|
||||
second_startY: 290,
|
||||
@ -26,4 +29,5 @@ export default function(){
|
||||
second_space: 1,
|
||||
second_align: hmUI.align.CENTER_H | hmUI.align.CENTER_V
|
||||
})
|
||||
}
|
||||
}
|
@ -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,25 +6,28 @@ 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()))
|
||||
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,
|
||||
@ -33,4 +37,5 @@ function updateDistance(dist){
|
||||
align_h: hmUI.align.LEFT,
|
||||
text: dist
|
||||
})
|
||||
}
|
||||
}
|
@ -1,13 +1,15 @@
|
||||
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()))
|
||||
if (!getScene() != SCENE_AOD)
|
||||
hmUI.createWidget(hmUI.widget.IMG, {
|
||||
x: 10,
|
||||
y: 365,
|
||||
@ -15,13 +17,14 @@ export default function(){
|
||||
})
|
||||
}
|
||||
|
||||
function updateHeartWidget(hbpm){
|
||||
if(!hbpm){
|
||||
function updateHeartWidget(hbpm) {
|
||||
if (!hbpm) {
|
||||
hbpm = 0
|
||||
}
|
||||
if(heartRateWg){
|
||||
if (heartRateWg) {
|
||||
hmUI.deleteWidget(heartRateWg)
|
||||
}
|
||||
if (!getScene() != SCENE_AOD) {
|
||||
heartRateWg = hmUI.createWidget(hmUI.widget.TEXT_IMG, {
|
||||
x: 100,
|
||||
y: 365,
|
||||
@ -31,4 +34,5 @@ function updateHeartWidget(hbpm){
|
||||
align_h: hmUI.align.LEFT,
|
||||
text: hbpm
|
||||
})
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user