From: Caisking <3449750381@qq.com> Date: Tue, 20 Feb 2024 11:54:58 +0000 (+0800) Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... X-Git-Tag: release_V1.2.70_20241020_135402~1298^2~22 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=15b19095c58516737f029e3c0f8a257c13f73267;p=mirrors%2FFD230.git Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin --- 15b19095c58516737f029e3c0f8a257c13f73267 diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h index a96e10979,725c8f8b9..9f54da626 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h @@@ -45,8 -67,10 +45,10 @@@ namespace OHO void InitMessageSlice(void); /* -------------------------------------------------------------------------- */ void InitDisplayBrightnessSlice(void); + /* --------------------------------- 经典蓝牙界面 --------------------------------- */ + void InitClassicBluetoothSlice(void); /* --------------------------------测试界面------------------------------------ */ - + void InitRotateSlice(void); void InitBloodSlice(void); void InitMainAlipaySlice(void); /* -------------------------------------------------------------------------- */ diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index 8ee4b6646,f6f7ed1d7..e1fe86395 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@@ -589,13 -585,16 +592,25 @@@ namespace OHO NativeAbility::GetInstance().AddSliceProxy(VIEW_FAST_TRAINING_ATTENTION, fasttrainingattention); } + void NativeLauncher::InitRotateSlice(void) + { + SliceProxy *rotate = new AbilitySliceProxy; + if (rotate == nullptr) + { + return; + } + NativeAbility::GetInstance().AddSliceProxy(VIEW_ROTATE, rotate); + } + void NativeLauncher::InitClassicBluetoothSlice(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitClassicBluetoothSlice"); + SliceProxy *classicbluetooth = new AbilitySliceProxy; + if (classicbluetooth == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "classicbluetooth"); + return; + } + NativeAbility::GetInstance().AddSliceProxy(VIEW_CLASSIC_BLUETOOTH, classicbluetooth); + } + }