From: luozheng <1732036298@qq.com> Date: Wed, 30 Jul 2025 07:28:46 +0000 (+0800) Subject: Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~210 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0cc63d38fb2a29540636d8efa04c3cd011ddfdbe;p=mirrors%2FFD230.git Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 --- 0cc63d38fb2a29540636d8efa04c3cd011ddfdbe diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h index 7533da30b,3384a397f..e77aa403e --- a/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 #define _TraingCard_VIEW_H - #include "View.h" - #include - #include "components/ui_view_group.h" - #include "components/ui_label.h" - #include "components/ui_label_ext.h" - #include "components/ui_image_view.h" + #include "components/icon_adapter.h" #include "components/ui_button.h" + #include "components/ui_card_page.h" + #include "components/ui_chart.h" + #include "components/ui_cross_view.h" #include "components/ui_image_animator.h" + #include "components/ui_image_view.h" + #include "components/ui_label.h" #include "components/ui_label_button_ext.h" - #include "components/ui_chart.h" + #include "components/ui_label_ext.h" #include "components/ui_list.h" - #include "components/icon_adapter.h" - #include "wearable_log.h" + #include "components/ui_swipe_view.h" + #include "components/ui_view_group.h" #include "ohos_types.h" - #include "components/ui_card_page.h" - #include "traing/include/TraingModel.h" - #include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" - #include "components/ui_swipe_view.h" - #include "components/ui_cross_view.h" - #include "traing/include/TraingModel.h" #include "uicomponents/UIComponents.h" + #include "wearable_log.h" + #include + + #include "traing/Training_UiConfig.h" + #include "traing/include/TraingModel.h" #include "traing/training_card/include/TraingCardPresenter.h" + #include "uicomponents/UIComponents.h" + -#include "PlayersView.h" +#include "player/include/PlayersView.h" #include "traing/training_card/include/TraingDataAllView.h" #include "traing/training_card/include/TrainingControlView.h" #include "traing/training_card/include/TrainingDataView.h"