修改ConfigModel.h文件中部分枚举变量单词的拼写错误

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index e3f6e74..8b6c4f1 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -106,20 +106,20 @@ void ble_set_sleep_remind(msg_get_sleep_param_info_t data)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     printf("开关：%d\r\n",data.schedule);
-    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP,data.schedule);
+    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP,data.schedule);
     if(data.schedule)
     {
        
         printf("开始时间：%d\r\n",data.bedtime_hour);
         printf("开始时间：%d\r\n",data.bedtime_min);
-        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP_BEDTIME,data.bedtime_hour<<16|data.bedtime_min);
+        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_BEDTIME,data.bedtime_hour<<16|data.bedtime_min);
        
         printf("结束时间：%d\r\n",data.waketime_hour);
         printf("结束时间：%d\r\n",data.waketime_min);
-        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP_GET_UP,data.waketime_hour<<16|data.waketime_min);
+        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_GET_UP,data.waketime_hour<<16|data.waketime_min);
 
         printf("睡前提醒 %d\r\n",data.bedtime_alarm);
-        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP_REMIND,data.bedtime_alarm);
+        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_REMIND,data.bedtime_alarm);
     }  
     return;
 }
@@ -129,22 +129,22 @@ void ble_get_sleep_remind(msg_get_sleep_param_info_t *data)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     
-    data->schedule = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP);
+    data->schedule = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP);
     printf("开关：%d\r\n",data->schedule);
 
-    uint32_t bedtime= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP_BEDTIME);
+    uint32_t bedtime= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_BEDTIME);
     data->bedtime_hour=bedtime>>16;
     data->bedtime_min=bedtime&0x00ff;
     printf("开始时间：%d\r\n",data->bedtime_hour);
     printf("开始时间：%d\r\n",data->bedtime_min);
     
-    uint32_t wakettime= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP_GET_UP);
+    uint32_t wakettime= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_GET_UP);
     data->waketime_hour=bedtime>>16;
     data->waketime_min=bedtime&0x00ff;
     printf("结束时间：%d\r\n",data->waketime_hour);
     printf("结束时间：%d\r\n",data->waketime_min);
        
-    data->bedtime_alarm= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_SLEEP_REMIND);
+    data->bedtime_alarm= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_REMIND);
 
     printf("睡前提醒 %d\r\n",data->bedtime_alarm);
        
@@ -159,17 +159,17 @@ void ble_set_drink_remind(msg_drink_info_t data)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     printf("开关：%d\r\n",data.drink_on);
-    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_DRINK,data.drink_on);
+    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK,data.drink_on);
     if(data.drink_on)
     {
         printf("目标：%d\r\n",data.goal);
-        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_DRINK_GOAL,data.goal);
+        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_GOAL,data.goal);
         printf("开始时间：%d\r\n",data.time_start);
-        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_DRINK_START,data.time_start);
+        p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_START,data.time_start);
         if(data.drink_on==2)
         {
             printf("结束时间：%d\r\n",data.time_end);
-            p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_DRINK_END,data.time_end);
+            p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_END,data.time_end);
             printf("频率：%d\r\n",data.freq);
             p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_FREQ,data.freq);
 
@@ -181,7 +181,7 @@ void ble_set_drink_remind(msg_drink_info_t data)
 void ble_get_drink_remind(msg_drink_info_t *data)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
-    data->drink_on = p_ConfigModel-> get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_DRINK);
+    data->drink_on = p_ConfigModel-> get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK);
     if(data->drink_on)
     data->drink_on=1;
     printf("开关：%d\r\n",data->drink_on);
@@ -513,12 +513,12 @@ void set_quick_auxiliary_paramters(uint8_t id)//设置快捷辅助功能参数id
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     
-    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_QUICK_AUXILIARY_PARAMETERS,id);
+    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_QUICK_AUXILIARY_PARAMETERS,id);
 } 
 int get_quick_auxiliary_paramters(void)//获取快捷辅助功能参数id
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
-    return p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_QUICK_AUXILIARY_PARAMETERS);
+    return p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_QUICK_AUXILIARY_PARAMETERS);
 } 
 void set_goal_stepcount(uint32_t step)
 {
@@ -538,13 +538,13 @@ void set_notify_switch(bool on)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     
-    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_NOTIFY,on);
+    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_NOTIFY,on);
     return ;
 }
 bool get_notify_switch(void)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
-    return p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIFMOFEL_ITEM_NOTIFY);
+    return p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_NOTIFY);
 }
 void set_goal_discount(uint32_t dis)
 {

diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
index 9481e6c..50832a4 100644 (file)
--- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@ -74,34 +74,34 @@ namespace OHOS
             CONFIGMODEL_ITEM_TRANING_FREQ,//训练实时数据上传频率
             CONFIGMODEL_ITEM_TRANING_AUTO,//开启关闭自动获取实时数据
             CONFIGMODEL_ITEM_TRAINING_HEART_MAX,//训练最高心率
-            CONFIFMOFEL_ITEM_HEARTRATE_DETECTED,//心率周期频率  0（关闭） 1 5 10
-            CONFIFMOFEL_ITEM_HEARTRATE_MAX,//最大心率
-            CONFIFMOFEL_ITEM_HEARTRATE_MIN,//最小心率
-            CONFIFMOFEL_ITEM_NOTIFY,//消息通知开关
-            CONFIFMOFEL_ITEM_QUICK_AUXILIARY_PARAMETERS,//快捷辅助功能参数
+            CONFIGMODEL_ITEM_HEARTRATE_DETECTED,//心率周期频率  0（关闭） 1 5 10
+            CONFIGMODEL_ITEM_HEARTRATE_MAX,//最大心率
+            CONFIGMODEL_ITEM_HEARTRATE_MIN,//最小心率
+            CONFIGMODEL_ITEM_NOTIFY,//消息通知开关
+            CONFIGMODEL_ITEM_QUICK_AUXILIARY_PARAMETERS,//快捷辅助功能参数
             //喝水提醒相关
-            CONFIFMOFEL_ITEM_DRINK,//开关 0 关闭 1开始 2间隔提醒
-            CONFIFMOFEL_ITEM_DRINK_GOAL,//目标。ml
-            CONFIFMOFEL_ITEM_DRINK_START,//提醒开始时间 int类型 前16位小时，后16位分钟
-            CONFIFMOFEL_ITEM_DRINK_END,//提醒结束时间 int类型 前16位小时，后16位分钟
+            CONFIGMODEL_ITEM_DRINK,//开关 0 关闭 1开始 2间隔提醒
+            CONFIGMODEL_ITEM_DRINK_GOAL,//目标。ml
+            CONFIGMODEL_ITEM_DRINK_START,//提醒开始时间 int类型 前16位小时，后16位分钟
+            CONFIGMODEL_ITEM_DRINK_END,//提醒结束时间 int类型 前16位小时，后16位分钟
             CONFIGMODEL_ITEM_DRINK_FREQ,//提醒频率 0:30分钟1:1小时2:2小时 3:3小时
             //睡眠提醒相关
-            CONFIFMOFEL_ITEM_SLEEP, //开关
-            CONFIFMOFEL_ITEM_SLEEP_BEDTIME,//就寝时间
-            CONFIFMOFEL_ITEM_SLEEP_GET_UP,//起床时间
-            CONFIFMOFEL_ITEM_SLEEP_REMIND,//提前20分钟提醒开关
+            CONFIGMODEL_ITEM_SLEEP, //开关
+            CONFIGMODEL_ITEM_SLEEP_BEDTIME,//就寝时间
+            CONFIGMODEL_ITEM_SLEEP_GET_UP,//起床时间
+            CONFIGMODEL_ITEM_SLEEP_REMIND,//提前20分钟提醒开关
             //久坐提醒相关
             CONFIGMODEL_ITEM_SEDENTARY_SWITCH,//久坐提醒开关
             CONFIGMODEL_ITEM_SEDENTARY_INTERVAL,//久坐提醒时间间隔(单位小时)
             CONFIGMODEL_ITEM_SEDENTARY_REMINDERTIME,//久坐提醒时间段
 
-            CONFIFMOFEL_ITEM_SIM_ICCID,//SIM卡的ICCID
-            CONFIFMOFEL_ITEM_TELECOM_DMP_TIMESEC,//注册时间戳
+            CONFIGMODEL_ITEM_SIM_ICCID,//SIM卡的ICCID
+            CONFIGMODEL_ITEM_TELECOM_DMP_TIMESEC,//注册时间戳
 
-            CONFIFMOFEL_ITEM_DMP_FACTORY_STATUS,//入库恢复出厂状态 0已恢复出厂过 1代表没有 1cat1发送
+            CONFIGMODEL_ITEM_DMP_FACTORY_STATUS,//入库恢复出厂状态 0已恢复出厂过 1代表没有 1cat1发送
 
-            CONFIFMOFEL_ITEM_DMP_CHANGE_MODE,//入库切换模式 默认是1 电信入库 2-255其他是移动入库 0是关闭
-            CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD,//入库切换模式旧模式 防止切换来回数据不清楚问题 默认是1 电信入库 2-255其他是移动入库
+            CONFIGMODEL_ITEM_DMP_CHANGE_MODE,//入库切换模式 默认是1 电信入库 2-255其他是移动入库 0是关闭
+            CONFIGMODEL_ITEM_DMP_CHANGE_MODE_OLD,//入库切换模式旧模式 防止切换来回数据不清楚问题 默认是1 电信入库 2-255其他是移动入库
 
             CONFIGMODEL_ITEM_MAX,
         } ;
@@ -288,28 +288,28 @@ namespace OHOS
             {ConfigDataType::DATATYPE_INT,     "traningfreq",              "10"     },// CONFIGMODEL_ITEM_TRANING_FREQ //训练实时数据上传频率//单位秒
             {ConfigDataType::DATATYPE_BOOL,    "traningauto",              "0"      },//CONFIGMODEL_ITEM_TRANING_AUTO,//开启关闭自动获取实时数据
             {ConfigDataType::DATATYPE_INT,     "traningheart",             "190"  },//CONFIGMODEL_ITEM_TRAINING_HEART_MAX//训练最高心率
-            {ConfigDataType::DATATYPE_INT,     "HeartRateDetected",        "0"     },// CONFIFMOFEL_ITEM_HEARTRATE_DETECTED//心率周期检测频率
-            {ConfigDataType::DATATYPE_INT,     "HeartRateMax",             "0"     },// CONFIFMOFEL_ITEM_HEARTRATE_MAX//最大心率
-            {ConfigDataType::DATATYPE_INT,     "HeartRateMin",             "0"     },// CONFIFMOFEL_ITEM_HEARTRATE_MIN//最小心率
-            {ConfigDataType::DATATYPE_BOOL,    "Notify",                   "0"     },// CONFIFMOFEL_ITEM_NOTIFY//消息通知开关
-            {ConfigDataType::DATATYPE_INT,     "QuickAuxilParameter",      "0"     },// CONFIFMOFEL_ITEM_QUICK_AUXILIARY_PARAMETERS//快捷辅助功能参数
-            {ConfigDataType::DATATYPE_INT,     "drink",                    "0" },// CONFIFMOFEL_ITEM_DRINK,//开关 0 关闭 1开始 2间隔提醒
-            {ConfigDataType::DATATYPE_INT,     "drinkgoal",                "0" },// CONFIFMOFEL_ITEM_DRINK_GOAL,//目标。ml
-            {ConfigDataType::DATATYPE_INT,     "drinkstart",               "0" }, // CONFIFMOFEL_ITEM_DRINK_START,//提醒开始时间 int类型 前16位小时，后16位分钟
-            {ConfigDataType::DATATYPE_INT,     "drinkend",                 "0" }, // CONFIFMOFEL_ITEM_DRINK_END,//提醒结束时间 int类型 前16位小时，后16位分钟
+            {ConfigDataType::DATATYPE_INT,     "HeartRateDetected",        "0"     },// CONFIGMODEL_ITEM_HEARTRATE_DETECTED//心率周期检测频率
+            {ConfigDataType::DATATYPE_INT,     "HeartRateMax",             "0"     },// CONFIGMODEL_ITEM_HEARTRATE_MAX//最大心率
+            {ConfigDataType::DATATYPE_INT,     "HeartRateMin",             "0"     },// CONFIGMODEL_ITEM_HEARTRATE_MIN//最小心率
+            {ConfigDataType::DATATYPE_BOOL,    "Notify",                   "0"     },// CONFIGMODEL_ITEM_NOTIFY//消息通知开关
+            {ConfigDataType::DATATYPE_INT,     "QuickAuxilParameter",      "0"     },// CONFIGMODEL_ITEM_QUICK_AUXILIARY_PARAMETERS//快捷辅助功能参数
+            {ConfigDataType::DATATYPE_INT,     "drink",                    "0" },// CONFIGMODEL_ITEM_DRINK,//开关 0 关闭 1开始 2间隔提醒
+            {ConfigDataType::DATATYPE_INT,     "drinkgoal",                "0" },// CONFIGMODEL_ITEM_DRINK_GOAL,//目标。ml
+            {ConfigDataType::DATATYPE_INT,     "drinkstart",               "0" }, // CONFIGMODEL_ITEM_DRINK_START,//提醒开始时间 int类型 前16位小时，后16位分钟
+            {ConfigDataType::DATATYPE_INT,     "drinkend",                 "0" }, // CONFIGMODEL_ITEM_DRINK_END,//提醒结束时间 int类型 前16位小时，后16位分钟
             {ConfigDataType::DATATYPE_INT,     "drinkfreq",                "0" }, // CONFIGMODEL_ITEM_DRINK_FREQ,//提醒频率
-            {ConfigDataType::DATATYPE_INT,     "sleep",                    "0" }, // CONFIFMOFEL_ITEM_SLEEP, //开关
-            {ConfigDataType::DATATYPE_INT,     "sleep_bedtime",            "0" }, //CONFIFMOFEL_ITEM_SLEEP_BEDTIME,//就寝时间
-            {ConfigDataType::DATATYPE_INT,     "sleep_getup",              "0" }, // CONFIFMOFEL_ITEM_SLEEP_GET_UP,//起床时间
-            {ConfigDataType::DATATYPE_INT,     "sleep_remide",             "0" }, // CONFIFMOFEL_ITEM_SLEEP_REMIND,//提前20分钟提醒开关
+            {ConfigDataType::DATATYPE_INT,     "sleep",                    "0" }, // CONFIGMODEL_ITEM_SLEEP, //开关
+            {ConfigDataType::DATATYPE_INT,     "sleep_bedtime",            "0" }, //CONFIGMODEL_ITEM_SLEEP_BEDTIME,//就寝时间
+            {ConfigDataType::DATATYPE_INT,     "sleep_getup",              "0" }, // CONFIGMODEL_ITEM_SLEEP_GET_UP,//起床时间
+            {ConfigDataType::DATATYPE_INT,     "sleep_remide",             "0" }, // CONFIGMODEL_ITEM_SLEEP_REMIND,//提前20分钟提醒开关
             {ConfigDataType::DATATYPE_BOOL,    "sedentary_switch",         "false"       }, // CONFIGMODEL_ITEM_SEDENTARY_SWITCH,//久坐提醒开关
             {ConfigDataType::DATATYPE_INT,     "sedentary_interval",       "1"           }, // CONFIGMODEL_ITEM_SEDENTARY_INTERVAL,//久坐提醒时间间隔
             {ConfigDataType::DATATYPE_STRING,  "sedentary_reminderTime ",  "10:00-22:00" }, // CONFIGMODEL_ITEM_SEDENTARY_REMINDERTIME,//久坐提醒时间段
-            {ConfigDataType::DATATYPE_STRING,  "sim_iccid",                ""            },//CONFIFMOFEL_ITEM_SIM_ICCID cat1的iccid
-            {ConfigDataType::DATATYPE_STRING,  "telecom_regist_timesec",   ""            },//CONFIFMOFEL_ITEM_TELECOM_DMP_TIMESEC
-            {ConfigDataType::DATATYPE_INT,     "dmp_factory_status",       "0"           },//CONFIFMOFEL_ITEM_DMP_FACTORY_STATUS默认是0
-            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode",              "1"           },//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE 入库切换模式 默认值 1
-            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode_old",       "1"           }//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD 默认值 1 要和新默认值一致
+            {ConfigDataType::DATATYPE_STRING,  "sim_iccid",                ""            },//CONFIGMODEL_ITEM_SIM_ICCID cat1的iccid
+            {ConfigDataType::DATATYPE_STRING,  "telecom_regist_timesec",   ""            },//CONFIGMODEL_ITEM_TELECOM_DMP_TIMESEC
+            {ConfigDataType::DATATYPE_INT,     "dmp_factory_status",       "0"           },//CONFIGMODEL_ITEM_DMP_FACTORY_STATUS默认是0
+            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode",              "1"           },//CONFIGMODEL_ITEM_DMP_CHANGE_MODE 入库切换模式 默认值 1
+            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode_old",       "1"           }//CONFIGMODEL_ITEM_DMP_CHANGE_MODE_OLD 默认值 1 要和新默认值一致
         };
         ConfigModel();                                        // 私有构造函数，确保无法在外部实例化
         ConfigModel(const ConfigModel &) = delete;            // 禁止拷贝构造

diff --git a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
index 166fb2a..710969b 100644 (file)
--- a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
+++ b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
@@ -568,45 +568,45 @@ namespace OHOS
     //设置喝水提醒开关
     void ConfigModel::SetDrinkSwitch(const int value)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DRINK,value);
+        set_condigData_Int(CONFIGMODEL_ITEM_DRINK,value);
     }
     //获取喝水提醒开关
     int ConfigModel::GetDrinkSwitch()
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DRINK);
+        return get_configData_int(CONFIGMODEL_ITEM_DRINK);
     }
 
     //设置喝水目标，单位ml
     void ConfigModel::SetDrinkGoal(const int value)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DRINK_GOAL,value);
+        set_condigData_Int(CONFIGMODEL_ITEM_DRINK_GOAL,value);
     }
     //获取喝水目标，单位ml
     int ConfigModel::GetDrinkGoal()
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DRINK_GOAL);
+        return get_configData_int(CONFIGMODEL_ITEM_DRINK_GOAL);
     }
 
     //设置喝水提醒开始时间，32位数字，前16位代表小时，后16位代表分钟
     void ConfigModel::SetDrinkStart(const int value)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DRINK_START,value);
+        set_condigData_Int(CONFIGMODEL_ITEM_DRINK_START,value);
     }
     //获取喝水提醒开始时间，32位数字，前16位代表小时，后16位代表分钟
     int ConfigModel::GetDrinkStart()
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DRINK_START);
+        return get_configData_int(CONFIGMODEL_ITEM_DRINK_START);
     }
 
     //设置喝水提醒结束时间，32位数字，前16位代表小时，后16位代表分钟
     void ConfigModel::SetDrinkEnd(const int value)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DRINK_END,value);
+        set_condigData_Int(CONFIGMODEL_ITEM_DRINK_END,value);
     }
     //获取喝水提醒结束时间，32位数字，前16位代表小时，后16位代表分钟
     int ConfigModel::GetDrinkEnd()
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DRINK_END);
+        return get_configData_int(CONFIGMODEL_ITEM_DRINK_END);
     }
 
     //设置喝水提醒的提醒频率，0代表每30分钟提醒一次，1：1小时，2：2小时 等等依次类推
@@ -699,22 +699,22 @@ namespace OHOS
 
     void ConfigModel::SetSimIccid(char *str)//保存SIM的ICCID
     {
-        set_condigData_String(CONFIFMOFEL_ITEM_SIM_ICCID,str);        
+        set_condigData_String(CONFIGMODEL_ITEM_SIM_ICCID,str);        
     }
 
     std::string ConfigModel::GetSimIccid()///获取本地保存的SIM卡的iccid
     {
-        return get_configData_string(CONFIFMOFEL_ITEM_SIM_ICCID);
+        return get_configData_string(CONFIGMODEL_ITEM_SIM_ICCID);
     }
 
     void ConfigModel::SetRegistTime(char *time)
     {
-        set_condigData_String(CONFIFMOFEL_ITEM_TELECOM_DMP_TIMESEC,time);
+        set_condigData_String(CONFIGMODEL_ITEM_TELECOM_DMP_TIMESEC,time);
     }
     
     std::string ConfigModel::GetRegistTime(void)
     {
-        return get_configData_string(CONFIFMOFEL_ITEM_TELECOM_DMP_TIMESEC);
+        return get_configData_string(CONFIGMODEL_ITEM_TELECOM_DMP_TIMESEC);
     }
 
     void ConfigModel::SetpyVer(char *str)
@@ -729,34 +729,34 @@ namespace OHOS
 
     void ConfigModel::SetDmpFactoryStatus(int state)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DMP_FACTORY_STATUS,state);
+        set_condigData_Int(CONFIGMODEL_ITEM_DMP_FACTORY_STATUS,state);
     }
 
     int ConfigModel::GetDmpFactoryStatus(void)
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DMP_FACTORY_STATUS);
+        return get_configData_int(CONFIGMODEL_ITEM_DMP_FACTORY_STATUS);
     }
 
     void ConfigModel::SetDmpChangeMode(int state)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DMP_CHANGE_MODE,state);
+        set_condigData_Int(CONFIGMODEL_ITEM_DMP_CHANGE_MODE,state);
     }
     
 
     int ConfigModel::GetDmpChangeMode(void)
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DMP_CHANGE_MODE);
+        return get_configData_int(CONFIGMODEL_ITEM_DMP_CHANGE_MODE);
     }
 
     void ConfigModel::SetDmpChangeModeOld(int state)
     {
-        set_condigData_Int(CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD,state);
+        set_condigData_Int(CONFIGMODEL_ITEM_DMP_CHANGE_MODE_OLD,state);
     }
     
 
     int ConfigModel::GetDmpChangeModeOld(void)
     {
-        return get_configData_int(CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD);
+        return get_configData_int(CONFIGMODEL_ITEM_DMP_CHANGE_MODE_OLD);
     }
     /*
      * @brief 设置震动模式强度