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/config/src/ConfigModel.cpp
index 7e55652,27d896e..6f9c385
--- 1/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp
@@@ -730,58 -717,59 +730,58 @@@ extern "C
  #endif
  #endif
  
 -uint32_t ConfigModelInit(void)
 -{
 -    OHOS::ConfigModel::GetInstance()->Init();
 -    return 0;
 -}
 -
 -/***
 - * 蓝牙服务是否开启
 - */
 -bool custom_ble_service_on_flag(void)
 -{
 -    return OHOS::ConfigModel::GetInstance()->GetClassicBlueToothState();
 -}
 -/***
 - * Cat1服务是否开启
 - */
 -bool poweron_cat1_on_bootup_flag(void)
 -{
 -    return OHOS::ConfigModel::GetInstance()->GetCat1_4Gability();
 -}
 -void sync_all_config_to_disk(void)
 -{
 -    OHOS::ConfigModel::GetInstance()->sync_all_to_disk();
 -}
 -
 +    uint32_t ConfigModelInit(void)
 +    {
 +        OHOS::ConfigModel::GetInstance()->Init();
 +        return 0;
 +    }
  
 -void initScreenBrightness(void)
 -{
 -   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "initScreenBrightness");
 -   int brightness = OHOS::ConfigModel::GetInstance()->GetBrightness();
 -   uapi_setScreenBrightness(brightness);
 -}
 +    /***
 +     * 蓝牙服务是否开启
 +     */
 +    bool custom_ble_service_on_flag(void)
 +    {
 +        return OHOS::ConfigModel::GetInstance()->GetClassicBlueToothState();
 +    }
 +    /***
 +     * Cat1服务是否开启
 +     */
 +    bool poweron_cat1_on_bootup_flag(void)
 +    {
 +        return OHOS::ConfigModel::GetInstance()->GetCat1_4Gability();
 +    }
 +    void sync_all_config_to_disk(void)
 +    {
 +        OHOS::ConfigModel::GetInstance()->sync_all_to_disk();
 +    }
  
 -void initializeScreenDuration(void)
 -{
 -   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "initializeScreenDuration");
 -   unsigned int time = OHOS::ConfigModel::GetInstance()->GetScreenDuration();
 -   uapi_setScreenDuration(time);
 -}
 +    void initScreenBrightness(void)
 +    {
 +        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "initScreenBrightness");
 +        int brightness = OHOS::ConfigModel::GetInstance()->GetBrightness();
 +        uapi_setScreenBrightness(brightness);
 +    }
  
 -void initializeRaiseToWake(void)
 -{
 -    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "initializeRaiseToWake");
 -    bool isOpen =  OHOS::ConfigModel::GetInstance()->GetRaiseToWake();
 -    if(isOpen == true)
 +    void initializeScreenDuration(void)
      {
 -        uapi_take_to_wake(1);
 +        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "initializeScreenDuration");
 +        unsigned int time = OHOS::ConfigModel::GetInstance()->GetScreenDuration();
 +        uapi_setScreenDuration(time);
      }
 -    else
 +
 +    void initializeRaiseToWake(void)
      {
 -        uapi_take_to_wake(0);
 +        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "initializeRaiseToWake");
 +        bool isOpen = OHOS::ConfigModel::GetInstance()->GetRaiseToWake();
 +        if (isOpen == true)
 +        {
 +            uapi_take_to_wake(1);
 +        }
 +        else
 +        {
-             uapi_take_to_wake(2);
++            uapi_take_to_wake(0);
 +        }
      }
 -}
  #ifdef __cplusplus
  #if __cplusplus
  }

diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
index 2fcf116,87b8f07..7901774
--- 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
@@@ -672,12 -617,24 +673,24 @@@ void uapi_set_screen_on_api(void
      {
          display_api->turn_on_screen();
      }
 +    // 设置屏幕亮5000
 +    display_api->set_screen_set_keepon_timeout(5000);
  }
  
+ /*系统声音设置*/
+ void uapi_systemVolumeSet(int16_t sounding)
+ {
+     SystemVolumeSet(sounding);
+ }
+ 
+ //通话音量设置
+ void uapi_callVolumeSet(int16_t sounding)
+ {
+     CallVolumeSet(sounding);
+ }
+ 
  #include "bts_le_gap.h"
  
 -
 -
  // extern void wstp_spp_cmd_server_create(const char *spp_uuid, const char *name, uint8_t name_len);
  // extern void wstp_spp_cmd_server_accept(uint32_t server_id);
  // extern errcode_t enable_bt_stack(void);