From: Caisking <3449750381@qq.com> Date: Wed, 27 Mar 2024 02:53:28 +0000 (+0800) Subject: 增加训练列表适配器；进行列表文件夹分组；增加极限运动列表 X-Git-Tag: release_V1.2.70_20241020_135402~1258 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5a91f796f325b96dc4144df275ff92c106cbc950;p=mirrors%2FFD230.git 增加训练列表适配器；进行列表文件夹分组；增加极限运动列表 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 7713f0d54..15bd4d2e8 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -44,7 +44,7 @@ set(PRIVATE_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/InitComponent/include ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/uisample/uitest/framework/include ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/health_service/ - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/traing_card/ + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card/ ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/include @@ -394,16 +394,10 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingModel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingMoreView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingMorePresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingListLimitView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingListLimitPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingNomalView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingNomalPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingSetView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingSetPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSsetView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSsetPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingSetDistView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingSetDistPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingSetSeptView.cpp @@ -414,8 +408,6 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingSetCaluliPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingControlView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingControlPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingCardView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingCardPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingDataView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingDataPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingDetailView.cpp @@ -426,27 +418,47 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingEndnote2Presenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingEnddataView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingEnddataPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSlackView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSlackPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSnoteView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSnotePresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingStrongView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingStrongPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSlostPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSlostView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSbackPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingGPSbackView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingWinView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingWinPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingMusicView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingMusicPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/traing_card/Traing_CardView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/traing_card/Traing_CardPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingStrongView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingStrongPresenter.cpp + + #主界面训练卡片 + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card/src/Training_CardView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card/src/Training_CardPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card/src/TraingCardView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card/src/TraingCardPresenter.cpp + + #训练记录 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordPresenter.cpp + #GPS训练 + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp + + #训练列表 + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_limit/src/TraingLimitView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_limit/src/TraingLimitAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp + + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_more/src/TraingMoreView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp + #saveele ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/saveele/src/SaveEleModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/saveele/src/SaveElePresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h index 7145afe18..d6fdce9b9 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h @@ -67,7 +67,7 @@ typedef enum : uint16_t VIEW_SAVEBAT, // 省电模式界面 /* ----------------------------------- 训练 ----------------------------------- */ VIEW_TRAINING, // 训练 - VIEW_TRAININGMUSIC, // 训练音乐 + VIEW_TRAININGMUSIC, // 训练音乐 VIEW_TRAININGMORE, // 更多训练 VIEW_RUNNING, // 跑步训练之列表 VIEW_TRAININGLIMIT, // 极限运动子列表 diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index dd7b177ec..b1e2dc9e8 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -141,16 +141,10 @@ /* -------------------------------------------------------------------------- */ #include "traing/include/TraingView.h" #include "traing/include/TraingPresenter.h" -#include "traing/include/TraingMorePresenter.h" -#include "traing/include/TraingMoreView.h" -#include "traing/include/TraingListLimitPresenter.h" -#include "traing/include/TraingListLimitView.h" #include "traing/include/TraingNomalPresenter.h" #include "traing/include/TraingNomalView.h" #include "traing/include/TraingSetPresenter.h" #include "traing/include/TraingSetView.h" -#include "traing/include/TraingGPSsetPresenter.h" -#include "traing/include/TraingGPSsetView.h" #include "traing/include/TraingSetTimePresenter.h" #include "traing/include/TraingSetTimeView.h" #include "traing/include/TraingSetCaluliPresenter.h" @@ -161,8 +155,6 @@ #include "traing/include/TraingSetSeptView.h" #include "traing/include/TraingControlPresenter.h" #include "traing/include/TraingControlView.h" -#include "traing/include/TraingCardPresenter.h" -#include "traing/include/TraingCardView.h" #include "traing/include/TraingDataPresenter.h" #include "traing/include/TraingDataView.h" #include "traing/include/TraingDetailPresenter.h" @@ -173,27 +165,37 @@ #include "traing/include/TraingEndnote2View.h" #include "traing/include/TraingEnddataPresenter.h" #include "traing/include/TraingEnddataView.h" -#include "traing/include/TraingGPSPresenter.h" -#include "traing/include/TraingGPSView.h" -#include "traing/include/TraingGPSlackPresenter.h" -#include "traing/include/TraingGPSlackView.h" -#include "traing/include/TraingGPSnotePresenter.h" -#include "traing/include/TraingGPSnoteView.h" #include "traing/include/TraingStrongPresenter.h" #include "traing/include/TraingStrongView.h" -#include "traing/include/TraingGPSlostPresenter.h" -#include "traing/include/TraingGPSlostView.h" -#include "traing/include/TraingGPSbackPresenter.h" -#include "traing/include/TraingGPSbackView.h" #include "traing/include/TraingWinPresenter.h" #include "traing/include/TraingWinView.h" #include "traing/include/TraingMusicView.h" #include "traing/include/TraingMusicPresenter.h" - +/* ---------------------------------- GPS训练 --------------------------------- */ +#include "traing/training_GPS/include/TraingGPSPresenter.h" +#include "traing/training_GPS/include/TraingGPSView.h" +#include "traing/training_GPS/include/TraingGPSlackPresenter.h" +#include "traing/training_GPS/include/TraingGPSlackView.h" +#include "traing/training_GPS/include/TraingGPSnotePresenter.h" +#include "traing/training_GPS/include/TraingGPSnoteView.h" +#include "traing/training_GPS/include/TraingGPSlostPresenter.h" +#include "traing/training_GPS/include/TraingGPSlostView.h" +#include "traing/training_GPS/include/TraingGPSbackPresenter.h" +#include "traing/training_GPS/include/TraingGPSbackView.h" +#include "traing/training_GPS/include/TraingGPSsetPresenter.h" +#include "traing/training_GPS/include/TraingGPSsetView.h" +/* ---------------------------------- 训练记录 ---------------------------------- */ #include "traingrecord/include/TraingRecordView.h" #include "traingrecord/include/TraingRecordPresenter.h" +/* ---------------------------------- 训练列表 ---------------------------------- */ +#include "traing/training_list_more/include/TraingMorePresenter.h" +#include "traing/training_list_more/include/TraingMoreView.h" +#include "traing/training_list_limit/include/TraingLimitPresenter.h" +#include "traing/training_list_limit/include/TraingLimitView.h" +/* ---------------------------------- 主界面卡片 --------------------------------- */ +#include "traing/training_card/include/TraingCardPresenter.h" +#include "traing/training_card/include/TraingCardView.h" /* -------------------------------------------------------------------------- */ - #ifdef SUPPORT_ALIPAY_SEC #include "AlipayMainView.h" #include "AlipayPresenter.h" @@ -867,7 +869,7 @@ namespace OHOS } void NativeLauncher::InitTraingListLimitSlice(void) { - SliceProxy *TraingListLimitview = new AbilitySliceProxy; + SliceProxy *TraingListLimitview = new AbilitySliceProxy; NativeAbility::GetInstance().AddSliceProxy(VIEW_TRAININGLIMIT, TraingListLimitview); } void NativeLauncher::InitTraingNomalSlice(void) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp index 75b2d2da8..bf6e90b10 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp @@ -1,3 +1,4 @@ + /** * Copyright (c) CompanyNameMagicTag 2023-2023. All rights reserved. * Description: alipay list adapt. diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h index 57db8ce4e..216ec34bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-02-01 15:18:45 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 19:45:28 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: ApplistModel.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h index 7c16fdfaa..c193757f6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h @@ -34,7 +34,7 @@ #include "components/ui_cross_view.h" #include "heart_blood/include/BloodCardView.h" -#include "traing/traing_card/Traing_CardView.h" +#include "traing/training_card/include/Training_CardView.h" #include "ApplistCardView.h" #include "weather/include/WeatherControlView.h" #include "message/include/MessageCardView.h" @@ -113,7 +113,7 @@ namespace OHOS HeartRateView *heartRateView{nullptr}; BloodCardView *bloodView{nullptr}; WeatherControlView *weatherControlView{nullptr}; - Traing_CardView *traingView{nullptr}; + Training_CardView *traingView{nullptr}; ApplistCardView *applistCardView{nullptr}; UIButton *changebut{nullptr}; /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index e5962e592..fc02529fd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -25,7 +25,7 @@ #include "DialModelTime.h" #include "DialModelPower.h" #include "gfx_utils/mem_check.h" -#include "traing/traing_card/Traing_CardView.h" +#include "traing/training_card/include/Training_CardView.h" #if USE_OFFLINE_DIAL #include "DialViewGroup.h" #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 4d8671908..c66c511d8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -413,7 +413,7 @@ namespace OHOS // 主界面训练卡片 UICardPage *MainViewSample::InitTrainingPage(void) { - traingView = new Traing_CardView(); + traingView = new Training_CardView(); if (traingView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "traingView new fail"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h index 39b3c5b2a..f263dd4e2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 17:59:57 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef Message_ADAPTER_H #define Message_ADAPTER_H @@ -27,22 +35,8 @@ namespace OHOS explicit MessageListAdapter(); virtual ~MessageListAdapter(); - /* * - * @brief Sets the UIView adapter data, which is a MessageListItem linked list. - * - * @param data Indicates the MessageListItem linked list data. - * @since 1.0 - * @version 1.0 - */ void SetData(std::list &data); - /* * - * @brief Obtains the data size of the UILabel adapter. - * - * @return Returns the data size of the UILabel adapter. - * @since 1.0 - * @version 1.0 - */ virtual uint16_t GetCount(void) override; virtual UIView *GetView(UIView *inView, int16_t index) override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h index d0474af1f..67fa5473b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:00:19 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef Message_MODEL_H #define Message_MODEL_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageAdapter.cpp index e36f385b0..fbb42a36f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageAdapter.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:16:05 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/message/src/MessageAdapter.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "message/include/MessageAdapter.h" #include "message/include/MessageItemView.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp index 39cb1fed4..da2420336 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 20:20:20 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "message/include/MessageItemView.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp index 4a387c583..21696b7fa 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 20:08:00 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "message/include/MessageModel.h" #include "common/image_cache_manager.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp index b806156e9..446a56408 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp @@ -57,7 +57,10 @@ namespace OHOS MessageList->SetPosition(43, 120, 380, 600); MessageList->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); } - + UIList *MessageView::GetList() + { + return MessageList; + } void MessageView::DeInitView() { // scrollView-> RemoveAll(); @@ -171,8 +174,4 @@ namespace OHOS return true; } - UIList *MessageView::GetList() - { - return MessageList; - } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp index b4aabfc0c..50a8d9d02 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 21:02:12 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: SettingItemView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp index 47ff3fee2..b7c2261ea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp @@ -1,11 +1,3 @@ -/*** - * @Author: Caisking 3449750381@qq.com - * @Date: 2024-01-29 19:58:37 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-03-26 11:28:03 - * @FilePath: /sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - */ #include "system/include/SystemModel.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h index a15be2c0c..4290b0d3d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -71,8 +71,8 @@ namespace OHOS static constexpr const char *INCO_UP_40_IMAGE = MODULES "/Inco_up_40.bin"; static constexpr const char *LINE_IMAGE = MODULES "/Line.bin"; static constexpr const char *LINE_1_IMAGE = MODULES "/Line_1.bin"; - static constexpr const char *LINE_2_IMAGE = MODULES "/Line_2.bin"; static constexpr const char *MILEAGE_IMAGE = MODULES "/Mileage.bin"; + static constexpr const char *LINE_2_IMAGE = MODULES "/Line_2.bin"; static constexpr const char *MILEAGE_30_IMAGE = MODULES "/Mileage_30.bin"; static constexpr const char *MORE_IMAGE = MODULES "/More.bin"; static constexpr const char *MOREVIEW_IMAGE = MODULES "/MoreView.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListLimitPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListLimitPresenter.h deleted file mode 100644 index 0be424e38..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListLimitPresenter.h +++ /dev/null @@ -1,36 +0,0 @@ - -#ifndef _TraingListLimit_PRESENTER_H -#define _TraingListLimit_PRESENTER_H - -#include "Presenter.h" -#include "TraingListLimitView.h" - -namespace OHOS -{ - class TraingListLimitView; - - class TraingListLimitPresenter : public Presenter, - public UIView::OnClickListener, - public UIView::OnDragListener - { - public: - TraingListLimitPresenter(); - virtual ~TraingListLimitPresenter(); - - void OnStart() override; - void OnPause() override; - void OnResume() override; - void OnStop() override; - - static TraingListLimitPresenter *GetInstance(); - - private: - // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承; - bool OnClick(UIView &view, const ClickEvent &event) override; - bool OnDrag(UIView &view, const DragEvent &event) override; - bool OnDragEnd(UIView& view, const DragEvent& event) override; - - }; -} // namespace OHOS - -#endif // SLEEPDETAIL_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListLimitView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListLimitView.h deleted file mode 100644 index ec9ee41f2..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListLimitView.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef _TraingListLimit_VIEW_H -#define _TraingListLimit_VIEW_H - -#include "BaseView.h" -#include "View.h" -#include -#include "components/ui_view_group.h" -#include "components/ui_label.h" -#include "components/ui_image_view.h" -#include "components/ui_button.h" -#include "components/ui_image_animator.h" -#include "components/ui_label_button_ext.h" -#include "components/ui_chart.h" -#include "components/ui_list.h" -#include "components/icon_adapter.h" -#include "wearable_log.h" -#include "ohos_types.h" -#include "components/ui_card_page.h" -#include "traing/include/TraingModel.h" -#include "traing/Training_UiConfig.h" - -#include "TraingListLimitPresenter.h" -namespace OHOS -{ -#define BUTTON1 "button1" -#define BUTTON2 "button2" -#define BUTTON3 "button3" -#define BUTTON4 "button4" -#define BUTTON5 "button5" -#define BUTTON6 "button6" -#define BUTTON7 "button7" -#define BUTTON8 "button8" - - class TraingListLimitPresenter; - class TraingListLimitView : public View - { - - public: - TraingListLimitView(); - virtual ~TraingListLimitView(); - static TraingListLimitView *GetInstance(void); - - void OnStart() override; - void OnSetUpView() override; - void OnTearDownView() override; - void OnStop() override; - void InitView(); - void DeInit(); - - void InitList(); - void PreLoad(void); - - private: - UIView::OnDragListener *draglistener{nullptr}; - TraingListLimitView(TraingListLimitView &&) = delete; - TraingListLimitView &operator=(TraingListLimitView &&) = delete; - - UIViewGroup *container_ = nullptr; - UIScrollView *scrollView1_ = nullptr; - UILabelExt *label1_ = nullptr; - UIImageView *image1_ = nullptr; - UIImageView *image2_ = nullptr; - UIImageView *image3_ = nullptr; - UIImageView *image4_ = nullptr; - UIImageView *image5_ = nullptr; - UIImageView *image6_ = nullptr; - UIImageView *image7_ = nullptr; - UIImageView *image8_ = nullptr; - UIButton *button1_ = nullptr; - UIButton *button2_ = nullptr; - UIButton *button3_ = nullptr; - UIButton *button4_ = nullptr; - UIButton *button5_ = nullptr; - UIButton *button6_ = nullptr; - UIButton *button7_ = nullptr; - UIButton *button8_ = nullptr; - UIList *list1_ = nullptr; - IconAdapter *list1adapter_ = nullptr; - List *list1data_ = nullptr; - bool viewiInitStatus{false}; - }; -} // namespace OHOS -#endif // TraingListLimit_PRESENTER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListLimitPresenter.cpp deleted file mode 100644 index f69ca8a8f..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListLimitPresenter.cpp +++ /dev/null @@ -1,110 +0,0 @@ - -#include "AppViewIDs.h" -#include "NativeAbility.h" - -#include -#include -#include -#include "traing/include/TraingListLimitPresenter.h" -// #include "TraingListLimitView.h" - -namespace OHOS -{ - - // 当前Presenter属性实例化的内存指针 - static TraingListLimitPresenter *g_pTraingListLimitPresenter = nullptr; - - TraingListLimitPresenter::TraingListLimitPresenter() - { - - g_pTraingListLimitPresenter = this; - } - - TraingListLimitPresenter::~TraingListLimitPresenter() - { - - g_pTraingListLimitPresenter = nullptr; - } - - TraingListLimitPresenter *TraingListLimitPresenter::GetInstance() - { - - return g_pTraingListLimitPresenter; - } - - void TraingListLimitPresenter::OnStart() - { - - Presenter::OnStart(); - } - - void TraingListLimitPresenter::OnPause(void) - { - - Presenter::OnPause(); - } - - void TraingListLimitPresenter::OnResume(void) - { - - Presenter::OnResume(); - } - - void TraingListLimitPresenter::OnStop(void) - { - - Presenter::OnStop(); - } - bool TraingListLimitPresenter::OnDrag(UIView &view, const DragEvent &event) - { - return true; - } - bool TraingListLimitPresenter::OnDragEnd(UIView &view, const DragEvent &event) - { - - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); - } - UNUSED(view); - return true; - } - - bool TraingListLimitPresenter::OnClick(UIView &view, const ClickEvent &event) - { - // 根据控件id查找是哪个控件触发了点击回调 - if (strcmp(view.GetViewId(), BUTTON1) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON2) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON3) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON4) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON5) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON6) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON7) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - if (strcmp(view.GetViewId(), BUTTON8) == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); - } - return true; - } -} diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListLimitView.cpp deleted file mode 100644 index dd1e9de76..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListLimitView.cpp +++ /dev/null @@ -1,323 +0,0 @@ - -#include "traing/include/TraingListLimitView.h" - -#include "common/image_cache_manager.h" -#include "UiConfig.h" -#include "ui_resource_image.h" -#include -#include "components/ui_button.h" - -#include "traing/include/TraingModel.h" -#include "traing/Training_UiConfig.h" -namespace OHOS -{ - - static char *text[] = {"一般极限运动", "滑板", "攀岩", "高空弹跳/蹦极", "跑酷", "BMX", "定向越野", "跳伞", "赛车", "铁人三项运动"}; - - static TraingListLimitView *g_pTraingListLimitView{nullptr}; - - TraingListLimitView::TraingListLimitView() - { - g_pTraingListLimitView = this; - } - - TraingListLimitView::~TraingListLimitView() - { - DeInit(); - g_pTraingListLimitView = nullptr; - } - - TraingListLimitView *TraingListLimitView::GetInstance() - { - - return g_pTraingListLimitView; - } - - /* Traing:初始化list */ - void TraingListLimitView::InitList() - { - // Add List to App - if (list1_ == nullptr) - { - list1_ = new UIList(); - } - list1_->SetPosition(35, 110); // widget's left position and top position - list1_->Resize(300, 1100); // widget's width and height - list1_->SetViewId("list1"); // Set style - list1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); - list1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - - // Set additional property - if (list1data_ == nullptr) - { - list1data_ = new List(); - } - - // 使用全局变量来初始化列表项 - for (int i = 0; i < 8; ++i) - { - IconItemNode *listData = new IconItemNode(); - // listData->imagePath = imagePaths[i]; - listData->txt = text[i]; - list1data_->PushBack(listData); - } - - if (list1adapter_ == nullptr) - { - list1adapter_ = new IconAdapter(); - } - list1adapter_->SetItemSize(250, 120); - list1adapter_->SetImageSize(130, 120); - list1adapter_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - list1adapter_->SetData(list1data_); - list1_->SetAdapter(list1adapter_); - - // Add to scrollView1 - // scrollView1_->Add(list1_); - list1_->SetVisible(true); - } - /* InitView:初始化界面*/ - void TraingListLimitView ::InitView() - { - if (container_ == nullptr) - { - container_ = new UIViewGroup(); - container_->SetPosition(0, 0, 466, 466); - container_->SetStyle(STYLE_BACKGROUND_OPA, 0); - } - // Add ScrollView to App - if (scrollView1_ == nullptr) - { - scrollView1_ = new UIScrollView(); - } - scrollView1_->SetPosition(0, 0); // widget's left position and top position - scrollView1_->Resize(466, 466); // widget's width and height - scrollView1_->SetViewId("scrollView1"); // Set style - scrollView1_->SetStyle(STYLE_BACKGROUND_OPA, 0xff); - // Add to rootView - container_->Add(scrollView1_); - scrollView1_->SetVisible(true); - - // 初始化titLable - TraingModel::GetInstance()->InitLabelExt(label1_, 173, 52, 200, 60, "label1", "极限训练", DEFAULT_VECTOR_FONT_FILENAME, 30); - scrollView1_->Add(label1_); - // 初始化Button - TraingModel::GetInstance()->InitButton(button1_, 43, 120, 380, 100, BUTTON1); - TraingModel::GetInstance()->InitButton(button2_, 43, 240, 380, 100, BUTTON2); - TraingModel::GetInstance()->InitButton(button3_, 43, 360, 380, 100, BUTTON3); - TraingModel::GetInstance()->InitButton(button4_, 43, 480, 380, 100, BUTTON4); - TraingModel::GetInstance()->InitButton(button5_, 43, 600, 380, 100, BUTTON5); - TraingModel::GetInstance()->InitButton(button6_, 43, 720, 380, 100, BUTTON6); - TraingModel::GetInstance()->InitButton(button7_, 43, 840, 380, 100, BUTTON7); - TraingModel::GetInstance()->InitButton(button8_, 43, 960, 380, 100, BUTTON8); - button1_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button2_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button3_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button4_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button5_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button6_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button7_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - button8_->SetOnClickListener(static_cast(TraingListLimitPresenter::GetInstance())); - scrollView1_->Add(button1_); - scrollView1_->Add(button2_); - scrollView1_->Add(button3_); - scrollView1_->Add(button4_); - scrollView1_->Add(button5_); - scrollView1_->Add(button6_); - scrollView1_->Add(button7_); - scrollView1_->Add(button8_); - // 初始化image - TraingModel::GetInstance()->InitImageView(image1_, 360, 160, 100, 100, "image1", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image2_, 360, 280, 100, 100, "image2", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image3_, 360, 400, 100, 100, "image3", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image4_, 360, 520, 100, 100, "image4", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image5_, 360, 640, 100, 100, "image5", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image6_, 360, 760, 100, 100, "image6", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image7_, 360, 880, 100, 100, "image7", ICON_IMAGE); - TraingModel::GetInstance()->InitImageView(image8_, 360, 1000, 100, 100, "image8", ICON_IMAGE); - scrollView1_->Add(image1_); - scrollView1_->Add(image2_); - scrollView1_->Add(image3_); - scrollView1_->Add(image4_); - scrollView1_->Add(image5_); - scrollView1_->Add(image6_); - scrollView1_->Add(image7_); - scrollView1_->Add(image8_); - // 初始化list - InitList(); - scrollView1_->Add(list1_); - } - /* DeInit：删除组件*/ - void TraingListLimitView::DeInit() - { - container_->RemoveAll(); - if (label1_ != nullptr) - { - delete label1_; - label1_ = nullptr; - } - if (button1_ != nullptr) - { - delete button1_; - button1_ = nullptr; - } - if (button8_ != nullptr) - { - delete button8_; - button8_ = nullptr; - } - if (button7_ != nullptr) - { - delete button7_; - button7_ = nullptr; - } - if (button6_ != nullptr) - { - delete button6_; - button6_ = nullptr; - } - if (button5_ != nullptr) - { - delete button5_; - button5_ = nullptr; - } - if (button4_ != nullptr) - { - delete button4_; - button4_ = nullptr; - } - if (button3_ != nullptr) - { - delete button3_; - button3_ = nullptr; - } - if (button2_ != nullptr) - { - delete button2_; - button2_ = nullptr; - } - if (image1_ != nullptr) - { - delete image1_; - image1_ = nullptr; - } - if (image2_ != nullptr) - { - delete image2_; - image2_ = nullptr; - } - if (image3_ != nullptr) - { - delete image3_; - image3_ = nullptr; - } - if (image4_ != nullptr) - { - delete image4_; - image4_ = nullptr; - } - if (image5_ != nullptr) - { - delete image5_; - image5_ = nullptr; - } - if (image6_ != nullptr) - { - delete image6_; - image6_ = nullptr; - } - if (image7_ != nullptr) - { - delete image7_; - image7_ = nullptr; - } - if (image8_ != nullptr) - { - delete image8_; - image8_ = nullptr; - } - if (list1_ != nullptr) - { - delete list1_; - list1_ = nullptr; - } - if (list1adapter_ != nullptr) - { - delete list1adapter_; - list1adapter_ = nullptr; - } - if (list1data_ != nullptr) - { - list1data_->Clear(); - delete list1data_; - list1data_ = nullptr; - } - if (scrollView1_ != nullptr) - { - scrollView1_->RemoveAll(); - delete scrollView1_; - scrollView1_ = nullptr; - } - if (container_ != nullptr) - { - container_->RemoveAll(); - delete container_; - container_ = nullptr; - } - } - - void TraingListLimitView::PreLoad(void) - { - if (!viewiInitStatus) - { - InitView(); - viewiInitStatus = true; - } - } - void TraingListLimitView::OnStart() - { - container_ = new UIViewGroup(); - if (container_ == nullptr) - { - return; - } - container_->SetPosition(0, 0); - container_->SetWidth(Screen::GetInstance().GetWidth()); - container_->SetHeight(Screen::GetInstance().GetHeight()); - - // 创建 draglistener 实例并设置为拖动监听器 - UIView::OnDragListener *draglistener = static_cast(TraingListLimitPresenter::GetInstance()); - if (draglistener == nullptr) - { - return; - } - container_->SetOnDragListener(draglistener); - - container_->SetTouchable(true); - container_->SetDraggable(true); - - PreLoad(); - RootView::GetInstance()->Add(container_); - } - - void TraingListLimitView::OnSetUpView() - { - - View::OnSetUpView(); - Draw(); - } - - void TraingListLimitView::OnTearDownView() - { - - View::OnTearDownView(); - return; - } - - void TraingListLimitView::OnStop() - { - View::OnStop(); - RootView::GetInstance()->RemoveAll(); - return; - } -} diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSbackPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSbackPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSbackView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSbackView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlackPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlackPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlackView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlackView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlostPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlostPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlostView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSlostView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSnotePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSnotePresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSnoteView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSnoteView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSsetPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSsetPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSsetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingGPSsetView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp index 8265666a3..0c381c4a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "traing/include/TraingGPSPresenter.h" +#include "traing/training_GPS/include/TraingGPSPresenter.h" // #include "TraingGPSView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp index ce66f8030..275003476 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingGPSView.h" +#include "traing/training_GPS/include/TraingGPSView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp index 06be1922c..7d2451626 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "traing/include/TraingGPSbackPresenter.h" +#include "traing/training_GPS/include/TraingGPSbackPresenter.h" // #include "TraingGPSbackView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp index 8a68bb8ce..0d6b591ab 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingGPSbackView.h" +#include "traing/training_GPS/include/TraingGPSbackView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp index b3a22c707..0bb60ac5a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "traing/include/TraingGPSlackPresenter.h" +#include "traing/training_GPS/include/TraingGPSlackPresenter.h" // #include "TraingGPSlackView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp index 3fc512c69..0cc434ae7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingGPSlackView.h" +#include "traing/training_GPS/include/TraingGPSlackView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp index 1f895c790..eb6101ad8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "traing/include/TraingGPSlostPresenter.h" +#include "traing/training_GPS/include/TraingGPSlostPresenter.h" // #include "TraingGPSlostView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp index e1f63b622..cf1e9dd9d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingGPSlostView.h" +#include "traing/training_GPS/include/TraingGPSlostView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnotePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp similarity index 96% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnotePresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp index bfef2c639..d04cba8a2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnotePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "traing/include/TraingGPSnotePresenter.h" +#include "traing/training_GPS/include/TraingGPSnotePresenter.h" // #include "TraingGPSnoteView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp index 738773db5..b1cb0a3bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingGPSnoteView.h" +#include "traing/training_GPS/include/TraingGPSnoteView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp index 7a9f8484a..17bc6aa2d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "traing/include/TraingGPSsetPresenter.h" +#include "traing/training_GPS/include/TraingGPSsetPresenter.h" // #include "TraingGPSsetView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp similarity index 99% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp index ef7c85958..0db56d57d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingGPSsetView.h" +#include "traing/training_GPS/include/TraingGPSsetView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h similarity index 65% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingCardPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h index 127d8b40a..2d8fcc64a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingCardPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-19 17:37:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 16:54:22 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef _TraingCard_PRESENTER_H #define _TraingCard_PRESENTER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingCardView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardPresenter.h similarity index 51% rename from code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardPresenter.h index 8c7650d34..0f3517d41 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardPresenter.h @@ -1,6 +1,14 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-22 14:43:30 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 16:40:54 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/Training_Card/include/Training_CardPresenter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ -#ifndef TRAING_CARD_PRESENTER_H -#define TRAING_CARD_PRESENTER_H +#ifndef Training_Card_PRESENTER_H +#define Training_Card_PRESENTER_H #include "components/ui_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h similarity index 81% rename from code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h index b5dea02a5..101266160 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h @@ -1,5 +1,5 @@ -#ifndef _Traing_CARD_VIEW_H -#define _Traing_CARD_VIEW_H +#ifndef _Training_Card_VIEW_H +#define _Training_Card_VIEW_H #include "BaseView.h" #include "View.h" @@ -22,13 +22,13 @@ namespace OHOS #define BUTTON3 "button3" // 按键3 #define BUTTONMORE "button4" // 按键 更多 - class Traing_CardView : public UICardPage + class Training_CardView : public UICardPage { public: - Traing_CardView(); - virtual ~Traing_CardView(); - static Traing_CardView *GetInstance(void); + Training_CardView(); + virtual ~Training_CardView(); + static Training_CardView *GetInstance(void); bool InitView(); void DeInit(); @@ -45,8 +45,8 @@ namespace OHOS private: UIView::OnDragListener *draglistener{nullptr}; - Traing_CardView(Traing_CardView &&) = delete; - Traing_CardView &operator=(Traing_CardView &&) = delete; + Training_CardView(Training_CardView &&) = delete; + Training_CardView &operator=(Training_CardView &&) = delete; UILabelButtonExt *Button1 = nullptr; UILabelButtonExt *Button2 = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp similarity index 92% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingCardPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index 815e56d57..ae59a77a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "traing/include/TraingCardPresenter.h" +#include "traing/training_card/include/TraingCardPresenter.h" // #include "TraingCardView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp similarity index 95% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingCardView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index 4f0bddf13..e318451ef 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingCardView.h" +#include "traing/training_card/include/TraingCardView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" #include "ui_resource_image.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp similarity index 52% rename from code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp index a06e02d55..e1f8a3570 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -1,6 +1,14 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-22 14:43:06 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 16:43:39 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ -#include "traing/traing_card/Traing_CardPresenter.h" -#include "traing/traing_card/Traing_CardView.h" +#include "traing/training_card/include/Training_CardPresenter.h" +#include "traing/training_card/include/Training_CardView.h" #include "AppViewIDs.h" #include "NativeAbility.h" @@ -12,11 +20,11 @@ namespace OHOS bool TraingOnClickListener::OnClick(UIView &view, const ClickEvent &event) { UNUSED(event); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::OnClick %s", view.GetViewId()); - Traing_CardView *cardpage = Traing_CardView::GetInstance(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::OnClick %s", view.GetViewId()); + Training_CardView *cardpage = Training_CardView::GetInstance(); if (cardpage == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::GetInstance"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::GetInstance"); return false; } if (strcmp(view.GetViewId(), BUTTON1) == 0) diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp similarity index 81% rename from code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp index 167233263..a0c29297e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/traing_card/Traing_CardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp @@ -1,5 +1,5 @@ -#include "traing/traing_card/Traing_CardView.h" +#include "traing/training_card/include/Training_CardView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" @@ -9,31 +9,31 @@ #include "components/ui_view_group.h" #include "common/image_cache_manager.h" #include "MainPresenterSample.h" -#include "traing/traing_card/Traing_CardPresenter.h" +#include "traing/training_card/include/Training_CardPresenter.h" namespace OHOS { - static Traing_CardView *g_pTraing_CardView{nullptr}; + static Training_CardView *g_pTraining_CardView{nullptr}; - Traing_CardView::Traing_CardView() + Training_CardView::Training_CardView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::Traing_CardView"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - g_pTraing_CardView = this; + g_pTraining_CardView = this; } - Traing_CardView::~Traing_CardView() + Training_CardView::~Training_CardView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::~Traing_CardView"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::~Training_CardView"); RemoveAll(); DeInit(); - g_pTraing_CardView = nullptr; + g_pTraining_CardView = nullptr; } - Traing_CardView *Traing_CardView::GetInstance() + Training_CardView *Training_CardView::GetInstance() { - return g_pTraing_CardView; + return g_pTraining_CardView; } - bool Traing_CardView::InitLable() + bool Training_CardView::InitLable() { // 检查标签指针是否为空 if (titleLabel == nullptr) @@ -59,14 +59,14 @@ namespace OHOS } /* -------------------------------------------------------------------------- */ // 加载图片函数（针对UILabelButtonExt） - bool Traing_CardView::LoadImage(UILabelButtonExt *view, uint32_t resId) + bool Training_CardView::LoadImage(UILabelButtonExt *view, uint32_t resId) { std::string file = TRAINING_IAMGES; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TrainingView LoadImage: %s, resID=0x%x", TRAINING_IAMGES, resId); ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file); if (image == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::LoadImage %x fail", resId); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::LoadImage %x fail", resId); return false; } // Assuming SetImageSrc is the correct function for UILabelButtonExt @@ -75,21 +75,21 @@ namespace OHOS } // 加载图片函数（针对UIImageView） - bool Traing_CardView::LoadImage(UIImageView *view, uint32_t resId) + bool Training_CardView::LoadImage(UIImageView *view, uint32_t resId) { std::string file = TRAINING_IAMGES; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TrainingView LoadImage: %s, resID=0x%x", TRAINING_IAMGES, resId); ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file); if (image == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::LoadImage %x fail", resId); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::LoadImage %x fail", resId); return false; } view->SetSrc(image); // Assuming SetSrc is the correct function for UIImageView return true; } - bool Traing_CardView::AddButton() + bool Training_CardView::AddButton() { struct ButtonInfo { @@ -142,7 +142,7 @@ namespace OHOS return true; } - bool Traing_CardView::InitImage() + bool Training_CardView::InitImage() { struct ImageInfo { @@ -178,9 +178,9 @@ namespace OHOS return true; } /* -------------------------------------------------------------------------- */ - bool Traing_CardView::InitView() + bool Training_CardView::InitView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Traing_CardView::InitView()"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::InitView()"); if (!InitLable()) { printf("InitLable error!\n"); @@ -197,7 +197,7 @@ namespace OHOS return true; } - void Traing_CardView::DeInit() + void Training_CardView::DeInit() { UIImageView *imageViews[] = {image1, image2, image3}; UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2}; @@ -227,7 +227,7 @@ namespace OHOS } } - void Traing_CardView::PreLoad(void) + void Training_CardView::PreLoad(void) { if (!viewiInitStatus) { @@ -240,7 +240,7 @@ namespace OHOS // } } - void Traing_CardView::UnLoad(void) + void Training_CardView::UnLoad(void) { // if (resLoadStatus) // { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListAquaticPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/include/TraingListAquaticPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListAquaticPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/include/TraingListAquaticPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListAquaticView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/include/TraingListAquaticView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListAquaticView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/include/TraingListAquaticView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListBallPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingListAquaticPresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListBallPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingListAquaticPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListBallView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingListAquaticView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListBallView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingListAquaticView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListBallPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/include/TraingListBallPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListBallPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/include/TraingListBallPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListBallView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/include/TraingListBallView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListBallView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/include/TraingListBallView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListDancePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingListBallPresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListDancePresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingListBallPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListDanceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingListBallView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListDanceView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingListBallView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListDancePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingListDancePresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListDancePresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingListDancePresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListDanceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingListDanceView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListDanceView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingListDanceView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListFitnessPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingListDancePresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListFitnessPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingListDancePresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListFitnessView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingListDanceView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListFitnessView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingListDanceView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListFitnessPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingListFitnessPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListFitnessPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingListFitnessPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListFitnessView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingListFitnessView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListFitnessView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingListFitnessView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListIcePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingListFitnessPresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListIcePresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingListFitnessPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListIceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingListFitnessView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListIceView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingListFitnessView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListIcePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingListIcePresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListIcePresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingListIcePresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListIceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingListIceView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListIceView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingListIceView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListOtherPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingListIcePresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListOtherPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingListIcePresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListOtherView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingListIceView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListOtherView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingListIceView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h new file mode 100644 index 000000000..f4c44b474 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h @@ -0,0 +1,55 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-26 17:04:41 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:17:03 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ + +#ifndef TraingLimit_ADAPTER_H +#define TraingLimit_ADAPTER_H +#include +#include +#include "components/ui_list.h" +#include "components/abstract_adapter.h" +#include "components/ui_label.h" +#include "components/ui_checkbox.h" +#include "AppViewIDs.h" + +// 音乐列表的适配器 +namespace OHOS +{ + + typedef struct + { + AppViewId id; + const char *label; // 标签 + } TraingLimitItem; + + class TraingLimitAdapter : public AbstractAdapter + { + public: + explicit TraingLimitAdapter(); + virtual ~TraingLimitAdapter(); + + void SetData(std::list &data); + + virtual uint16_t GetCount(void) override; + + virtual UIView *GetView(UIView *inView, int16_t index) override; + + virtual void AddItem(const TraingLimitItem &item); + + void SetItemClickListener(UIView::OnClickListener *itemclicklistener) + { + itemClickListener = itemclicklistener; + } + + private: + std::list listData; + UIView::OnClickListener *itemClickListener{nullptr}; + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h new file mode 100644 index 000000000..729b58f73 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h @@ -0,0 +1,42 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-26 17:05:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:24:58 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ + +#ifndef TraingLimit_ITEM_VIEW_H +#define TraingLimit_ITEM_VIEW_H + +#include "components/ui_label.h" +#include "components/ui_view_group.h" +#include "components/ui_checkbox.h" +#include "components/ui_image_view.h" +#include "traing/training_list_limit/include/TraingLimitAdapter.h" +#include "components/ui_label_button.h" +#include "AppViewIDs.h" +#include "ohos_types.h" + +namespace OHOS +{ + class TraingLimitItemView : public UIViewGroup + { + public: + explicit TraingLimitItemView(); + virtual ~TraingLimitItemView(); + virtual void SetItemInfo(const TraingLimitItem itemInfo); + virtual void SetUpChild(); + AppViewId GetTraingLimitIndex(); + + private: + TraingLimitItemView(const TraingLimitItemView &); + UIImageView sbackground; // 背景 + UIImageView sicon; // 箭头 + UILabel sLabel; // 标签 + TraingLimitItem sItemInfo = {VIEW_INVALID, nullptr}; + }; + +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h new file mode 100644 index 000000000..cb8433a3c --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h @@ -0,0 +1,35 @@ + +#ifndef TraingLimit_MODEL_H +#define TraingLimit_MODEL_H + +#include +#include +#include "AppViewIDs.h" +#include "UiConfig.h" +#include "TraingLimitPresenter.h" +#include "traing/training_list_limit/include/TraingLimitAdapter.h" + +namespace OHOS +{ + class TraingLimitModel + { + public: + static TraingLimitModel &GetInstance(void); + void InitTraingLimitListItem(); + const TraingLimitItem *GetTraingLimitlistItems() const; + uint8_t GetTraingLimitListNum() const; + // const std::map &GetTraingLimitIdToViewId() const; + + private: + TraingLimitModel(); + TraingLimitModel(const TraingLimitModel &); + TraingLimitModel &operator=(const TraingLimitModel &); + virtual ~TraingLimitModel(); + static const uint16_t TraingLimitListMaxNum = 10; + TraingLimitItem TraingLimits[TraingLimitListMaxNum] = {VIEW_INVALID, nullptr}; + // std::map TraingLimitIdToViewId; + bool btConnectStatus{false}; + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h new file mode 100644 index 000000000..f753f6118 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h @@ -0,0 +1,53 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-19 17:37:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 20:02:43 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-19 17:37:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:26:49 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ + +#ifndef _TraingLimit_PRESENTER_H +#define _TraingLimit_PRESENTER_H + +#include "Presenter.h" +#include "TraingLimitView.h" + +namespace OHOS +{ + class TraingLimitView; + class TraingLimitModel; + class TraingLimitPresenter : public Presenter, + public UIView::OnClickListener, + public UIView::OnDragListener + { + public: + TraingLimitPresenter(); + virtual ~TraingLimitPresenter(); + + void OnStart() override; + void OnPause() override; + void OnResume() override; + void OnStop() override; + + static TraingLimitPresenter *GetInstance(); + + private: + // 因为继承了OnClickener，所以有OnClick属性，至于参数,原函数也这样直接继承; + bool OnClick(UIView &view, const ClickEvent &event) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + bool OnDragEnd(UIView &view, const DragEvent &event) override; + + TraingLimitModel *p_TraingLimitModel{nullptr}; + }; +} // namespace OHOS + +#endif // SLEEPDETAIL_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h new file mode 100644 index 000000000..8371ad20e --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h @@ -0,0 +1,52 @@ + +#ifndef TraingLimit_VIEW_H +#define TraingLimit_VIEW_H + +#include "BaseView.h" +#include "View.h" +#include "components/ui_view_group.h" +#include "components/ui_scroll_view.h" +#include "components/ui_list.h" +#include "traing/training_list_limit/include/TraingLimitAdapter.h" +#include "traing/training_list_limit/include/TraingLimitModel.h" +#include "components/ui_label_button_ext.h" +#include "components/ui_label_ext.h" + +namespace OHOS +{ + class TraingLimitPresenter; + class TraingLimitModel; + class TraingLimitView : public View, public UIViewGroup + { + + public: + TraingLimitView(); + virtual ~TraingLimitView(); + static TraingLimitView *GetInstance(void); + + void OnStart() override; + void OnSetUpView() override; + void OnTearDownView() override; + void OnStop() override; + + UIList *GetList(); + void AddToTraingLimitList(const TraingLimitItem &item); + + private: + void InitView(void); + void DeInitView(void); + void PreLoad(void); + + private: + UIScrollView *scrollView = nullptr; + UILabelExt *title{nullptr}; + TraingLimitAdapter *p_TraingLimitListAdapter{nullptr}; + UIList *TraingLimitList = nullptr; + UIView::OnDragListener *draglistener{nullptr}; + + TraingLimitPresenter *g_TraingLimitPresenter{nullptr}; + TraingLimitModel *g_TraingLimitModel{nullptr}; + bool viewInitStatus{false}; + }; +} // namespace OHOS +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitAdapter.cpp new file mode 100644 index 000000000..bd847e0b0 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitAdapter.cpp @@ -0,0 +1,87 @@ +#include "traing/training_list_limit/include/TraingLimitAdapter.h" +#include "traing/training_list_limit/include/TraingLimitModel.h" +#include "traing/training_list_limit/include/TraingLimitItemView.h" + +#include "wearable_log.h" + +namespace OHOS +{ + TraingLimitAdapter::TraingLimitAdapter() {} + + TraingLimitAdapter::~TraingLimitAdapter() + { + listData.clear(); + } + + uint16_t TraingLimitAdapter::GetCount(void) + { + return listData.size(); + } + + void TraingLimitAdapter::SetData(std::list &data) + { + if (!listData.empty()) + { + listData.clear(); + } + std::list::iterator it; + for (it = data.begin(); it != data.end(); it++) + { + listData.push_back(*it); + } + } + + /// @brief 为列表的每一项创建一个视图 + /// @param inView 一个指向已存在的视图对象的指 + /// @param index 要创建的视图在列表中的索引l。 + /// @return 返回该视图对象 + UIView *TraingLimitAdapter::GetView(UIView *inView, int16_t index) + { + + // 1.先检查列表数据是否为空，若为空则返回空指针 + if (listData.empty()) + { + return nullptr; + } + // 2.接着检查索引是否小于0，若小于0则返回空指针 + if (index < 0) + { + return nullptr; + } + // 3.检查是否超出列表数据大小，若超出则返回空指针 + size_t uindex = index; + if (uindex >= listData.size()) + { + return nullptr; + } + // 4.通过迭代器访问列表中指定索引位置的元素，将其赋值给itemData变量 + std::list::iterator it = listData.begin(); + for (int i = 0; i < index; i++) + { + it++; + } + TraingLimitItem itemData = *it; + TraingLimitItemView *item = nullptr; + /* + 5.根据传入的inView参数是否已经存在一个视图对象， + 若为空则创建一个新的MessageItemView对象， + 否则将inView转换成MessageItemView类型的指针 + */ + if (inView == nullptr) + { + item = new TraingLimitItemView(); + } + else + { + item = static_cast(inView); + } + item->SetItemInfo(itemData); + item->SetOnClickListener(itemClickListener); + return item; + } + + void TraingLimitAdapter::AddItem(const TraingLimitItem &item) + { + listData.push_back(item); + } +} // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp new file mode 100644 index 000000000..d584b2234 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp @@ -0,0 +1,59 @@ + +#include "traing/training_list_limit/include/TraingLimitItemView.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" +#include "UiConfig.h" +namespace OHOS +{ + + TraingLimitItemView::TraingLimitItemView() + { + SetPosition(0, 0, 380, 120); // 每一个itemview宽高要配置好，因为加到list都是以这个视图为基准 + SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + SetStyle(STYLE_BACKGROUND_OPA, 255); + SetTouchable(true); + SetUpChild(); + Add(&sbackground); + Add(&sicon); + Add(&sLabel); + } + + TraingLimitItemView::~TraingLimitItemView() + { + Remove(&sbackground); + Remove(&sicon); + Remove(&sLabel); + } + + /// @brief 设置item的信息 + /// @param itemInfo + void TraingLimitItemView::SetItemInfo(const TraingLimitItem itemInfo) + { + sItemInfo = itemInfo; + sLabel.SetText(itemInfo.label); + } + + /// @brief 设置每一个itemview上的组件 + void TraingLimitItemView::SetUpChild() + { + sbackground.SetSrc(PNG_SETTING_BACKGROUND_IMAGE); + + sicon.SetPosition(330, 40); + sicon.SetSrc(ICON_IMAGE); + sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); + + sLabel.SetPosition(50, 10, 300, 80); + sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + sLabel.SetRollSpeed(0); + sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + } + + /// @brief 获取list的中每个组件的在list的下标 + /// @return 返回下标 + AppViewId TraingLimitItemView::GetTraingLimitIndex() + { + return sItemInfo.id; + } + +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp new file mode 100644 index 000000000..48a67e507 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp @@ -0,0 +1,53 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-26 18:34:15 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:36:25 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ + +#include "traing/training_list_limit/include/TraingLimitModel.h" +#include "common/image_cache_manager.h" +#include "UiConfig.h" +#include "ui_resource_image.h" +#include "AppViewIDs.h" +namespace OHOS +{ + + TraingLimitModel::TraingLimitModel() {} + + TraingLimitModel::~TraingLimitModel() {} + + TraingLimitModel &TraingLimitModel::GetInstance() + { + static TraingLimitModel instance; + return instance; + } + + static char *text[] = {"一般极限运动", "滑板", "攀岩", "高空弹跳/蹦极", "跑酷", "BMX", "定向越野", "跳伞", "赛车", "铁人三项运动"}; + + void TraingLimitModel::InitTraingLimitListItem() + { + TraingLimits[0] = {VIEW_TRAININGNOMAL, "一般极限运动"}; + TraingLimits[1] = {VIEW_TRAININGNOMAL, "滑板"}; + TraingLimits[2] = {VIEW_TRAININGNOMAL, "攀岩"}; + TraingLimits[3] = {VIEW_TRAININGNOMAL, "高空弹跳/蹦极"}; + TraingLimits[4] = {VIEW_TRAININGNOMAL, "跑酷"}; + TraingLimits[5] = {VIEW_TRAININGNOMAL, "BMX"}; + TraingLimits[6] = {VIEW_TRAININGNOMAL, "定向越野"}; + TraingLimits[7] = {VIEW_TRAININGNOMAL, "跳伞"}; + TraingLimits[8] = {VIEW_TRAININGNOMAL, "赛车"}; + TraingLimits[9] = {VIEW_TRAININGNOMAL, "铁人三项运动"}; + } + + const TraingLimitItem *TraingLimitModel::GetTraingLimitlistItems() const + { + return TraingLimits; + } + uint8_t TraingLimitModel::GetTraingLimitListNum() const + { + return TraingLimitListMaxNum; + } + +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp new file mode 100644 index 000000000..11593e4ad --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp @@ -0,0 +1,113 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-19 17:37:19 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 19:51:06 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-19 17:37:19 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 14:23:32 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitPresenter.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ + +#include "AppViewIDs.h" +#include "NativeAbility.h" + +#include +#include +#include +#include "traing/training_list_limit/include/TraingLimitItemView.h" +#include "traing/training_list_limit/include/TraingLimitPresenter.h" +#include "traing/training_list_limit/include/TraingLimitView.h" +// #include "TraingLimitView.h" + +namespace OHOS +{ + extern const char *Limit_buttons[]; + extern char *Limit_text[]; + + // 当前Presenter属性实例化的内存指针 + static TraingLimitPresenter *g_pTraingLimitPresenter = nullptr; + + TraingLimitPresenter::TraingLimitPresenter() + { + p_TraingLimitModel = &TraingLimitModel::GetInstance(); + g_pTraingLimitPresenter = this; + } + + TraingLimitPresenter::~TraingLimitPresenter() + { + + g_pTraingLimitPresenter = nullptr; + } + + TraingLimitPresenter *TraingLimitPresenter::GetInstance() + { + + return g_pTraingLimitPresenter; + } + + void TraingLimitPresenter::OnStart() + { + p_TraingLimitModel->InitTraingLimitListItem(); + Presenter::OnStart(); + } + + void TraingLimitPresenter::OnPause(void) + { + Presenter::OnPause(); + } + + void TraingLimitPresenter::OnResume(void) + { + if (view_ == nullptr) + { + return; + } + const TraingLimitItem *itemInfo = p_TraingLimitModel->GetTraingLimitlistItems(); + for (int i = 0; i < p_TraingLimitModel->GetTraingLimitListNum(); i++) + { + view_->AddToTraingLimitList(itemInfo[i]); + } + Presenter::OnResume(); + } + + void TraingLimitPresenter::OnStop(void) + { + + Presenter::OnStop(); + } + bool TraingLimitPresenter::OnDrag(UIView &view, const DragEvent &event) + { + return true; + } + bool TraingLimitPresenter::OnDragEnd(UIView &view, const DragEvent &event) + { + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); + } + UNUSED(view); + return true; + } + + bool TraingLimitPresenter::OnClick(UIView &view, const ClickEvent &event) + { + UNUSED(event); + TraingLimitItemView *itemView = static_cast(&view); + AppViewId viewId = itemView->GetTraingLimitIndex(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d\n", viewId); + if (viewId < VIEW_MAX_INTER_APP) + { + NativeAbility::GetInstance().ChangeSlice(viewId); + return true; + } + return false; + } + +} diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp new file mode 100644 index 000000000..e054a7b7f --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp @@ -0,0 +1,151 @@ +#include "traing/training_list_limit/include/TraingLimitView.h" +#include "traing/training_list_limit/include/TraingLimitPresenter.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + +#include "UiConfig.h" +#include "wearable_log.h" + +namespace OHOS +{ + static constexpr uint8_t NUM_2 = 2; + static TraingLimitView *g_pTraingLimitView{nullptr}; + /* --------------------------------- List --------------------------------- */ + static constexpr int16_t Limit_LIST_POSITION_X = 43; + static constexpr int16_t Limit_LIST_POSITION_Y = 120; + static constexpr int16_t Limit_SCROLLBLANKSIZE = 35; // 设置此滚动视图的空白大小。 + static constexpr int16 MAX_SCR_DIS = 1000; + static constexpr int16 LIST_POS = 20; + static constexpr int16 SNUM_2 = 2; + + TraingLimitView::TraingLimitView() + { + g_pTraingLimitView = this; + } + + TraingLimitView::~TraingLimitView() + { + if (viewInitStatus == true) + { + DeInitView(); + } + g_pTraingLimitView = nullptr; + } + + TraingLimitView *TraingLimitView::GetInstance() + { + return g_pTraingLimitView; + } + /// @param item + void TraingLimitView::AddToTraingLimitList(const TraingLimitItem &item) + { + p_TraingLimitListAdapter->AddItem(item); + } + void TraingLimitView::InitView() + { + if (scrollView == nullptr) + { + scrollView = new UIScrollView(); + } + scrollView->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + // scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + scrollView->SetScrollBlankSize(52); + // scrollView->SetReboundSize(100); + scrollView->SetTouchable(true); + scrollView->SetDraggable(true); + scrollView->SetDirection(1); + draglistener = static_cast(TraingLimitPresenter::GetInstance()); + scrollView->SetOnDragListener(draglistener); + scrollView->SetYScrollBarVisible(true); // 设置滑动滚动条 + /* -------------------------------------------------------------------------- */ + // 初始化Lable + TraingModel::GetInstance()->InitLabelExt(title, 173, 52, 200, 60, "label1", "极限训练", DEFAULT_VECTOR_FONT_FILENAME, 30); + scrollView->Add(title); + // UIList 的适配器 + p_TraingLimitListAdapter = new TraingLimitAdapter(); + p_TraingLimitListAdapter->SetItemClickListener(presenter_); + if (TraingLimitList == nullptr) + { + TraingLimitList = new UIList(); + } + TraingLimitList->SetPosition(Limit_LIST_POSITION_X, Limit_LIST_POSITION_Y); + TraingLimitList->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + TraingLimitList->SetScrollBlankSize(Limit_SCROLLBLANKSIZE); + TraingLimitList->SetSelectPosition(HORIZONTAL_RESOLUTION / SNUM_2); // middle position + TraingLimitList->SetDraggable(true); + TraingLimitList->SetThrowDrag(false); + TraingLimitList->EnableAutoAlign(true); + TraingLimitList->SetElastic(true); // 设置回弹效果 + TraingLimitList->SetMaxScrollDistance(MAX_SCR_DIS); + + // 增加表冠控制 + TraingLimitList->SetRotateFactor(2); + TraingLimitList->RequestFocus(); + } + UIList *TraingLimitView::GetList() + { + return TraingLimitList; + } + void TraingLimitView::DeInitView() + { + // scrollView-> RemoveAll(); + RemoveAll(); + delete title; + title = nullptr; + + delete TraingLimitList; + TraingLimitList = nullptr; + + delete scrollView; + scrollView = nullptr; + + delete draglistener; + draglistener = nullptr; + } + + void TraingLimitView::PreLoad(void) + { + if (!viewInitStatus) + { + InitView(); + viewInitStatus = true; + } + } + + /// @brief 页面启动时需要执行的代码逻辑 + void TraingLimitView::OnStart() + { + View::OnStart(); + BaseView::RootView(Color::Black().full); + PreLoad(); + } + + /// @brief 创建页面的视图。 + void TraingLimitView::OnSetUpView() + { + View::OnSetUpView(); + // scrollView->Add(title); + scrollView->Add(TraingLimitList); + scrollView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + RootView::GetInstance()->Add(scrollView); + TraingLimitList->SetAdapter(p_TraingLimitListAdapter); + // TraingLimitList->RefreshList(); // 刷新列表 + Draw(); + } + + /// @brief 销毁页面的视图。 + void TraingLimitView::OnTearDownView() + { + View::OnTearDownView(); + return; + } + + /// @brief 页面结束时需要执行的销毁逻辑。 + void TraingLimitView::OnStop() + { + View::OnStop(); + RootView::GetInstance()->RemoveAll(); + RootView::GetInstance()->ClearFocus(); + return; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMorePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMorePresenter.h similarity index 67% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMorePresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMorePresenter.h index e0a2cb810..5f81c34a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMorePresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMorePresenter.h @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-19 17:37:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-26 18:26:47 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMorePresenter.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef _TraingMore_PRESENTER_H #define _TraingMore_PRESENTER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMoreView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMoreView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp similarity index 94% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp index 0f64db9ee..c39fe2743 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "traing/include/TraingMorePresenter.h" +#include "traing/training_list_more/include/TraingMorePresenter.h" #include "MainViewSample.h" #include "ScreenModels.h" // #include "TraingMoreView.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp similarity index 96% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp index b6b6dfd9d..7bc5b8b20 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp @@ -1,5 +1,5 @@ -#include "traing/include/TraingMoreView.h" +#include "traing/training_list_more/include/TraingMoreView.h" #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListOtherPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/include/TraingListOtherPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListOtherPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/include/TraingListOtherPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListOtherView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/include/TraingListOtherView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListOtherView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/include/TraingListOtherView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListRestPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingListOtherPresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListRestPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingListOtherPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListRestView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingListOtherView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingListRestView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingListOtherView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListRestPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingListRestPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListRestPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingListRestPresenter.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListRestView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingListRestView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListRestView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingListRestView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListAquaticPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingListRestPresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListAquaticPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingListRestPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListAquaticView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingListRestView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingListAquaticView.h rename to code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingListRestView.cpp