k18 sleep lib
author@CHENG <2393524978@qq.com>
Mon, 16 Dec 2024 03:41:33 +0000 (11:41 +0800)
committer@CHENG <2393524978@qq.com>
Mon, 16 Dec 2024 03:41:33 +0000 (11:41 +0800)
2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_hr_yll_v0.5.3.121424.a [moved from 2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_hr_yll_v0.5.3.121224.a with 92% similarity]
2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_sleep.a
2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
2.sdk/sdk/gui/lv_watch/include/ui_textid.h
2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h

similarity index 92%
rename from 2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_hr_yll_v0.5.3.121224.a
rename to 2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_hr_yll_v0.5.3.121424.a
index 1d006a3..eab3e6f 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_hr_yll_v0.5.3.121224.a and b/2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_hr_yll_v0.5.3.121424.a differ
index 1d006a3..eab3e6f 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_sleep.a and b/2.sdk/project/Z5_HA_K18/product/craneg_modem/cust/heng_ai_sleep/lib/lib_sleep.a differ
index d5f96cf..7628a66 100644 (file)
@@ -854,6 +854,7 @@ const void * lang_text_ch[] = {
     "APP二维码", // WATCH_TEXT_ID_APP_QRCODE,
     "手机扫码下载APP", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
     "APP绑定码", // WATCH_TEXT_ID_APP_DEVICE_QRCODE,
+    "APP下载/绑定码", // WATCH_TEXT_ID_APP_DL_BIND_QRCODE,
     "未设置号码", // WATCH_TEXT_ID_NO_NUM
     "手机支付宝扫一扫", // WATCH_TEXT_ID_ZFB_BIND_PROMPT
     "收银员扫一扫完成付款", // WATCH_TEXT_ID_ZFB_PAY_PROMPT
index 9391023..74a32c5 100644 (file)
@@ -855,6 +855,7 @@ const void * lang_text_en[] = {
     "APP qrcode", // WATCH_TEXT_ID_APP_QRCODE,
     "Scan qrcode to download", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
     "Download & bind", // WATCH_TEXT_ID_APP_DEVICE_QRCODE,
+    "APP Download & bind", // WATCH_TEXT_ID_APP_DL_BIND_QRCODE,
     "No number", // WATCH_TEXT_ID_NO_NUM
     "Scan with mobile Alipay", // WATCH_TEXT_ID_ZFB_BIND_PROMPT,
     "Cashier scans to complete payment", // WATCH_TEXT_ID_ZFB_PAY_PROMPT, 
index 7245348..74dc582 100644 (file)
@@ -861,6 +861,7 @@ enum
     WATCH_TEXT_ID_APP_QRCODE,                        /* "APP二维码"       "APP qrcode" */
     WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT,                  /* "手机扫码下载APP"       "Scan qrcode to download" */
     WATCH_TEXT_ID_APP_DEVICE_QRCODE,                    /* "APP绑定码"       "Download & bind" */
+    WATCH_TEXT_ID_APP_DL_BIND_QRCODE,                    /* "APP下载/绑定码"       "APP Download & bind" */
     WATCH_TEXT_ID_NO_NUM,                               /* "未设置号码"       "No number" */
     WATCH_TEXT_ID_ZFB_BIND_PROMPT,                        /* "手机支付宝扫一扫"       "Scan with mobile Alipay" */
     WATCH_TEXT_ID_ZFB_PAY_PROMPT,                         /* "收银员扫一扫完成付款"       "Cashier scans to complete payment" */
index 8c81d69..71d59c9 100644 (file)
@@ -2772,13 +2772,12 @@ void mmi_heng_ai_blood_pressure_create_event_cb(lv_obj_t * btn, lv_event_t e)
 
 #if defined(__MMI_CUSTOM_HENGAI_MICRO_HEALTH_CHECKUP__)
 
-#define MICRO_CHECKUP_COUNT_INTERVAL (2)//(3) // 3s
-#define MICRO_PPG_DATA_SINGLE_SEND_COUNT (MMI_HENGAI_BP_RAW_DATA_SAMPLE_RATE * MICRO_CHECKUP_COUNT_INTERVAL)
-#define MICRO_PPG_DATA_BUFFER_LEN ((MICRO_PPG_DATA_SINGLE_SEND_COUNT + 10) * sizeof(int))
+//#define MICRO_CHECKUP_COUNT_INTERVAL (2) // 3s
+//#define MICRO_PPG_DATA_SINGLE_SEND_COUNT (MMI_HENGAI_BP_RAW_DATA_SAMPLE_RATE * MICRO_CHECKUP_COUNT_INTERVAL)
+#define MICRO_PPG_DATA_BUFFER_LEN (MMI_HENGAI_BP_RAW_DATA_LEN * sizeof(int)) // ((MICRO_PPG_DATA_SINGLE_SEND_COUNT + 10) * sizeof(int))
 
 static int * s_hengai_ppg_data_ptr = NULL;
 static int s_hengai_ppg_data_len = 0;
-static uint8_t s_hengai_micro_checkup_count = 0;
 
 static void mmi_hengai_micro_health_checkup_data_send(void)
 {
@@ -2788,7 +2787,7 @@ static void mmi_hengai_micro_health_checkup_data_send(void)
 
        if(NULL == s_hengai_ppg_data_ptr || 0 == s_hengai_ppg_data_len)
        {
-               HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: no data\n", __FUNCTION__, __LINE__);
                return;
        }
 
@@ -2820,27 +2819,32 @@ static void mmi_hengai_micro_health_checkup_data_send(void)
 
 static void mmi_hengai_micro_health_checkup_data_get(void)
 {
+       int * temp_ptr = NULL;
+       
+       if(NULL != s_hengai_ppg_data_ptr)
+       {
+               lv_mem_free(s_hengai_ppg_data_ptr);
+               s_hengai_ppg_data_ptr = NULL;
+       }
+       s_hengai_ppg_data_ptr = (int *)lv_mem_alloc(MICRO_PPG_DATA_BUFFER_LEN);
        if(NULL == s_hengai_ppg_data_ptr)
        {
-               HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: memory empty\n", __FUNCTION__, __LINE__);
+               HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: memory alloc failed\n", __FUNCTION__, __LINE__);
                return;
        }
        _lv_memset_00(s_hengai_ppg_data_ptr, MICRO_PPG_DATA_BUFFER_LEN);
        s_hengai_ppg_data_len = 0;
-
-       int * total_data = fr8012haq_blood_data_get(&s_hengai_ppg_data_len);
-       if(NULL != total_data && 0 != s_hengai_ppg_data_len)
+       
+       temp_ptr = fr8012haq_blood_data_get(&s_hengai_ppg_data_len);
+       if(NULL != temp_ptr)
        {
-               if(MICRO_PPG_DATA_SINGLE_SEND_COUNT < s_hengai_ppg_data_len)
-                       s_hengai_ppg_data_len = MICRO_PPG_DATA_SINGLE_SEND_COUNT;
-               
-               _lv_memcpy(s_hengai_ppg_data_ptr, total_data, sizeof(int) * s_hengai_ppg_data_len);
-               mmi_hengai_micro_health_checkup_data_len_reset(s_hengai_ppg_data_len);
+               _lv_memcpy(s_hengai_ppg_data_ptr, temp_ptr, MICRO_PPG_DATA_BUFFER_LEN);
        }
 }
 
 void mmi_hengai_micro_health_checkup_process(void)
 {
+/*
        s_hengai_micro_checkup_count++;
        if(MICRO_CHECKUP_COUNT_INTERVAL <= s_hengai_micro_checkup_count)
        {
@@ -2848,20 +2852,22 @@ void mmi_hengai_micro_health_checkup_process(void)
                mmi_hengai_micro_health_checkup_data_get();
                mmi_hengai_micro_health_checkup_data_send();
        }
+*/
 }
 
 void mmi_hengai_micro_health_checkup_stop(void)
 {
        HENGAI_HEALTH_UART_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+
+       mmi_hengai_micro_health_checkup_data_get();
+       mmi_hengai_micro_health_checkup_data_send();
        
        if(NULL != s_hengai_ppg_data_ptr)
        {
                lv_mem_free(s_hengai_ppg_data_ptr);
                s_hengai_ppg_data_ptr = NULL;
        }
-
        s_hengai_ppg_data_len = 0;
-       s_hengai_micro_checkup_count = 0;
 }
 
 void mmi_hengai_micro_health_checkup_start(void)
@@ -2873,16 +2879,7 @@ void mmi_hengai_micro_health_checkup_start(void)
                lv_mem_free(s_hengai_ppg_data_ptr);
                s_hengai_ppg_data_ptr = NULL;
        }
-       s_hengai_ppg_data_ptr = (int *)lv_mem_alloc(MICRO_PPG_DATA_BUFFER_LEN);
-       if(NULL == s_hengai_ppg_data_ptr)
-       {
-               HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: memory alloc failed\n", __FUNCTION__, __LINE__);
-               return;
-       }
-       _lv_memset_00(s_hengai_ppg_data_ptr, MICRO_PPG_DATA_BUFFER_LEN);
-
        s_hengai_ppg_data_len = 0;
-       s_hengai_micro_checkup_count = 0;
 }
 
 void mmi_hengai_micro_health_checkup_set(uint8_t state_value)
index 7bed9c9..8b1fe72 100644 (file)
@@ -807,6 +807,10 @@ lv_obj_t * mmi_sleep_second_tab_create(lv_obj_t * tileview, uint16_t id)
 
        lv_obj_t * label_ds_value = lv_label_create(cont, NULL);
        lv_obj_add_style(label_ds_value, LV_LABEL_PART_MAIN, &lv_watch_font30);
+       if(s_hengai_sleep_data.ds_duration > s_hengai_sleep_data.total_sleep_time)
+       {
+               s_hengai_sleep_data.ds_duration = 0;
+       }
        mmi_sleep_period_str_get(temp_buf, 128, s_hengai_sleep_data.ds_duration);
        lv_label_set_text(label_ds_value, temp_buf);
        lv_label_set_long_mode(label_ds_value, LV_LABEL_LONG_SROLL);
@@ -832,6 +836,10 @@ lv_obj_t * mmi_sleep_second_tab_create(lv_obj_t * tileview, uint16_t id)
 
        lv_obj_t * label_ls_value = lv_label_create(cont, NULL);
        lv_obj_add_style(label_ls_value, LV_LABEL_PART_MAIN, &lv_watch_font30);
+       if(s_hengai_sleep_data.ls_duration > s_hengai_sleep_data.total_sleep_time)
+       {
+               s_hengai_sleep_data.ls_duration = 0;
+       }
        mmi_sleep_period_str_get(temp_buf, 128, s_hengai_sleep_data.ls_duration);
        lv_label_set_text(label_ls_value, temp_buf);
        lv_label_set_long_mode(label_ls_value, LV_LABEL_LONG_SROLL);
@@ -857,6 +865,10 @@ lv_obj_t * mmi_sleep_second_tab_create(lv_obj_t * tileview, uint16_t id)
 
        lv_obj_t * label_rem_value = lv_label_create(cont, NULL);
        lv_obj_add_style(label_rem_value, LV_LABEL_PART_MAIN, &lv_watch_font30);
+       if(s_hengai_sleep_data.rem_duration > s_hengai_sleep_data.total_sleep_time)
+       {
+               s_hengai_sleep_data.rem_duration = 0;
+       }
        mmi_sleep_period_str_get(temp_buf, 128, s_hengai_sleep_data.rem_duration);
        lv_label_set_text(label_rem_value, temp_buf);
        lv_label_set_long_mode(label_rem_value, LV_LABEL_LONG_SROLL);
@@ -929,6 +941,11 @@ static lv_obj_t * mmi_sleep_first_tab_create(lv_obj_t * tileview, uint16_t id)
 
 
        // update time
+       unsigned int setting_total_min = mmi_watch_sleep_time_total_min_get();
+       if(s_hengai_sleep_data.total_sleep_time > setting_total_min)
+       {
+               s_hengai_sleep_data.total_sleep_time = 0;
+       }
        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
index 858c1e9..2560970 100644 (file)
@@ -1007,7 +1007,7 @@ static void mmi_health_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type, uin
 
                #if defined(__MMI_CUSTOM_HENGAI_MICRO_HEALTH_CHECKUP__)
                        case MMI_HEALTH_MEASURE_MICRO_CHECKUP:
-                               s_measure_time_total = 20 / MMI_HEALTH_MEASURE_CYCLE_DURATION; // 0xffff;
+                               s_measure_time_total = 40 / MMI_HEALTH_MEASURE_CYCLE_DURATION; // 0xffff;
                                mmi_hsensor_blood_open();
                                mmi_hengai_micro_health_checkup_start();
                                break;
index 6676c3b..6d3cfb3 100644 (file)
@@ -62,7 +62,11 @@ static mmi_watch_list_item_t settingList[] =
 #endif
 #if USE_LV_WATCH_QRCODE != 0
 #ifdef __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+       #ifdef MMI_PROJECT_Z5_HA_K18
+       { ICON_SETTING_QRCODE, WATCH_TEXT_ID_APP_DL_BIND_QRCODE, mmi_app_and_device_qrcode_create_event_cb },
+       #else
        { ICON_SETTING_QRCODE, WATCH_TEXT_ID_APP_DEVICE_QRCODE, mmi_app_and_device_qrcode_create_event_cb },
+       #endif
 #else
     { ICON_SETTING_QRCODE, WATCH_TEXT_ID_DEVICE_QRCODE, qrcode_create_event_cb },
 #endif
index bd321bd..3af7269 100644 (file)
@@ -1296,6 +1296,24 @@ void mmi_watch_sleep_time_data_get(nv_watch_sleep_time_t * data)
        }
 }
 
+unsigned int mmi_watch_sleep_time_total_min_get(void)
+{
+       unsigned int setting_total_min = 0;
+       unsigned int begin_mins = s_sleep_time_data.begin_hour * 60 + s_sleep_time_data.begin_min;
+       unsigned int end_mins = s_sleep_time_data.end_hour * 60 + s_sleep_time_data.end_min;
+       
+       if(begin_mins > end_mins)
+       {
+               setting_total_min = 60 * 24 - begin_mins + end_mins;
+       }
+       else
+       {
+               setting_total_min = end_mins - begin_mins;
+       }
+
+       return setting_total_min;
+}
+
 bool mmi_watch_sleep_switch_is_on(void)
 {
        if(1 == s_sleep_time_data.on_off)
index 39879de..39e50be 100644 (file)
@@ -100,6 +100,8 @@ void mmi_watch_do_not_disturb_task_clean(void);
 void mmi_watch_sleep_time_nv_default(nv_watch_sleep_time_t * sleep_time_data);
 void mmi_watch_sleep_time_nv_read(void);
 void mmi_watch_sleep_time_data_set(nv_watch_sleep_time_t * data);
+void mmi_watch_sleep_time_data_get(nv_watch_sleep_time_t * data);
+unsigned int mmi_watch_sleep_time_total_min_get(void);
 void mmi_watch_sleep_time_mission_check(void);
 #endif