Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatView.h
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h
index 7533da3,3384a39..e77aa40
--- 1/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h
--- 2/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h
@@@ -7,34 -8,35 +8,35 @@@
  #ifndef _TraingCard_VIEW_H\r
  #define _TraingCard_VIEW_H\r
  \r
- \r
  #include "View.h"\r
- #include <ui_scroll_view.h>\r
- #include "components/ui_view_group.h"\r
- #include "components/ui_label.h"\r
- #include "components/ui_label_ext.h"\r
- #include "components/ui_image_view.h"\r
+ #include "components/icon_adapter.h"\r
  #include "components/ui_button.h"\r
+ #include "components/ui_card_page.h"\r
+ #include "components/ui_chart.h"\r
+ #include "components/ui_cross_view.h"\r
  #include "components/ui_image_animator.h"\r
+ #include "components/ui_image_view.h"\r
+ #include "components/ui_label.h"\r
  #include "components/ui_label_button_ext.h"\r
- #include "components/ui_chart.h"\r
+ #include "components/ui_label_ext.h"\r
  #include "components/ui_list.h"\r
- #include "components/icon_adapter.h"\r
- #include "wearable_log.h"\r
+ #include "components/ui_swipe_view.h"\r
+ #include "components/ui_view_group.h"\r
  #include "ohos_types.h"\r
- #include "components/ui_card_page.h"\r
- #include "traing/include/TraingModel.h"\r
- #include "uicomponents/UIComponents.h"\r
  #include "traing/Training_UiConfig.h"\r
- #include "components/ui_swipe_view.h"\r
- #include "components/ui_cross_view.h"\r
- \r
  #include "traing/include/TraingModel.h"\r
  #include "uicomponents/UIComponents.h"\r
+ #include "wearable_log.h"\r
+ #include <ui_scroll_view.h>\r
+ \r
+ \r
  #include "traing/Training_UiConfig.h"\r
+ #include "traing/include/TraingModel.h"\r
  #include "traing/training_card/include/TraingCardPresenter.h"\r
+ #include "uicomponents/UIComponents.h"\r
+ \r
  \r
 -#include "PlayersView.h"\r
 +#include "player/include/PlayersView.h"\r
  #include "traing/training_card/include/TraingDataAllView.h"\r
  #include "traing/training_card/include/TrainingControlView.h"\r
  #include "traing/training_card/include/TrainingDataView.h"\r

diff --cc code/sdk/zhihui/services/ble_service/blemoder/bleinstruct_sample.cpp
Simple merge