From: @CHENG <2393524978@qq.com>
Date: Wed, 6 Nov 2024 12:01:55 +0000 (+0800)
Subject: k18
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f61cea8ef75cdec8be6074d35d91f708b36b04c2;p=mirrors%2FASR3603_Z5.git

k18
---

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h
index 36ecd445..01547f5d 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h
@@ -49,6 +49,8 @@ extern "C" {
 #define HENGAI_HTTP_POST_APP_KEY	("5d3ef21f0cbf966505c3d5137740be77")
 #endif
 
+//#define HENGAI_HTTP_POST_URL_COMMON_PREFIX	("http://test.aicaring.com:9997/api/v0")
+//#define HENGAI_HTTP_POST_APP_KEY	("5d3ef21f0cbf966505c3d5137740be77")
 
 #ifdef __MMI_CUSTOM_HENGAI_HEALTH_UPLOAD_USE_TCP__
 typedef enum
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
index fc5e86e9..0bc2ccb9 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
@@ -397,7 +397,7 @@ static bool mmi_hengai_k18_sleep_data_send(void)
 
 static void mmi_hengai_k18_sleep_data_get(void)
 {
-	//if(0 != mmi_hsensor_measure_get_wear_status())
+	if(0 != mmi_hsensor_measure_get_wear_status())
 	{
 		sleep_time_t curtime = {0};
 		hal_rtc_t cur_time = {0};
@@ -483,6 +483,7 @@ void mmi_hengai_get_sleep_data_start(void)
 	else
 		uos_timer_create(&s_hengai_sleep_gsensor_timer_id);
 
+	s_sleep_data_in_same_cycle = false;
 	s_hengai_sleep_gsensor_counter = 0;
 	_lv_memset_00(s_hengai_sleep_gsensor_data, sizeof(s_hengai_sleep_gsensor_data));
 	
@@ -573,15 +574,31 @@ void mmi_hengai_sleep_data_set(sleep_data_t * data) // (nv_watch_hengai_sleep_da
 		s_sleep_data_in_same_cycle = true;
 
 		s_hengai_sleep_data.total_sleep_time = data->total_sleep_time;
-		_lv_memcpy(&(s_hengai_sleep_data.begin_sleep_time), &(data->begin_sleep_time), sizeof(nv_sleep_time_t));
-		_lv_memcpy(&(s_hengai_sleep_data.end_sleep_time), &(data->end_sleep_time), sizeof(nv_sleep_time_t));
+		//_lv_memcpy(&(s_hengai_sleep_data.begin_sleep_time), &(data->begin_sleep_time), sizeof(nv_sleep_time_t));
+		//_lv_memcpy(&(s_hengai_sleep_data.end_sleep_time), &(data->end_sleep_time), sizeof(nv_sleep_time_t));
+		s_hengai_sleep_data.begin_sleep_time.year = data->begin_sleep_time.year;
+		s_hengai_sleep_data.begin_sleep_time.month = data->begin_sleep_time.month;
+		s_hengai_sleep_data.begin_sleep_time.day = data->begin_sleep_time.day;
+		s_hengai_sleep_data.begin_sleep_time.hour = data->begin_sleep_time.hour;
+		s_hengai_sleep_data.begin_sleep_time.minute = data->begin_sleep_time.minute;
+
+		s_hengai_sleep_data.end_sleep_time.year = data->end_sleep_time.year;
+		s_hengai_sleep_data.end_sleep_time.month = data->end_sleep_time.month;
+		s_hengai_sleep_data.end_sleep_time.day = data->end_sleep_time.day;
+		s_hengai_sleep_data.end_sleep_time.hour = data->end_sleep_time.hour;
+		s_hengai_sleep_data.end_sleep_time.minute = data->end_sleep_time.minute;
 	}
 	else
 	{
 		UART_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 
 		s_hengai_sleep_data.total_sleep_time += data->total_sleep_time;
-		_lv_memcpy(&(s_hengai_sleep_data.end_sleep_time), &(data->end_sleep_time), sizeof(nv_sleep_time_t));
+		//_lv_memcpy(&(s_hengai_sleep_data.end_sleep_time), &(data->end_sleep_time), sizeof(nv_sleep_time_t));
+		s_hengai_sleep_data.end_sleep_time.year = data->end_sleep_time.year;
+		s_hengai_sleep_data.end_sleep_time.month = data->end_sleep_time.month;
+		s_hengai_sleep_data.end_sleep_time.day = data->end_sleep_time.day;
+		s_hengai_sleep_data.end_sleep_time.hour = data->end_sleep_time.hour;
+		s_hengai_sleep_data.end_sleep_time.minute = data->end_sleep_time.minute;
 	}
 	mmi_hengai_sleep_data_nv_write();
 }
@@ -651,8 +668,8 @@ lv_obj_t * mmi_sleep_detail_create(lv_obj_t * tileview, uint16_t id)
 	lv_obj_align(label_fall_asleep, NULL, LV_ALIGN_IN_LEFT_MID, 20, -10);
 
 	if(0 == s_hengai_sleep_data.total_sleep_time
-		&& 0 == s_hengai_sleep_data.begin_sleep_time.hour 
-		&& 0 == s_hengai_sleep_data.begin_sleep_time.minute
+		//&& 0 == s_hengai_sleep_data.begin_sleep_time.hour 
+		//&& 0 == s_hengai_sleep_data.begin_sleep_time.minute
 		)
 	{
 		snprintf(temp_buf, 64, "--");
@@ -682,8 +699,8 @@ lv_obj_t * mmi_sleep_detail_create(lv_obj_t * tileview, uint16_t id)
 	lv_obj_align(label_wake_up, NULL, LV_ALIGN_IN_RIGHT_MID, -20, -10);
 
 	if(0 == s_hengai_sleep_data.total_sleep_time
-		&& 0 == s_hengai_sleep_data.end_sleep_time.hour 
-		&& 0 == s_hengai_sleep_data.end_sleep_time.minute
+		//&& 0 == s_hengai_sleep_data.end_sleep_time.hour 
+		//&& 0 == s_hengai_sleep_data.end_sleep_time.minute
 		)
 	{
 		snprintf(temp_buf, 64, "--");
@@ -771,9 +788,9 @@ static lv_obj_t * mmi_sleep_info_create(lv_obj_t * tileview, uint16_t id)
 
 	// update time
 	if(0 != s_hengai_sleep_data.total_sleep_time
-		&& (0 != s_hengai_sleep_data.end_sleep_time.hour 
-			|| 0 != s_hengai_sleep_data.end_sleep_time.minute
-			)
+		//&& (0 != s_hengai_sleep_data.end_sleep_time.hour 
+		//	|| 0 != s_hengai_sleep_data.end_sleep_time.minute
+		//	)
 		)
 	{
 		lv_obj_t * label_prompt = lv_label_create(cont, NULL);