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/include/NativeLauncher.h
index a96e109,725c8f8..9f54da6
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
--- 2/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 8ee4b66,f6f7ed1..e1fe863
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
--- 2/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<RotateView, RotatePresenter>;
 +        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<ClassicBlueToothView, ClassicBlueToothPresenter>;
+         if (classicbluetooth == nullptr)
+         {
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "classicbluetooth");
+             return;
+         }
+         NativeAbility::GetInstance().AddSliceProxy(VIEW_CLASSIC_BLUETOOTH, classicbluetooth);
+     }
+ 
  }