修正 ConfigModel默认设置,保证每个enum都配对设置默认值。 150/1 150/head 151/target/1
authorSnickerSun <snickersun@163.com>
Wed, 8 May 2024 13:37:43 +0000 (21:37 +0800)
committerSnickerSun <snickersun@163.com>
Wed, 8 May 2024 13:37:43 +0000 (21:37 +0800)
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h

index 5691f57..b0d9c40 100644 (file)
@@ -44,8 +44,6 @@ namespace OHOS
             CONFIGMODEL_ITEM_LANGUAGE_CODE,                       //语言Code string "zh","en"
             CONFIGMODEL_ITEM_SILENT_MODE,                       //静音模式模式
             CONFIGMODEL_ITEM_VIBRATOR_SWITCH,                   // 马达 开关,0 强,1 中,2 弱,3 关
-            // CONFIGMODEL_ITEM_HRS_QUICKACCESS,
-            // CONFIGMODEL_ITEM_SPO2_QUICKACCESS,
             CONFIGMODEL_ITEM_RAISE_TO_WAKE,                 //抬腕亮屏开关
             CONFIGMODEL_ITEM_ACTIVITY_VALUES_STEPCOUNT,      //活动数据步数
             CONFIGMODEL_ITEM_ACTIVITY_VALUES_CALORIES,      //活动数据卡路里,
@@ -70,32 +68,25 @@ namespace OHOS
             CONFIGMODEL_ITEM_MOTIONRECOGNITION,//运动识别
             CONFIGMODEL_ITEM_HFP, //通话蓝牙开关
             CONFIGMODEL_ITEM_A2DP,//媒体蓝牙开关
-
             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,//快捷辅助功能参数
-
             //喝水提醒相关
             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_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_MAX,
         } ;
 
@@ -204,61 +195,58 @@ namespace OHOS
     private:
         configmodel_item configmodel_item_key_name[CONFIGMODEL_ITEM_MAX] =
         {
-            {ConfigDataType::DATATYPE_BOOL,     "ClassicBT_Service_On",     "true"  },//CONFIGMODEL_ITEM_CLASSIC_BT_SERVICE_ON, //关机前经典蓝牙服务状态,启动时仍然恢复其当时状态
-            {ConfigDataType::DATATYPE_INT,      "ScreenBrightness",         "255"    },//CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE,
-            {ConfigDataType::DATATYPE_INT,      "ScreenOffTimeoutValue",    "5000"  },//CONFIGMODEL_ITEM_SCREEN_OFF_TIMEOUT_VALUE, 自动息屏时间,默认5秒 5000ms
-            {ConfigDataType::DATATYPE_BOOL,     "Cat1_Service_On",          "false" },//CONFIGMODEL_ITEM_CAT1_SERVICE_ON, // 关机前Cat1 Service启动着,则重启仍然启动,反之亦然
-            {ConfigDataType::DATATYPE_STRING,   "Cat1_IMEI",                ""      },//CONFIGMODEL_ITEM_CAT1_IMEI,
-            {ConfigDataType::DATATYPE_STRING,   "Cat1_ModemVer",            ""      },//CONFIGMODEL_ITEM_CAT1_MODEMVER,
-            {ConfigDataType::DATATYPE_STRING,   "Cat1_PYVer",               ""      },//CONFIGMODEL_ITEM_CAT1_PYVER,
-            {ConfigDataType::DATATYPE_INT,      "LanguageID",               "-1"    },//CONFIGMODEL_ITEM_LANGUAGE_ID, //默认没有选择语言
-            {ConfigDataType::DATATYPE_STRING,   "LanguageCode",             ""      },//CONFIGMODEL_ITEM_LANGUAGE_CODE, //默认没有选择语言
-            {ConfigDataType::DATATYPE_BOOL,     "SlientMode",               "false" },//CONFIGMODEL_ITEM_SILENT_MODE,
-            {ConfigDataType::DATATYPE_INT,      "VibratorSwitch",           "1"     },//CONFIGMODEL_ITEM_VIBRATOR_SWITCH, // 马达 开关,0 强,1 中,2 弱,3 关
-            // {ConfigDataType::DATATYPE_BOOL,     "HRS_QuickAccess",     "false"},//CONFIGMODEL_ITEM_HRS_SPO2_QUICKACCESS,
-            // {ConfigDataType::DATATYPE_BOOL,     "SPO2_QuickAccess",     "false"},//CONFIGMODEL_ITEM_HRS_SPO2_QUICKACCESS,
-            {ConfigDataType::DATATYPE_BOOL,     "Rase2Wake",                "true"  },//CONFIGMODEL_ITEM_RAISE_TO_WAKE,
-            {ConfigDataType::DATATYPE_INT,      "StepCount",                "0"     },//CONFIGMODEL_ITEM_ACTIVITY_VALUES_STEPCOUNT,      //活动数据步数
-            {ConfigDataType::DATATYPE_INT,      "Calories",                 "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_CALORIES,      //活动数据卡路里,
-            {ConfigDataType::DATATYPE_INT,      "StandupTimes",             "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_STANDUP_TIMES, //活动数据站立次数
-            {ConfigDataType::DATATYPE_INT,      "Duration",                 "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_DURATION,  //活动数据运动时间
-            {ConfigDataType::DATATYPE_DOUBLE,   "Distance",                 "0.0"   },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_DISTANCE, //活动数据运动距离
-            {ConfigDataType::DATATYPE_INT,      "ActivityTimestamp",        "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_TIMESTAMP, //活动数据更新时间戳
-            {ConfigDataType::DATATYPE_INT,      "height",                   "175"   },// CONFIGMODEL_ITEM_CUSTOM_DATA_HEIGHT,    //用户数据身高 (cm)(身高)(default : 175)(30 - 300)
-            {ConfigDataType::DATATYPE_DOUBLE,   "weight",                   "70.0"  },// CONFIGMODEL_ITEM_CUSTOM_DATA_WEIGHT,    //用户数据体重 (kg)(體重)(default : 70)(10 - 300)
-            {ConfigDataType::DATATYPE_INT,      "sex",                      "1"     },// CONFIGMODEL_ITEM_CUSTOM_DATA_SEX,    //用户数据性别 (default : 1 男性)(0 : 女性, 1 : 男性)
-            {ConfigDataType::DATATYPE_INT,      "age",                      "30"    },// CONFIGMODEL_ITEM_CUSTOM_DATA_AGE,    //用户数据年龄 (年紀)(default : 30)(1 - 99)
-            {ConfigDataType::DATATYPE_INT,      "WearingMode",              "0"     },// CONFIGMODEL_ITEM_CUSTOM_DATA_WEARING_MODE,    //用户数据佩戴方式 (default : 左手)(0 : 左手 1 : 右手)
-            {ConfigDataType::DATATYPE_INT,      "GoalStepCount",            "10000" },// CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT,    //运动目标步数  10000
-            {ConfigDataType::DATATYPE_INT,      "GoalCalories",             "300"   },// CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES,    //运动目标卡路里  300(kcal)
-            {ConfigDataType::DATATYPE_INT,      "GoalStandupTimes",         "10"    },// CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES,    //运动目标站立次数 10
-            {ConfigDataType::DATATYPE_INT,      "GoalDuration",             "30"    },// CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION,    //运动目标时长   30(分钟)
-            {ConfigDataType::DATATYPE_DOUBLE,   "GoalDistance",             "8.0"   },// CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE,    //运动目标距离   8.0(km)
-            {ConfigDataType::DATATYPE_BOOL,     "Dnotdisturb",              "false" },// CONFIGMODEL_ITEM_DNOTDISTURB //勿扰模式默认关闭
-            {ConfigDataType::DATATYPE_INT,     "SystemVolume",               "100"  },// CONFIGMODEL_ITEM_SYSTEM_VOLUME //
-            {ConfigDataType::DATATYPE_INT,     "CallVolume",                 "100"  },// CONFIGMODEL_ITEM_CALL_VOLUME //
-            {ConfigDataType::DATATYPE_BOOL,     "VoLTECall",                "false" },// CONFIGMODEL_ITEM_VOLTE_CALL
-            {ConfigDataType::DATATYPE_BOOL,     "MotionRecognition",        "false" },// CONFIGMODEL_ITEM_MOTIONRECOGNITION
-            {ConfigDataType::DATATYPE_BOOL,     "HFP",                      "false" },// CONFIGMODEL_ITEM_HFP
-            {ConfigDataType::DATATYPE_BOOL,     "A2DP",                     "false" },// CONFIGMODEL_ITEM_A2DP
-
-            {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_BOOL,     "NOTIFY",             "false"     },// CONFIFMOFEL_ITEM_HEARTRATE_MIN//最小心率
-
-            {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,     "drinkfreq",              "0" }, // CONFIGMODEL_ITEM_DRINK_FREQ,//提醒频率
+            {ConfigDataType::DATATYPE_BOOL,    "ClassicBT_Service_On",     "true"  },// CONFIGMODEL_ITEM_CLASSIC_BT_SERVICE_ON, //关机前经典蓝牙服务状态,启动时仍然恢复其当时状态
+            {ConfigDataType::DATATYPE_INT,     "ScreenBrightness",         "255"    },//CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE,   //屏幕亮度
+            {ConfigDataType::DATATYPE_INT,     "ScreenOffTimeoutValue",    "5000"  },//CONFIGMODEL_ITEM_SCREEN_OFF_TIMEOUT_VALUE,   //屏幕自动息屏时间 默认 5秒 5000ms
+            {ConfigDataType::DATATYPE_BOOL,    "Cat1_Service_On",          "false" },//CONFIGMODEL_ITEM_CAT1_SERVICE_ON, // 关机前Cat1 Service启动着,则重启仍然启动,反之亦然
+            {ConfigDataType::DATATYPE_STRING,  "Cat1_IMEI",                ""      },//CONFIGMODEL_ITEM_CAT1_IMEI,
+            {ConfigDataType::DATATYPE_STRING,  "Cat1_ModemVer",            ""      },//CONFIGMODEL_ITEM_CAT1_MODEMVER,
+            {ConfigDataType::DATATYPE_STRING,  "Cat1_PYVer",               ""      },//CONFIGMODEL_ITEM_CAT1_PYVER,
+            {ConfigDataType::DATATYPE_INT,     "LanguageID",               "-1"    },//CONFIGMODEL_ITEM_LANGUAGE_ID, //默认没有选择语言
+            {ConfigDataType::DATATYPE_STRING,  "LanguageCode",             ""      },//CONFIGMODEL_ITEM_LANGUAGE_CODE, //默认没有选择语言
+            {ConfigDataType::DATATYPE_BOOL,    "SlientMode",               "false" },//CONFIGMODEL_ITEM_SILENT_MODE,
+            {ConfigDataType::DATATYPE_INT,     "VibratorSwitch",           "1"     },//CONFIGMODEL_ITEM_VIBRATOR_SWITCH, // 马达 开关,0 强,1 中,2 弱,3 关
+            {ConfigDataType::DATATYPE_BOOL,    "Rase2Wake",                "true"  },//CONFIGMODEL_ITEM_RAISE_TO_WAKE,
+            {ConfigDataType::DATATYPE_INT,     "StepCount",                "0"     },//CONFIGMODEL_ITEM_ACTIVITY_VALUES_STEPCOUNT,      //活动数据步数
+            {ConfigDataType::DATATYPE_INT,     "Calories",                 "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_CALORIES,      //活动数据卡路里,
+            {ConfigDataType::DATATYPE_INT,     "StandupTimes",             "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_STANDUP_TIMES, //活动数据站立次数
+            {ConfigDataType::DATATYPE_INT,     "Duration",                 "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_DURATION,  //活动数据运动时间
+            {ConfigDataType::DATATYPE_DOUBLE,  "Distance",                 "0.0"   },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_DISTANCE, //活动数据运动距离
+            {ConfigDataType::DATATYPE_INT,     "ActivityTimestamp",        "0"     },// CONFIGMODEL_ITEM_ACTIVITY_VALUES_TIMESTAMP, //活动数据更新时间戳
+            {ConfigDataType::DATATYPE_INT,     "height",                   "175"   },// CONFIGMODEL_ITEM_CUSTOM_DATA_HEIGHT,    //用户数据身高 (cm)(身高)(default : 175)(30 - 300)
+            {ConfigDataType::DATATYPE_DOUBLE,  "weight",                   "70.0"  },// CONFIGMODEL_ITEM_CUSTOM_DATA_WEIGHT,    //用户数据体重 (kg)(體重)(default : 70)(10 - 300)
+            {ConfigDataType::DATATYPE_INT,     "sex",                      "1"     },// CONFIGMODEL_ITEM_CUSTOM_DATA_SEX,    //用户数据性别 (default : 1 男性)(0 : 女性, 1 : 男性)
+            {ConfigDataType::DATATYPE_INT,     "age",                      "30"    },// CONFIGMODEL_ITEM_CUSTOM_DATA_AGE,    //用户数据年龄 (年紀)(default : 30)(1 - 99)
+            {ConfigDataType::DATATYPE_INT,     "WearingMode",              "0"     },// CONFIGMODEL_ITEM_CUSTOM_DATA_WEARING_MODE,    //用户数据佩戴方式 (default : 左手)(0 : 左手 1 : 右手)
+            {ConfigDataType::DATATYPE_INT,     "GoalStepCount",            "10000" },// CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT,    //运动目标步数  10000
+            {ConfigDataType::DATATYPE_INT,     "GoalCalories",             "300"   },// CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES,    //运动目标卡路里  300(kcal)
+            {ConfigDataType::DATATYPE_INT,     "GoalStandupTimes",         "10"    },// CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES,    //运动目标站立次数 10
+            {ConfigDataType::DATATYPE_INT,     "GoalDuration",             "30"    },// CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION,    //运动目标时长   30(分钟)
+            {ConfigDataType::DATATYPE_DOUBLE,  "GoalDistance",             "8.0"   },// CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE,    //运动目标距离   8.0(km)
+            {ConfigDataType::DATATYPE_BOOL,    "Dnotdisturb",              "false" },// CONFIGMODEL_ITEM_DNOTDISTURB //勿扰模式默认关闭
+            {ConfigDataType::DATATYPE_INT,     "SystemVolume",             "100"  },// CONFIGMODEL_ITEM_SYSTEM_VOLUME //
+            {ConfigDataType::DATATYPE_INT,     "CallVolume",               "100"  },// CONFIGMODEL_ITEM_CALL_VOLUME //
+            {ConfigDataType::DATATYPE_BOOL,    "VoLTECall",                "false" },// CONFIGMODEL_ITEM_VOLTE_CALL
+            {ConfigDataType::DATATYPE_BOOL,    "MotionRecognition",        "false" },// CONFIGMODEL_ITEM_MOTIONRECOGNITION
+            {ConfigDataType::DATATYPE_BOOL,    "HFP",                      "false" },// CONFIGMODEL_ITEM_HFP
+            {ConfigDataType::DATATYPE_BOOL,    "A2DP",                     "false" },// CONFIGMODEL_ITEM_A2DP
+            {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,     "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分钟提醒开关
         };
         ConfigModel();                                        // 私有构造函数,确保无法在外部实例化
         ConfigModel(const ConfigModel &) = delete;            // 禁止拷贝构造