From: luozheng <1732036298@qq.com>
Date: Thu, 25 Apr 2024 08:29:27 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~71
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a91d7e3cb738754c20becec398f367b556d36110;p=mirrors%2FFD230.git

Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin
---

a91d7e3cb738754c20becec398f367b556d36110
diff --cc code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
index da87c301b,9eb617ba8..7990109a5
--- a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
@@@ -67,10 -67,12 +67,14 @@@ namespace OHO
              CONFIGMODEL_ITEM_TRANING_FREQ,//训练实时数据上传频率
              CONFIGMODEL_ITEM_SYSTEM_VOLUME,//系统音量
              CONFIGMODEL_ITEM_CALL_VOLUME,//通话音量
 +            CONFIGMODEL_ITEM_VOLTE_CALL,//VoLTE通话
 +            CONFIGMODEL_ITEM_MOTIONRECOGNITION,//运动识别
 +            CONFIGMODEL_ITEM_HFP, //通话蓝牙开关
 +            CONFIGMODEL_ITEM_A2DP,//媒体蓝牙开关
+             CONFIFMOFEL_ITEM_HEARTRATE_DETECTED,//心率周期频率  0（关闭） 1 5 10
+             CONFIFMOFEL_ITEM_HEARTRATE_MAX,//最大心率
+             CONFIFMOFEL_ITEM_HEARTRATE_MIN,//最小心率
 -            CONFIGMODEL_ITEM_VOLTE_CALL,//VoLTE通话
 -            CONFIGMODEL_ITEM_MOTIONRECOGNITION,//运动识别
 -             CONFIGMODEL_ITEM_TRAINING_HEART_MAX,//训练最高心率
++            CONFIGMODEL_ITEM_TRAINING_HEART_MAX,//训练最高心率
              CONFIGMODEL_ITEM_MAX,
          } ;
  
@@@ -213,10 -205,12 +217,14 @@@
              {ConfigDataType::DATATYPE_INT,     "traningfreq",              "10" },// CONFIGMODEL_ITEM_TRANING_FREQ //训练实时数据上传频率//单位秒
              {ConfigDataType::DATATYPE_INT,     "SystemVolume",               "100"  },// CONFIGMODEL_ITEM_SYSTEM_VOLUME //
              {ConfigDataType::DATATYPE_INT,     "CallVolume",                 "100"  },// CONFIGMODEL_ITEM_CALL_VOLUME //
 -            {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,     "VoLTECall",                "false" },// CONFIGMODEL_ITEM_VOLTE_CALL
              {ConfigDataType::DATATYPE_BOOL,     "MotionRecognition",        "false" },// CONFIGMODEL_ITEM_MOTIONRECOGNITION
 -            {ConfigDataType::DATATYPE_INT,     "traningheart",                 "250"},//CONFIGMODEL_ITEM_TRAINING_HEART_MAX//训练最高心率
 +            {ConfigDataType::DATATYPE_BOOL,     "HFP",                      "false" },// CONFIGMODEL_ITEM_HFP
 +            {ConfigDataType::DATATYPE_BOOL,     "A2DP",                     "false" },// CONFIGMODEL_ITEM_A2DP
++            {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_INT,      "traningheart",             "250"  },//CONFIGMODEL_ITEM_TRAINING_HEART_MAX//训练最高心率
          };
          ConfigModel();                                        // 私有构造函数，确保无法在外部实例化
          ConfigModel(const ConfigModel &) = delete;            // 禁止拷贝构造