From: @CHENG <2393524978@qq.com>
Date: Thu, 23 May 2024 08:52:19 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=ce51b4f317bf4ceb1d1eca7f9762879b4ee7bf2e;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/project/Z5_K7_OH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7_OH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 636e02ad..421d97e4 100644
--- a/2.sdk/project/Z5_K7_OH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K7_OH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -100,7 +100,7 @@
 
 #define USE_NON_DIRECT_POWER_OFF 0
 
-#define USE_POWER_OFF_GIF 1
+#define USE_POWER_OFF_GIF 0 // 1
 
 #define USE_LV_MULTI_LANG 1
 
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 16bd0fe5..a84aec0e 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
@@ -119,6 +119,16 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
 	lv_obj_set_width(info_label, LV_HOR_RES - 20);
 #endif
     lv_label_set_align(info_label, LV_LABEL_ALIGN_CENTER);
+
+#ifdef MMI_PROJECT_Z5_K7_OH
+	snprintf(info_str, sizeof(info_str) - 1, "%s\n%s\n\n%s\n%s", 
+						(char *)lv_lang_get_text(WATCH_TEXT_ID_MODE),
+						app_adaptor_get_model_id(), 
+						(char *)lv_lang_get_text(WATCH_TEXT_ID_VERSION_NUM),
+						"OpenHarmony-4.1.7.7"
+						);
+
+#else
 	//snprintf(info_str, 96, "%s:%s\n%s:%s", (char *)lv_lang_get_text(WATCH_TEXT_ID_MODE), app_adaptor_get_model_id(), 
 	//					(char *)lv_lang_get_text(WATCH_TEXT_ID_VERSION_NUM), app_adaptor_get_version());
 	
@@ -130,6 +140,8 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
 						app_adaptor_get_version(),
 						imei_str
 						);
+#endif
+	
 	lv_label_set_text(info_label, info_str);
 #ifdef USE_LV_WATCH_UI_CIRCLE
 	#ifdef USE_LV_WATCH_UI_466_466
diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
index 5c94fae6..089f33ed 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -13,12 +13,16 @@ extern "C" {
 //******** audio resource begin ********
 
 #ifndef __MMI_POWER_ON_OFF_NO_RING__
+#if USE_POWER_ON_GIF
 #define AUDIO_POWER_ON                    "R:/audio/audio_power_on.mid"
 #endif
+#endif
 
 #ifndef __MMI_POWER_ON_OFF_NO_RING__
+#if USE_POWER_OFF_GIF
 #define AUDIO_POWER_OFF                   "R:/audio/audio_power_off.mid"
 #endif
+#endif
 
 #define AUDIO_INCOMING_CALL          	"R:/audio/audio_incoming_call.mid"