Working G7710 weather
This commit is contained in:
parent
ae01a54f0c
commit
40ef10113f
@ -6,6 +6,8 @@
|
|||||||
#include "displayapp/screens/BleIcon.h"
|
#include "displayapp/screens/BleIcon.h"
|
||||||
#include "displayapp/screens/NotificationIcon.h"
|
#include "displayapp/screens/NotificationIcon.h"
|
||||||
#include "displayapp/screens/Symbols.h"
|
#include "displayapp/screens/Symbols.h"
|
||||||
|
#include "displayapp/screens/WeatherSymbols.h"
|
||||||
|
|
||||||
#include "components/battery/BatteryController.h"
|
#include "components/battery/BatteryController.h"
|
||||||
#include "components/ble/BleController.h"
|
#include "components/ble/BleController.h"
|
||||||
#include "components/ble/NotificationManager.h"
|
#include "components/ble/NotificationManager.h"
|
||||||
@ -29,8 +31,8 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi
|
|||||||
bleController {bleController},
|
bleController {bleController},
|
||||||
notificatioManager {notificatioManager},
|
notificatioManager {notificatioManager},
|
||||||
settingsController {settingsController},
|
settingsController {settingsController},
|
||||||
weatherService {weatherService},
|
motionController {motionController},
|
||||||
motionController {motionController} {
|
weatherService {weatherService} {
|
||||||
|
|
||||||
lfs_file f = {};
|
lfs_file f = {};
|
||||||
if (filesystem.FileOpen(&f, "/fonts/lv_font_dots_40.bin", LFS_O_RDONLY) >= 0) {
|
if (filesystem.FileOpen(&f, "/fonts/lv_font_dots_40.bin", LFS_O_RDONLY) >= 0) {
|
||||||
@ -63,13 +65,13 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi
|
|||||||
lv_obj_set_style_local_text_color(weatherIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
|
lv_obj_set_style_local_text_color(weatherIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
|
||||||
lv_obj_set_style_local_text_font(weatherIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &fontawesome_weathericons);
|
lv_obj_set_style_local_text_font(weatherIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &fontawesome_weathericons);
|
||||||
lv_label_set_text(weatherIcon, "");
|
lv_label_set_text(weatherIcon, "");
|
||||||
lv_obj_align(weatherIcon, nullptr, LV_ALIGN_IN_TOP_MID, -20, 50);
|
lv_obj_align(weatherIcon, nullptr, LV_ALIGN_IN_BOTTOM_MID, -20, 2);
|
||||||
lv_obj_set_auto_realign(weatherIcon, true);
|
lv_obj_set_auto_realign(weatherIcon, true);
|
||||||
|
|
||||||
temperature = lv_label_create(lv_scr_act(), nullptr);
|
temperature = lv_label_create(lv_scr_act(), nullptr);
|
||||||
lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
|
lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
|
||||||
lv_label_set_text(temperature, "");
|
lv_label_set_text(temperature, "");
|
||||||
lv_obj_align(temperature, nullptr, LV_ALIGN_IN_TOP_MID, 20, 50);
|
lv_obj_align(temperature, nullptr, LV_ALIGN_IN_BOTTOM_MID, 20, 2);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -325,7 +327,7 @@ void WatchFaceCasioStyleG7710::Refresh() {
|
|||||||
}
|
}
|
||||||
temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
|
temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
|
||||||
lv_label_set_text_fmt(temperature, "%d°%c", temp, tempUnit);
|
lv_label_set_text_fmt(temperature, "%d°%c", temp, tempUnit);
|
||||||
lv_label_set_text(weatherIcon, Symbols::GetSymbol(optCurrentWeather->iconId));
|
lv_label_set_text(weatherIcon, Symbols::shoe); //GetSymbol(optCurrentWeather->iconId));
|
||||||
} else {
|
} else {
|
||||||
lv_label_set_text_static(temperature, "");
|
lv_label_set_text_static(temperature, "");
|
||||||
lv_label_set_text(weatherIcon, "");
|
lv_label_set_text(weatherIcon, "");
|
||||||
|
Loading…
Reference in New Issue
Block a user