From: Caisking <3449750381@qq.com>
Date: Thu, 25 Apr 2024 02:21:26 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1134
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F2;p=mirrors%2FFD230.git

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

1afb8879dce313875522bbd50c12326134ff4c5d
diff --cc code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
index bcfeb80d5,344f3ecbb..68688463a
--- a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
@@@ -67,9 -67,8 +67,11 @@@ namespace OHO
              CONFIGMODEL_ITEM_TRANING_FREQ,//训练实时数据上传频率
              CONFIGMODEL_ITEM_SYSTEM_VOLUME,//系统音量
              CONFIGMODEL_ITEM_CALL_VOLUME,//通话音量
 +            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_MAX,
          } ;
  
@@@ -196,10 -201,8 +204,11 @@@
              {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
          };
          ConfigModel();                                        // 私有构造函数，确保无法在外部实例化
          ConfigModel(const ConfigModel &) = delete;            // 禁止拷贝构造