From: CCC <2393524978@qq.com>
Date: Tue, 22 Aug 2023 06:46:11 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=cfe2adfe7831096fe6e6b673bfdc9c831d2c1874;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/upay_interface.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/upay_interface.c
index 36aa62cc..dbeb21f9 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/upay_interface.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/upay_interface.c
@@ -213,7 +213,7 @@ void alipay_return_bind_qrcode()
 }
 
 /* TODO adds alipay itf by dsp */
-void alipay_show_unbind_success(uint8 unbind_st)
+void alipay_show_unbind_success(uint8_t unbind_st)
 {
     if(unbind_st)
     { //由手机端APP解绑，无需处理
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
index b9589c6b..e99a3c09 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
@@ -107,7 +107,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para)
 		{
 			if(MMI_HEALTH_MEASURE_STATE_UI == mmi_health_measure_state_get())
 			{
-				uint16 value = 0;
+				uint16_t value = 0;
 				
 				mmi_health_measure_heart_data_ui_get(&value);
 				if(value)
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
index a739c3cc..8f65788a 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
@@ -46,17 +46,17 @@ bool mmi_hsensor_is_open(void)
 	return true;
 }
 
-static void mmi_hsensor_heart_value_get(uint16 * heart_value)
+static void mmi_hsensor_heart_value_get(uint16_t * heart_value)
 {
 	mmi_hsensor_measure_value_get(heart_value, NULL, NULL, NULL);
 }
 
-static void mmi_hsensor_blood_value_get(uint16 * blood_high_value, uint16 * blood_low_value)
+static void mmi_hsensor_blood_value_get(uint16_t * blood_high_value, uint16_t * blood_low_value)
 {
 	mmi_hsensor_measure_value_get(NULL, blood_high_value, blood_low_value, NULL);
 }
 
-static void mmi_hsensor_spo2_value_get(uint16 * spo2_value)
+static void mmi_hsensor_spo2_value_get(uint16_t * spo2_value)
 {
 	mmi_hsensor_measure_value_get(NULL, NULL, NULL, spo2_value);
 }
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
index d656a7ea..8669d7bc 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
@@ -109,7 +109,7 @@ static void health_spo2_measure_cycle_timeout(void * para)
 		{
 			if(MMI_HEALTH_MEASURE_STATE_UI == mmi_health_measure_state_get())
 			{
-				uint16 value = 0;
+				uint16_t value = 0;
 				
 				mmi_health_measure_spo2_data_ui_get(&value);
 				if(value)
diff --git a/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h b/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h
index d8ab1c1d..f04da95b 100644
--- a/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h
+++ b/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h
@@ -806,7 +806,7 @@ typedef struct
 #define USE_LV_FLASH_FS         1
 #define USE_LV_ROM_FS           1
 #define FILE_INODE_BUF_SIZE    16 /*Lv_romfs.c file cahce size set 16,Low memory change size to 4*/
-#define USE_LV_SD_FS            1
+#define USE_LV_SD_FS            0 // 1
 #define USE_LV_BARCODE          0
 #define USE_LV_QRCODE           1