From: @CHENG <2393524978@qq.com>
Date: Fri, 12 Jan 2024 06:25:01 +0000 (+0800)
Subject: 466
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=af34dd5ab80f798fffa42e1b1a3934ee7d582239;p=mirrors%2FASR3603_Z5.git

466
---

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
index ca737709..6ed96010 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
@@ -198,7 +198,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
 		
 	    lv_obj_t * label = lv_label_create(obj, NULL);
 	#ifdef USE_LV_WATCH_UI_466_466
-		lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font36);
+		lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
 	#else
 	    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
 	#endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
index 22e2fdd9..8967174c 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
@@ -750,7 +750,7 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par)
         //lv_obj_align(label_nophoto, NULL, LV_ALIGN_IN_BOTTOM_MID, 10, -20);
         //lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
 	#ifdef USE_LV_WATCH_UI_466_466
-		lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font36_black);
+		lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
 		lv_obj_align(label_nophoto, NULL, LV_ALIGN_CENTER, 0, -10);
 	#else
         lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30_black);
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
index fe839755..53fa3d6a 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
@@ -78,7 +78,7 @@ lv_obj_t * factorymode_reset_create(lv_obj_t * activity_obj)
 
 #ifdef USE_LV_WATCH_UI_466_466
     lv_obj_align(label_tip, obj, LV_ALIGN_IN_TOP_MID, 0, 120);
-    lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font40);
 #else
     lv_obj_align(label_tip, obj, LV_ALIGN_IN_TOP_MID, 0, 50);
     lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font26);
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
index 8ef16368..aea41291 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
@@ -52,7 +52,7 @@ extern "C" {
 #define HEART_LABEL_VALUE_W		(LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H		(50 + 50)
 
-#define HEART_LABEL_MEASURE_PROMPT_FONT	(lv_watch_font36)
+#define HEART_LABEL_MEASURE_PROMPT_FONT	(lv_watch_font40)
 #define HEART_LABEL_MEASURE_VALUE_FONT	(lv_watch_font60)
 #define HEART_LABEL_MEASURE_FAIL_FONT	(lv_watch_font40)
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
index 2fbc9cfe..ecf4409c 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
@@ -52,7 +52,7 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W		(LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H		(50 + 50)
 
-#define SPO2_LABEL_MEASURE_PROMPT_FONT	(lv_watch_font36)
+#define SPO2_LABEL_MEASURE_PROMPT_FONT	(lv_watch_font40)
 #define SPO2_LABEL_MEASURE_VALUE_FONT	(lv_watch_font60)
 #define SPO2_LABEL_MEASURE_FAIL_FONT	(lv_watch_font40)
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
index 27751e4a..eb3a2604 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
@@ -52,7 +52,7 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W		(LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H		(50 + 50)
 
-#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT	(lv_watch_font36)
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT	(lv_watch_font40)
 #define TEMPERATURE_LABEL_MEASURE_VALUE_FONT	(lv_watch_font60)
 #define TEMPERATURE_LABEL_MEASURE_FAIL_FONT		(lv_watch_font40)
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
index d6240546..955319a3 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
@@ -1985,7 +1985,7 @@ lv_obj_t * wechat_create(lv_obj_t * activity_obj, lv_wechat_created_from_e from)
 	// no network
 	ext->label_no_network = lv_label_create(cont, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-	lv_obj_add_style(ext->label_no_network, LV_LABEL_PART_MAIN, &lv_watch_font36_black);
+	lv_obj_add_style(ext->label_no_network, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
 #else
 	lv_obj_add_style(ext->label_no_network, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
 #endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h
index 5cc91f8d..5899491a 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h
@@ -149,7 +149,7 @@ char * mmi_page_main_menu_tts_info_get(uint8_t menu_index);
 #ifdef __MMI_MAIN_MENU_LIST_STYLE__
 
 #ifdef USE_LV_WATCH_UI_466_466
-#define MMI_MAIN_MENU_LIST_STYLE_TEXT_FONT	(lv_watch_font36)
+#define MMI_MAIN_MENU_LIST_STYLE_TEXT_FONT	(lv_watch_font40)
 #else // USE_LV_WATCH_UI_240_240
 #define MMI_MAIN_MENU_LIST_STYLE_TEXT_FONT	(lv_watch_font26)
 #endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c
index 1e7eabb2..f5a61e10 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c
@@ -93,7 +93,7 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj)
 
     label_restart = lv_label_create(btn_restart, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_add_style(label_restart, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_obj_add_style(label_restart, LV_LABEL_PART_MAIN, &lv_watch_font40);
 #else
     lv_obj_add_style(label_restart, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
 #endif
@@ -108,7 +108,7 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj)
 
     label_reset = lv_label_create(btn_reset, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-	lv_obj_add_style(label_reset, LV_LABEL_PART_MAIN, &lv_watch_font36);
+	lv_obj_add_style(label_reset, LV_LABEL_PART_MAIN, &lv_watch_font40);
 #else
     lv_obj_add_style(label_reset, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
 #endif
@@ -180,7 +180,7 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj)
 #ifdef USE_LV_WATCH_UI_466_466
 	label_tip = lv_label_create(obj, NULL);
 	lv_label_set_text_id(label_tip, WATCH_TEXT_ID_RESTART_Q);
-	lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font36);
+	lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font40);
 	lv_obj_align(label_tip, obj, LV_ALIGN_CENTER, 0, -40);
 #else
     content = lv_cont_create(obj, NULL);
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
index 63a5d7dd..8f481f9c 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
@@ -105,7 +105,7 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
 
     lv_obj_t * info_label = lv_label_create(content, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font40);
     lv_label_set_long_mode(info_label, LV_LABEL_LONG_BREAK);
 	lv_obj_set_width(info_label, LV_HOR_RES - 60);
 #else
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
index 6c412d23..c9899892 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
@@ -70,7 +70,7 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm)
         //label = lv_label_create(obj, NULL);
         //lv_obj_set_width(label, lv_obj_get_width(obj) - 40);
 	#ifdef USE_LV_WATCH_UI_466_466
-		lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+		lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
 	#else
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
 	#endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c
index 42d317c5..4c3ecc19 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c
@@ -99,7 +99,7 @@ lv_obj_t * stopwatch_create(lv_obj_t * activity_obj)
         lv_label_set_text_id(img_ext->label_title, WATCH_TEXT_ID_PAUSE);
     }
 #ifdef USE_LV_WATCH_UI_466_466
-	lv_obj_add_style(img_ext->label_title, LV_LABEL_PART_MAIN, &lv_watch_font36);
+	lv_obj_add_style(img_ext->label_title, LV_LABEL_PART_MAIN, &lv_watch_font40);
 #endif
     lv_obj_align(img_ext->label_title, img, LV_ALIGN_IN_TOP_MID, 0, height / 5);
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c b/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c
index 363b04ca..275b5c7a 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c
@@ -212,7 +212,7 @@ lv_obj_t * timer_list_create(lv_obj_t * activity_obj)
         lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
         lv_obj_set_width(label, lv_obj_get_width(btn));
 	#ifdef USE_LV_WATCH_UI_466_466
-		lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+		lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
 	#endif
         lv_label_set_text_id(label, timer_item[i].txt_id);
         lv_obj_set_click(label, false);
@@ -343,7 +343,7 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
     lv_obj_t * label_time_remaining = lv_label_create(obj, NULL);
     lv_label_set_text(label_time_remaining, str);
 #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_add_style(label_time_remaining, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_obj_add_style(label_time_remaining, LV_LABEL_PART_MAIN, &lv_watch_font40);
 	lv_obj_align(label_time_remaining, NULL, LV_ALIGN_CENTER, 0, -20);
 #else
     lv_obj_add_style(label_time_remaining, LV_LABEL_PART_MAIN, &lv_watch_font30);
@@ -359,7 +359,7 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
         lv_label_set_text_id(label_info, WATCH_TEXT_ID_TIMER);
     }
 #ifdef USE_LV_WATCH_UI_466_466
-	lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font36);
+	lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font40);
 	lv_obj_align(label_info, label_time_remaining, LV_ALIGN_OUT_TOP_MID, 0, -20);
 #else
     lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font20);
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c
index c0c0db6d..7d7cb0a3 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c
@@ -44,7 +44,7 @@ static lv_obj_t * weather_content_no_info_create(lv_obj_t * par)
 
     lv_obj_t * label = lv_label_create(content, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
 #else
     lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #endif
@@ -105,7 +105,7 @@ static lv_obj_t * weather_content_info_create(lv_obj_t * par, app_adaptor_weathe
 
     lv_obj_t * label_city = lv_label_create(content, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_add_style(label_city, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_obj_add_style(label_city, LV_LABEL_PART_MAIN, &lv_watch_font40);
 #else
     lv_obj_add_style(label_city, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c
index 310dd045..87dbce74 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c
@@ -213,7 +213,7 @@ lv_obj_t * lv_watch_list_add(lv_obj_t * obj, const void * img_src, watchLangTxtI
     lv_label_set_text_id(label, txtId);
 #ifdef __MMI_ZHSX_SUPPORT__
 #ifdef USE_LV_WATCH_UI_466_466
-	lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font36);
+	lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
 #else
 	lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
 #endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
index 8e0e1aa7..a3c904c4 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
@@ -218,6 +218,7 @@ lv_style_t lv_watch_font30_black;
 lv_style_t lv_watch_font30_gray;
 lv_style_t lv_watch_font30_yellow;
 lv_style_t lv_watch_font40;
+lv_style_t lv_watch_font40_black;
 lv_style_t lv_watch_font40_yellow;
 lv_style_t lv_watch_cont_opa1;
 lv_style_t lv_watch_cont_opa2;
@@ -1056,6 +1057,10 @@ static void lv_theme_watch_set_private_style(void)
     lv_style_set_text_color(&lv_watch_font40, LV_STATE_DEFAULT, LV_COLOR_WHITE);
     lv_style_set_text_font(&lv_watch_font40, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_40);
 
+	style_init_reset(&lv_watch_font40_black);
+	lv_style_set_text_color(&lv_watch_font40_black, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+	lv_style_set_text_font(&lv_watch_font40_black, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_40);
+
     /*font 40 yellow*/
     style_init_reset(&lv_watch_font40_yellow);
     lv_style_set_text_color(&lv_watch_font40_yellow, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
diff --git a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
index 6955323d..b6c05c9b 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
@@ -128,6 +128,7 @@ extern lv_style_t lv_watch_font30_black;
 extern lv_style_t lv_watch_font30_gray;
 extern lv_style_t lv_watch_font30_yellow;
 extern lv_style_t lv_watch_font40;
+extern lv_style_t lv_watch_font40_black;
 extern lv_style_t lv_watch_font40_yellow;
 extern lv_style_t lv_watch_cont_opa1;
 extern lv_style_t lv_watch_cont_opa2;
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index be60f584..104376e9 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -811,7 +811,7 @@ static lv_obj_t * mmi_watch_charging_prompt_screen_create(lv_obj_t * activity_ob
 	lv_obj_t * label = lv_label_create(cont, NULL);
 	lv_label_set_text_id(label, ((HAL_CHG_CONNECTED == (HAL_CHG_STATUS)chg_status) ? WATCH_TEXT_ID_CHARGE_CONNECTED : WATCH_TEXT_ID_CHARGE_REMOVED));
 #ifdef USE_LV_WATCH_UI_466_466
-	lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+	lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
 	lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
 	lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 30);
 #else