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

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
index a6eac76,0207918..e5dac2f
--- 1/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com\r
   * @Date: 2024-02-19 10:39:11\r
   * @LastEditors: luozheng 1732036298@qq.com\r
-  * @LastEditTime: 2024-04-19 15:10:49\r
 - * @LastEditTime: 2024-04-18 18:08:44\r
++ * @LastEditTime: 2024-04-19 21:05:28\r
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp\r
   */\r
  \r

diff --cc code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
index fb491dc,d9df73e..c3c0a71
--- 1/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
@@@ -1,10 -1,3 +1,10 @@@
-  * @LastEditTime: 2024-04-19 14:58:25\r
 +/*\r
 + * @Author: luozheng 1732036298@qq.com\r
 + * @Date: 2024-02-19 10:39:14\r
 + * @LastEditors: luozheng 1732036298@qq.com\r
++ * @LastEditTime: 2024-04-19 21:06:11\r
 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp\r
 + */\r
  #include "soundandvibration/include/SoundAndVibrationView.h"\r
  #include "soundandvibration/include/SoundAndVibrationPresenter.h"\r
  #include "soundandvibration/include/SoundAndVibrationModel.h"\r

diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
index 71207dd,0532320..87b8f07
--- 1/code/sdk/drivers/peripheral/utils/custom_utils.c
--- 2/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@@ -603,18 -606,18 +607,30 @@@ int32_t uapi_get_screen_state(void
      return display_api->get_screen_state();
  }
  
+ /**
+  * @brief 亮屏函数
+  */
+ void uapi_set_screen_on_api(void)
+ {
+     const power_display_svr_api_t *display_api = power_display_svr_get_api();
+     if (display_api->get_screen_state() != SCREEN_ON)
+     {
+         display_api->turn_on_screen();
+     }
+ }
+ 
 +/*系统声音设置*/
 +void uapi_systemVolumeSet(int16_t sounding)
 +{
 +    SystemVolumeSet(sounding);
 +}
 +
 +//通话音量设置
 +void uapi_callVolumeSet(int16_t sounding)
 +{
 +    CallVolumeSet(sounding);
 +}
 +
  #include "bts_le_gap.h"
  
  

diff --cc code/sdk/drivers/peripheral/utils/custom_utils.h
Simple merge