From: luozheng <1732036298@qq.com>
Date: Fri, 19 Apr 2024 13:08:40 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1162^2~3
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F1;p=mirrors%2FFD230.git

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

d3c096e41616284bb34dbe18b53d7f2038785fde
diff --cc code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
index a6eac7657,020791821..e5dac2f9f
--- a/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
   * @Date: 2024-02-19 10:39:11
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-19 15:10:49
 - * @LastEditTime: 2024-04-18 18:08:44
++ * @LastEditTime: 2024-04-19 21:05:28
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
   */
  
diff --cc code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
index fb491dc75,d9df73e63..c3c0a710e
--- a/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 @@@
 +/*
 + * @Author: luozheng 1732036298@qq.com
 + * @Date: 2024-02-19 10:39:14
 + * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-19 14:58:25
++ * @LastEditTime: 2024-04-19 21:06:11
 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
 + */
  #include "soundandvibration/include/SoundAndVibrationView.h"
  #include "soundandvibration/include/SoundAndVibrationPresenter.h"
  #include "soundandvibration/include/SoundAndVibrationModel.h"
diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
index 71207dd6d,05323209c..87b8f07b1
--- a/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"