gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
index a550ff5..3c39514 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
+++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
@@ -57,6 +57,12 @@ extern "C" {
 #define NV_SECTION_UI_SIM_ICCID_DATA_LEN                       (sizeof(nv_watch_sim_iccid_t))
 #endif
 #define NV_SECTION_UI_SENSOR_HX3918_DATA_LEN           (sizeof(nv_watch_sensor_hx3918_data_t))
+#ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+#define NV_SECTION_UI_REMIND_WAKE_UP_DATA_LEN          (sizeof(nv_watch_remind_wake_up_t))
+#endif
+#ifdef __MMI_CUSTOM_HENG_AI__
+#define NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE_LEN       (sizeof(nv_watch_switch_t))
+#endif
 
 #endif
 
@@ -160,6 +166,12 @@ typedef lv_fs_dir_t  ui_dir_t;
 #define NV_SECTION_UI_SIM_ICCID_DATA_FILE                      "ui_sim_iccid_data.nv"
 #endif
 #define NV_SECTION_UI_SENSOR_HX3918_DATA_FILE          "ui_sensor_hx3918_data.nv"
+#ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+#define NV_SECTION_UI_REMIND_WAKE_UP_DATA_FILE         "ui_remind_wake_up_data.nv"
+#endif
+#ifdef __MMI_CUSTOM_HENG_AI__
+#define NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE_FILE      "ui_heng_ai_wake_ring_type.nv"
+#endif
 
 
 #endif

diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
index b870523..2e8f4ab 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
@@ -108,6 +108,14 @@ uint32_t UI_NV_Get_Section_Len(NV_UI_SECTION_ID SectionId)
        #endif
                case NV_SECTION_UI_SENSOR_HX3918_DATA:
                        return (NV_SECTION_LEN(NV_SECTION_UI_SENSOR_HX3918_DATA));
+       #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+               case NV_SECTION_UI_REMIND_WAKE_UP_DATA:
+                       return (NV_SECTION_LEN(NV_SECTION_UI_REMIND_WAKE_UP_DATA));
+       #endif
+       #ifdef __MMI_CUSTOM_HENG_AI__
+               case NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE:
+                       return (NV_SECTION_LEN(NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE));
+       #endif
                                
                        
        #endif
@@ -217,6 +225,14 @@ char * UI_NV_Get_Section_path(NV_UI_SECTION_ID SectionId)
        #endif
                case NV_SECTION_UI_SENSOR_HX3918_DATA:
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SENSOR_HX3918_DATA));
+       #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+               case NV_SECTION_UI_REMIND_WAKE_UP_DATA:
+                       return (NV_SECTION_FILE_PATH(NV_SECTION_UI_REMIND_WAKE_UP_DATA));
+       #endif
+       #ifdef __MMI_CUSTOM_HENG_AI__
+               case NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE:
+                       return (NV_SECTION_FILE_PATH(NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE));
+       #endif
 
                        
        #endif
@@ -277,6 +293,9 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
        nv_watch_sim_iccid_t * sim_iccid_data;
 #endif
        nv_watch_sensor_hx3918_data_t * sensor_hx3918_data;
+#ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+       nv_watch_remind_wake_up_t * remind_wake_up_data;
+#endif
 
 #endif
 
@@ -527,6 +546,22 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
                        memset(sensor_hx3918_data, 0x0, SectionLen);
                        TempData = (char *)sensor_hx3918_data;
                        break;                  
+
+       #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+               case NV_SECTION_UI_REMIND_WAKE_UP_DATA:
+                       remind_wake_up_data = lv_mem_alloc(SectionLen);
+                       memset(remind_wake_up_data, 0x0, SectionLen);
+                       TempData = (char *)remind_wake_up_data;
+                       break;                  
+       #endif
+       
+       #ifdef __MMI_CUSTOM_HENG_AI__
+               case NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE:
+                       mmi_switch_data = lv_mem_alloc(SectionLen);
+                       memset(mmi_switch_data, 0x0, SectionLen);
+                       TempData = (char *)mmi_switch_data;
+                       break;
+       #endif
                        
                        
        #endif

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
index a2a99df..0e120ed 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
@@ -132,12 +132,21 @@ typedef struct
     /* Bit 0: Sunday, bit 1: Monday ... bit 6: Saturday */
 } __packed nv_watch_alarm_info_t;
 
-#define NV_ALARM_MAX_ALARM_NUM    5
+#define NV_ALARM_MAX_ALARM_NUM    (3) // 5
 typedef struct
 {
     nv_watch_alarm_info_t alarm_info[NV_ALARM_MAX_ALARM_NUM];
 } __packed nv_watch_alarm_t;
 
+#ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+#define NV_REMIND_WAKE_UP_MAX_NUM    (3)
+typedef struct
+{
+    nv_watch_alarm_info_t remind_info[NV_REMIND_WAKE_UP_MAX_NUM];
+} __packed nv_watch_remind_wake_up_t;
+#endif
+
+
 typedef struct
 {
 #define NV_WATCH_MAX_VOICE_MSG_GROUP_NUM  2
@@ -498,7 +507,12 @@ enum
        NV_SECTION_UI_SIM_ICCID_DATA,                                   // nv_watch_sim_iccid_t
 #endif
        NV_SECTION_UI_SENSOR_HX3918_DATA,                               // nv_watch_sensor_hx3918_data_t
-       
+#ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+       NV_SECTION_UI_REMIND_WAKE_UP_DATA,                              // nv_watch_remind_wake_up_t
+#endif
+#ifdef __MMI_CUSTOM_HENG_AI__
+       NV_SECTION_UI_HENG_AI_WAKE_RING_TYPE,                   // nv_watch_switch_t
+#endif
 
 #endif