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
Simple merge

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

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 79b9aac,0d4c8a2..e3879fd
--- 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
@@@ -648,5 -675,96 +669,79 @@@ namespace OHO
          }
          NativeAbility::GetInstance().AddSliceProxy(VIEW_RECORD, record);
      }
 -    void NativeLauncher::InitRecordingPlaySlice(void)
 -    {
 -        SliceProxy *recordplay = new AbilitySliceProxy<RecordingPlayerView, RecordingPlayerPresenter>;
 -        if (recordplay == nullptr)
 -        {
 -            return;
 -        }
 -        NativeAbility::GetInstance().AddSliceProxy(VIEW_RECORD_PLAY, recordplay);
 -    }
 -    void NativeLauncher::InitRecordingDeleteSlice(void)
 -    {
 -        SliceProxy *recorddelete = new AbilitySliceProxy<RecordDeleteView, RecordDeletePresenter>;
 -        if (recorddelete == nullptr)
 -        {
 -            return;
 -        }
 -        NativeAbility::GetInstance().AddSliceProxy(VIEW_RECORD_DELETE, recorddelete);
 -    }
+ 
++    
+     void NativeLauncher::InitPhoneSlice(void)
+ {
+     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitPhoneSlice");
+     SliceProxy *phoneview = new AbilitySliceProxy<PhoneView, PhonePresenter>;
+     if (phoneview == nullptr)
+     {
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phoneview");
+         return;
+     }
+     NativeAbility::GetInstance().AddSliceProxy(VIEW_PHONE, phoneview);
+ }
+ 
+ void NativeLauncher::InitPhoneCallSlice(void)
+ {
+     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitPhoneCallSlice");
+     SliceProxy *phonecallview = new AbilitySliceProxy<PhoneCallView, PhoneCallPresenter>;
+     if (phonecallview == nullptr)
+     {
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phonecallview");
+         return;
+     }
+     NativeAbility::GetInstance().AddSliceProxy(VIEW_PHONECALL, phonecallview);
+ }
+ 
+ void NativeLauncher::InitPhoneDirSlice(void)
+ {
+     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitPhoneCallSlice");
+     SliceProxy *phonedirview = new AbilitySliceProxy<PhoneDirView, PhoneDirPresenter>;
+     if (phonedirview == nullptr)
+     {
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phonedirview");
+         return;
+     }
+     NativeAbility::GetInstance().AddSliceProxy(VIEW_PHONEDIR, phonedirview);
+ }
+ 
+ void NativeLauncher::InitPhoneCallingSlice(void)
+ {
+     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitPhoneCallingSlice");
+     SliceProxy *phonecallingview = new AbilitySliceProxy<PhoneCallingView, PhoneCallingPresenter>;
+     if (phonecallingview == nullptr)
+     {
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phonecallingview");
+         return;
+     }
+     NativeAbility::GetInstance().AddSliceProxy(VIEW_PHONECALLING, phonecallingview);
+ }
+ 
+ void NativeLauncher::InitPhoneCallupSlice(void)
+ {
+     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitPhoneCallupSlice");
+     SliceProxy *phonecallupview = new AbilitySliceProxy<PhoneCallupView, PhoneCallupPresenter>;
+     if (phonecallupview == nullptr)
+     {
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phonecallview");
+         return;
+     }
+     NativeAbility::GetInstance().AddSliceProxy(VIEW_PHONECALLUP, phonecallupview);
+ }
+ 
+ void NativeLauncher::InitPhoneRingSlice(void)
+ {
+     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitPhoneRingSlice");
+     SliceProxy *phoneringview = new AbilitySliceProxy<PhoneRingView, PhoneRingPresenter>;
+     if (phoneringview == nullptr)
+     {
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phoneringview");
+         return;
+     }
+     NativeAbility::GetInstance().AddSliceProxy(VIEW_PHONERING, phoneringview);
+ }
+ 
      
  }

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

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