Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/drivers/peripheral/config/include/ConfigModel.h
index 6651533,b21c53a..9481e6c
--- 1/code/sdk/drivers/peripheral/config/include/ConfigModel.h
--- 2/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@@ -286,11 -287,14 +302,14 @@@ namespace OHO
              {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_BOOL,    "sedentary_switch",         "false"       }, // CONFIFMOFEL_ITEM_SEDENTARY_SWITCH,//久坐提醒开关
 -            {ConfigDataType::DATATYPE_INT,     "sedentary_interval",       "1"           }, // CONFIFMOFEL_ITEM_SEDENTARY_INTERVAL,//久坐提醒时间间隔
 -            {ConfigDataType::DATATYPE_STRING,  "sedentary_reminderTime ",  "10:00-22:00" }, // CONFIFMOFEL_ITEM_SEDENTARY_REMINDERTIME,//久坐提醒时间段
 +            {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 要和新默认值一致
          };
          ConfigModel();                                        // 私有构造函数，确保无法在外部实例化
          ConfigModel(const ConfigModel &) = delete;            // 禁止拷贝构造

diff --cc code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
Simple merge