From: Caisking <3449750381@qq.com> Date: Fri, 12 Apr 2024 08:26:29 +0000 (+0800) Subject: 训练增加退出弹窗界面 X-Git-Tag: release_V1.2.70_20241020_135402~1208 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6f6019c1f06c98d9810dc2ef7219de745cdf5173;p=mirrors%2FFD230.git 训练增加退出弹窗界面 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp index 73d0eb79c..1effc9d51 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -13,841 +13,929 @@ #include "PlayersModel.h" #include "PlayersCaseListAdapter.h" #include "MainViewSample.h" +#include "traing/training_card/include/TraingCardView.h" -namespace OHOS { -static PlayersView* g_pPlayersView = nullptr; +namespace OHOS +{ + static PlayersView *g_pPlayersView = nullptr; #define STEP_LABEL_X 166 #define STEP_LABEL_Y 30 #define TEXT_WIDTH 120 #define TEXT_HEIGHT 30 -PlayersView::PlayersView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::PlayersView"); - SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - g_pPlayersView = this; -} - -PlayersView::~PlayersView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::~PlayersView"); - if (viewiInitStatus == true) { - state = GetPlayerButtonState(); - if (state == UICheckBox::UICheckBoxState::SELECTED) { - PlayersModel::GetInstance()->SetPlayButtonState(true); - } - RemoveAll(); - listGroup->RemoveAll(); - delete list; - list = nullptr; - delete playerlistener; - playerlistener = nullptr; - delete playerButton; - playerButton = nullptr; - delete soundlistener; - soundlistener = nullptr; - delete nextButton; - nextButton = nullptr; - delete nextlistener; - nextlistener = nullptr; - delete preButton; - preButton = nullptr; - TearDownView(); - delete adapterText; - adapterText = nullptr; - delete backGround; - delete titleLabel; - delete subTitleLabel; - delete MusciSourceLabel; - MusciSourceLabel = nullptr; - if(music_list_button != nullptr) - { - delete music_list_button; - music_list_button = nullptr; - } - if(PhoneMusicConnectStatusLabel != nullptr) - { - delete PhoneMusicConnectStatusLabel; - PhoneMusicConnectStatusLabel = nullptr; - } - backGround = nullptr; - titleLabel = nullptr; - subTitleLabel = nullptr; - delete playbackProgress; - playbackProgress = nullptr; - delete jumpView; - jumpView = nullptr; - delete playersPresenter; - playersPresenter = nullptr; - delete playerOnDragListener; - playerOnDragListener = nullptr; - } - g_pPlayersView = nullptr; -} + PlayersView::PlayersView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::PlayersView"); + SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + g_pPlayersView = this; + } -void PlayersView::TitleSetText(const char *text) -{ - titleLabel->SetText(text); - titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, - UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); + PlayersView::~PlayersView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::~PlayersView"); + if (viewiInitStatus == true) + { + state = GetPlayerButtonState(); + if (state == UICheckBox::UICheckBoxState::SELECTED) + { + PlayersModel::GetInstance()->SetPlayButtonState(true); + } + RemoveAll(); + listGroup->RemoveAll(); + delete list; + list = nullptr; + delete playerlistener; + playerlistener = nullptr; + delete playerButton; + playerButton = nullptr; + delete soundlistener; + soundlistener = nullptr; + delete nextButton; + nextButton = nullptr; + delete nextlistener; + nextlistener = nullptr; + delete preButton; + preButton = nullptr; + TearDownView(); + delete adapterText; + adapterText = nullptr; + delete backGround; + delete titleLabel; + delete subTitleLabel; + delete MusciSourceLabel; + MusciSourceLabel = nullptr; + if (music_list_button != nullptr) + { + delete music_list_button; + music_list_button = nullptr; + } + if (PhoneMusicConnectStatusLabel != nullptr) + { + delete PhoneMusicConnectStatusLabel; + PhoneMusicConnectStatusLabel = nullptr; + } + backGround = nullptr; + titleLabel = nullptr; + subTitleLabel = nullptr; + delete playbackProgress; + playbackProgress = nullptr; + delete jumpView; + jumpView = nullptr; + delete playersPresenter; + playersPresenter = nullptr; + delete playerOnDragListener; + playerOnDragListener = nullptr; + } + g_pPlayersView = nullptr; + } -} + void PlayersView::TitleSetText(const char *text) + { + titleLabel->SetText(text); + titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, + UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); + } -void PlayersView::PlayerModelButtonSetSrc(uint32_t playMode) -{ - ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(playMode, PLAYER_IAMGES); - playerModelButton->SetSrc(image); -} + void PlayersView::PlayerModelButtonSetSrc(uint32_t playMode) + { + ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(playMode, PLAYER_IAMGES); + playerModelButton->SetSrc(image); + } -int16_t PlayersView::GetVolumeRank(void) -{ - return volumeSet; -} + int16_t PlayersView::GetVolumeRank(void) + { + return volumeSet; + } -void PlayersView::SetVolumeRank(int16_t value) -{ - volumeSet = value; -} + void PlayersView::SetVolumeRank(int16_t value) + { + volumeSet = value; + } -void PlayersView::SetVolumeAddOne(void) -{ - volumeSet++; -} + void PlayersView::SetVolumeAddOne(void) + { + volumeSet++; + } -UIButton *PlayersView::GetPullButton(void) -{ - return pullButton; -} + UIButton *PlayersView::GetPullButton(void) + { + return pullButton; + } -UIButton *PlayersView::GetOptionsButton(void) -{ - return optionsButton; -} + UIButton *PlayersView::GetOptionsButton(void) + { + return optionsButton; + } -UIButton *PlayersView::GetPreButton(void) -{ - return preButton; -} + UIButton *PlayersView::GetPreButton(void) + { + return preButton; + } -UIButton *PlayersView::GetNextButton(void) -{ - return nextButton; -} + UIButton *PlayersView::GetNextButton(void) + { + return nextButton; + } -//获取音乐列表按钮 -UIButton *PlayersView::GetMusicListButton(void) -{ - return music_list_button; -} + // 获取音乐列表按钮 + UIButton *PlayersView::GetMusicListButton(void) + { + return music_list_button; + } -UILabel *PlayersView::GetTitleLabel(void) -{ - return titleLabel; -} + UILabel *PlayersView::GetTitleLabel(void) + { + return titleLabel; + } -//获取音乐来源标签 -UILabel *PlayersView::GetMusicSourceLabel(void) -{ - return MusciSourceLabel; -} + // 获取音乐来源标签 + UILabel *PlayersView::GetMusicSourceLabel(void) + { + return MusciSourceLabel; + } -//获手机音乐连接状态标签 -UILabel *PlayersView::GetPhoneMusicConnectStatusLabel(void) -{ - return PhoneMusicConnectStatusLabel; -} + // 获手机音乐连接状态标签 + UILabel *PlayersView::GetPhoneMusicConnectStatusLabel(void) + { + return PhoneMusicConnectStatusLabel; + } -UICheckBox *PlayersView::GetPlayerButton(void) -{ - return playerButton; -} + UICheckBox *PlayersView::GetPlayerButton(void) + { + return playerButton; + } -UIImageView *PlayersView::GetSoundButton(void) -{ - return soundButton; -} + UIImageView *PlayersView::GetSoundButton(void) + { + return soundButton; + } -UICircleProgress *PlayersView::GetPlaybackProgress(void) -{ - return playbackProgress; -} + UICircleProgress *PlayersView::GetPlaybackProgress(void) + { + return playbackProgress; + } -UIImageView *PlayersView::GetPlayerModelButton(void) -{ - return playerModelButton; -} + UIImageView *PlayersView::GetPlayerModelButton(void) + { + return playerModelButton; + } -UICheckBox::UICheckBoxState PlayersView::GetPlayerButtonState(void) -{ - return playerButton->GetState(); -} + UICheckBox::UICheckBoxState PlayersView::GetPlayerButtonState(void) + { + return playerButton->GetState(); + } -void PlayersView::SetPlayerButtonState(UICheckBox::UICheckBoxState state) -{ - if (playerButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::SetPlayerButtonState playerButton NULL"); - return; + void PlayersView::SetPlayerButtonState(UICheckBox::UICheckBoxState state) + { + if (playerButton == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::SetPlayerButtonState playerButton NULL"); + return; + } + return playerButton->SetState(state); } - return playerButton->SetState(state); -} -UIList *PlayersView::GetPlayerList(void) -{ - return list; -} -/// @brief 根据传入的status参数来控制歌曲列表组的显示与隐藏。 -/// @param status -void PlayersView::SetPlayerListGroupStatus(bool status) -{ - if (listGroup == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView listGroup is NULL"); - return; + UIList *PlayersView::GetPlayerList(void) + { + return list; } - UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup(); - if (vew != nullptr) { - vew->SetVisible(!status); + /// @brief 根据传入的status参数来控制歌曲列表组的显示与隐藏。 + /// @param status + void PlayersView::SetPlayerListGroupStatus(bool status) + { + if (listGroup == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView listGroup is NULL"); + return; + } + UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup(); + if (vew != nullptr) + { + vew->SetVisible(!status); + } + /*增加训练卡片控制*/ + UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad(); + if (cardview != nullptr) + { + cardview->SetVisible(!status); + } + listGroup->SetVisible(status); + return; } - listGroup->SetVisible(status); - return; -} -/// @brief 根据传入的status参数来控制删除歌曲视图的显示与隐藏。 -/// @param status -void PlayersView::SetPlayerDelSongViewStatus(bool status) -{ - if (DelSongView == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView DelSongView is NULL"); + /// @brief 根据传入的status参数来控制删除歌曲视图的显示与隐藏。 + /// @param status + void PlayersView::SetPlayerDelSongViewStatus(bool status) + { + if (DelSongView == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView DelSongView is NULL"); + return; + } + UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup(); + if (vew != nullptr) + { + vew->SetVisible(!status); + } + /*增加训练卡片控制*/ + UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad(); + if (cardview != nullptr) + { + cardview->SetVisible(!status); + } + DelSongView->SetVisible(status); + RootView::GetInstance()->Invalidate(); return; } - UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup(); - if (vew != nullptr) { - vew->SetVisible(!status); - } - DelSongView->SetVisible(status); - RootView::GetInstance()->Invalidate(); - return; - -} - -void PlayersView::SetPlayerCtrVolume(float leftVolume, float rightVolume) -{ - PlayersModel::GetInstance()->GetPlayerCtr()->SetVolume(leftVolume, rightVolume); -} - -void PlayersView::TearDownView() -{ - delete prelistener; - prelistener = nullptr; - delete playerModelButton; - playerModelButton = nullptr; - delete modellistener; - modellistener = nullptr; - delete soundButton; - soundButton = nullptr; - delete optionslistener; - optionslistener = nullptr; - delete optionsButton; - optionsButton = nullptr; - delete pullButton; - pullButton = nullptr; - delete listGroup; - listGroup = nullptr; -} -PlayersView* PlayersView::GetInstance(void) -{ - return g_pPlayersView; -} - -// 显示音乐列表 -void PlayersView::ShowUpListView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowUpListView"); - listGroup = new UIScrollView(); - if (listGroup == nullptr) { - return; + void PlayersView::SetPlayerCtrVolume(float leftVolume, float rightVolume) + { + PlayersModel::GetInstance()->GetPlayerCtr()->SetVolume(leftVolume, rightVolume); } - listGroup->SetPosition(0, 0); - listGroup->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION); - listGroup->SetScrollBlankSize(20); - listGroup->SetReboundSize(50); - listGroup->SetDirection(1); - musicListTitle = new UILabel(); - if(musicListTitle ==nullptr) + void PlayersView::TearDownView() { - return; + delete prelistener; + prelistener = nullptr; + delete playerModelButton; + playerModelButton = nullptr; + delete modellistener; + modellistener = nullptr; + delete soundButton; + soundButton = nullptr; + delete optionslistener; + optionslistener = nullptr; + delete optionsButton; + optionsButton = nullptr; + delete pullButton; + pullButton = nullptr; + delete listGroup; + listGroup = nullptr; + } + + PlayersView *PlayersView::GetInstance(void) + { + return g_pPlayersView; } - musicListTitle->SetPosition(173, 52,120,35); - musicListTitle->SetStyle(STYLE_TEXT_FONT, 30); - musicListTitle->SetStyle(STYLE_LINE_HEIGHT, 36); - musicListTitle->SetText("音乐列表"); - musicListTitle->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); - musicListTitle->SetTextColor(Color::GetColorFromRGBA(0xff, 0xf3, 0xff, 0xff)); - musicListTitle->SetRollSpeed(0); - musicListTitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - listGroup->Add(musicListTitle); - - // list type - if (adapterText == nullptr) { - adapterText = new PlayersCaseListAdapter(); - if (adapterText == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "adapterText new fail"); + + // 显示音乐列表 + void PlayersView::ShowUpListView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowUpListView"); + listGroup = new UIScrollView(); + if (listGroup == nullptr) + { return; } - } - if (list == nullptr) { - list = new UIList(UIList::VERTICAL); - if (list == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "list new fail"); + listGroup->SetPosition(0, 0); + listGroup->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION); + listGroup->SetScrollBlankSize(20); + listGroup->SetReboundSize(50); + listGroup->SetDirection(1); + + musicListTitle = new UILabel(); + if (musicListTitle == nullptr) + { return; } - list->SetPosition(67, 138, 332, 500); - list->SetStartIndex(0); // 0 : list start index - list->SetAdapter(adapterText); - } - listGroup->Add(list); - RootView::GetInstance()->Add(listGroup); - UIView::OnDragListener *dragListener = (UIView::OnDragListener*)OHOS::PlayerOnDragListener::GetInstance(); - if (dragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::OnDragListener fail"); - return; + musicListTitle->SetPosition(173, 52, 120, 35); + musicListTitle->SetStyle(STYLE_TEXT_FONT, 30); + musicListTitle->SetStyle(STYLE_LINE_HEIGHT, 36); + musicListTitle->SetText("音乐列表"); + musicListTitle->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + musicListTitle->SetTextColor(Color::GetColorFromRGBA(0xff, 0xf3, 0xff, 0xff)); + musicListTitle->SetRollSpeed(0); + musicListTitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + listGroup->Add(musicListTitle); + + // list type + if (adapterText == nullptr) + { + adapterText = new PlayersCaseListAdapter(); + if (adapterText == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "adapterText new fail"); + return; + } + } + if (list == nullptr) + { + list = new UIList(UIList::VERTICAL); + if (list == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "list new fail"); + return; + } + list->SetPosition(67, 138, 332, 500); + list->SetStartIndex(0); // 0 : list start index + list->SetAdapter(adapterText); + } + listGroup->Add(list); + RootView::GetInstance()->Add(listGroup); + UIView::OnDragListener *dragListener = (UIView::OnDragListener *)OHOS::PlayerOnDragListener::GetInstance(); + if (dragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::OnDragListener fail"); + return; + } + listGroup->SetDraggable(true); + listGroup->SetTouchable(true); + listGroup->SetOnDragListener(dragListener); + listGroup->SetVisible(false); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowUpListView end"); } - listGroup->SetDraggable(true); - listGroup->SetTouchable(true); - listGroup->SetOnDragListener(dragListener); - listGroup->SetVisible(false); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowUpListView end"); -} -/// @brief 创建删除歌曲视图 -/// @param songName -void PlayersView::ShowUpDelSongView() -{ - if(p_PlayerListDelSongView == nullptr) + /// @brief 创建删除歌曲视图 + /// @param songName + void PlayersView::ShowUpDelSongView() { - p_PlayerListDelSongView = new PlayerListDelSongView(); + if (p_PlayerListDelSongView == nullptr) + { + p_PlayerListDelSongView = new PlayerListDelSongView(); + } + DelSongView = p_PlayerListDelSongView->InitDelSongView(); + RootView::GetInstance()->Add(DelSongView); + DelSongView->SetTouchable(true); + DelSongView->SetVisible(false); } - DelSongView = p_PlayerListDelSongView->InitDelSongView(); - RootView::GetInstance()->Add(DelSongView); - DelSongView->SetTouchable(true); - DelSongView->SetVisible(false); -} -//设置按钮的位置和监听 -void PlayersView::SetUpButton(UIButton *btn, const Point& point, - int16_t width, int16_t height, UIView::OnClickListener *listener) -{ - if (btn == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::SetUpButton nullptr"); - return; - } - Add(btn); - btn->SetPosition(point.x, point.y, width, height); - btn->SetOnClickListener(listener); -} -//复选框:选中播放未选中暂停 -int PlayersView::ShowUpCheckBoxButton() -{ - ImageInfo *ImagePlay; - ImageInfo *ImagerPause; - if (playerButton == nullptr) { - playerButton = new UICheckBox(); - } - if (soundButton == nullptr) { - soundButton = new UIImageView(); - } - if ((playerButton == nullptr) || (soundButton == nullptr)) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new fail"); - return OHOS_FAILURE; - } - playerlistener = new ButtonOnClickListener(reinterpret_cast(playerButton)); - if (playerlistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerlistener new fail"); - return OHOS_FAILURE; - } - playerButton->SetPosition(195, 195, 80, 80); // 140:x 139:y 172:width 172:height - playerButton->SetOnClickListener(playerlistener); - ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES); //播放图片 - ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES);//暂停图片 - playerButton->SetImages(ImagePlay, ImagerPause); - Add(playerButton); - - soundlistener = new ButtonOnClickListener(reinterpret_cast(soundButton)); - if (soundlistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "soundlistener new fail"); - return OHOS_FAILURE; - } - soundButton->SetTouchable(true); - soundButton->SetPosition(321, 321, 60, 60); - soundButton->SetOnClickListener(soundlistener); - if (LoadPlayerImage(soundButton, PLAYER_MUSIC_VOICE) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerModelButton LoadPlayerImage fail"); - return false; + // 设置按钮的位置和监听 + void PlayersView::SetUpButton(UIButton *btn, const Point &point, + int16_t width, int16_t height, UIView::OnClickListener *listener) + { + if (btn == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::SetUpButton nullptr"); + return; + } + Add(btn); + btn->SetPosition(point.x, point.y, width, height); + btn->SetOnClickListener(listener); } - Add(soundButton); - return OHOS_SUCCESS; -} -//显示按钮:下一首,上一首,播放模式 -int PlayersView::ShowUpButton() -{ - struct Point pointBtn; - ImageInfo *image; - pointBtn.x = 366; // 366:x - pointBtn.y = 213; // 213:y - nextlistener = new ButtonOnClickListener(reinterpret_cast(nextButton)); - if (nextlistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "nextlistener new fail"); - return OHOS_FAILURE; - } - SetUpButton(nextButton, pointBtn, 60, 60, nextlistener); // 93:width 116:height - image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_NEXT, PLAYER_IAMGES); - nextButton->SetImageSrc(image, image); - nextButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); - nextButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - nextButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); - nextButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); - nextButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - pointBtn.x = 60; // 60:x - pointBtn.y = 213; // 213:y - prelistener = new ButtonOnClickListener(reinterpret_cast(preButton)); - if (prelistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "prelistener new fail"); - return OHOS_FAILURE; - } - SetUpButton(preButton, pointBtn, 60, 60, prelistener); // 86:width 116:height - image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_PROVE, PLAYER_IAMGES); - preButton->SetImageSrc(image, image); - preButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); - preButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - preButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); - preButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); - preButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - pointBtn.x = 105; // 105:x - pointBtn.y = 321; // 321:y - modellistener = new ButtonOnClickListener(reinterpret_cast(playerModelButton)); - if (modellistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "modellistener new fail"); - return OHOS_FAILURE; - } - playerModelButton->SetTouchable(true); - playerModelButton->SetPosition(pointBtn.x, pointBtn.y, 60, 60); - playerModelButton->SetOnClickListener(modellistener); - if (ShowUpPlayerMode() == false) { - return OHOS_FAILURE; - } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "playerModel %d", PlayersModel::GetInstance()->GetPlayerModel()); - Add(playerModelButton); - - return OHOS_SUCCESS; -} -//显示音乐播放模式:LOOP 循环播放 SEQUENCE 循序播放 REPEATS 单曲循环 RANDOM 随机播放 -bool PlayersView::ShowUpPlayerMode() -{ - if (PlayersModel::GetInstance()->GetPlayerModel() == LOOP) { - if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_LOOP) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYER_PLAYERSMODEL_LOOP fail"); - return false; + // 复选框:选中播放未选中暂停 + int PlayersView::ShowUpCheckBoxButton() + { + ImageInfo *ImagePlay; + ImageInfo *ImagerPause; + if (playerButton == nullptr) + { + playerButton = new UICheckBox(); } - } else if (PlayersModel::GetInstance()->GetPlayerModel() == SEQUENCE) { - if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_SEQUENCE) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYERSMODEL_SEQUENCE fail"); - return false; + if (soundButton == nullptr) + { + soundButton = new UIImageView(); } - } else if (PlayersModel::GetInstance()->GetPlayerModel() == REPEATS) { - if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_REPEATS) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYERSMODEL_REPEATS fail"); - return false; + if ((playerButton == nullptr) || (soundButton == nullptr)) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new fail"); + return OHOS_FAILURE; + } + playerlistener = new ButtonOnClickListener(reinterpret_cast(playerButton)); + if (playerlistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerlistener new fail"); + return OHOS_FAILURE; } - } else if (PlayersModel::GetInstance()->GetPlayerModel() == RANDOM) { - if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_RANDOM) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYERSMODEL_RANDOM fail"); + playerButton->SetPosition(195, 195, 80, 80); // 140:x 139:y 172:width 172:height + playerButton->SetOnClickListener(playerlistener); + ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES); // 播放图片 + ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片 + playerButton->SetImages(ImagePlay, ImagerPause); + Add(playerButton); + + soundlistener = new ButtonOnClickListener(reinterpret_cast(soundButton)); + if (soundlistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "soundlistener new fail"); + return OHOS_FAILURE; + } + soundButton->SetTouchable(true); + soundButton->SetPosition(321, 321, 60, 60); + soundButton->SetOnClickListener(soundlistener); + if (LoadPlayerImage(soundButton, PLAYER_MUSIC_VOICE) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerModelButton LoadPlayerImage fail"); return false; } + Add(soundButton); + return OHOS_SUCCESS; } - return true; -} -//显示按钮视图 -int PlayersView::ShowUpButtonView() -{ - int ret; - ret = ShowUpCheckBoxButton(); - if (ret == OHOS_FAILURE) { - return OHOS_FAILURE; - } - if (nextButton == nullptr) { - nextButton = new UIButton(); - } - if (preButton == nullptr) { - preButton = new UIButton(); - } - if (optionsButton == nullptr) { - optionsButton = new UIButton(); - } - if (music_list_button == nullptr) { - music_list_button = new UIButton(); - } - if (pullButton == nullptr) { - pullButton = new UIButton(); - } - if (playerModelButton == nullptr) { - playerModelButton = new UIImageView(); - } - if ((nextButton == nullptr) || (preButton == nullptr) || (playerModelButton == nullptr) || (optionsButton == nullptr) || - (pullButton == nullptr)) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UIButton new fail"); - return OHOS_FAILURE; - } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowUpButtonView"); + // 显示按钮:下一首,上一首,播放模式 + int PlayersView::ShowUpButton() + { + struct Point pointBtn; + ImageInfo *image; + pointBtn.x = 366; // 366:x + pointBtn.y = 213; // 213:y + nextlistener = new ButtonOnClickListener(reinterpret_cast(nextButton)); + if (nextlistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "nextlistener new fail"); + return OHOS_FAILURE; + } + SetUpButton(nextButton, pointBtn, 60, 60, nextlistener); // 93:width 116:height + image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_NEXT, PLAYER_IAMGES); + nextButton->SetImageSrc(image, image); + nextButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + nextButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + nextButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); + nextButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + nextButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + pointBtn.x = 60; // 60:x + pointBtn.y = 213; // 213:y + prelistener = new ButtonOnClickListener(reinterpret_cast(preButton)); + if (prelistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "prelistener new fail"); + return OHOS_FAILURE; + } + SetUpButton(preButton, pointBtn, 60, 60, prelistener); // 86:width 116:height + image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_PROVE, PLAYER_IAMGES); + preButton->SetImageSrc(image, image); + preButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + preButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + preButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); + preButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + preButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + pointBtn.x = 105; // 105:x + pointBtn.y = 321; // 321:y + modellistener = new ButtonOnClickListener(reinterpret_cast(playerModelButton)); + if (modellistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "modellistener new fail"); + return OHOS_FAILURE; + } + playerModelButton->SetTouchable(true); + playerModelButton->SetPosition(pointBtn.x, pointBtn.y, 60, 60); + playerModelButton->SetOnClickListener(modellistener); + if (ShowUpPlayerMode() == false) + { + return OHOS_FAILURE; + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "playerModel %d", PlayersModel::GetInstance()->GetPlayerModel()); + Add(playerModelButton); - ret = ShowUpButton(); - if (ret == OHOS_FAILURE) { - return OHOS_FAILURE; - } - ret = ShowUpButtonOptions(); - if (ret == OHOS_FAILURE) { - return OHOS_FAILURE; - } - ret = ShowUpCircleProgress(); - if (ret == OHOS_FAILURE) { - return OHOS_FAILURE; + return OHOS_SUCCESS; } - ret = ShowUpMusicListbutton(); - if (ret == OHOS_FAILURE) { - return OHOS_FAILURE; + // 显示音乐播放模式:LOOP 循环播放 SEQUENCE 循序播放 REPEATS 单曲循环 RANDOM 随机播放 + bool PlayersView::ShowUpPlayerMode() + { + if (PlayersModel::GetInstance()->GetPlayerModel() == LOOP) + { + if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_LOOP) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYER_PLAYERSMODEL_LOOP fail"); + return false; + } + } + else if (PlayersModel::GetInstance()->GetPlayerModel() == SEQUENCE) + { + if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_SEQUENCE) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYERSMODEL_SEQUENCE fail"); + return false; + } + } + else if (PlayersModel::GetInstance()->GetPlayerModel() == REPEATS) + { + if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_REPEATS) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYERSMODEL_REPEATS fail"); + return false; + } + } + else if (PlayersModel::GetInstance()->GetPlayerModel() == RANDOM) + { + if (LoadPlayerImage(playerModelButton, PLAYER_PLAYERSMODEL_RANDOM) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "load PLAYERSMODEL_RANDOM fail"); + return false; + } + } + return true; } - return OHOS_SUCCESS; -} + // 显示按钮视图 + int PlayersView::ShowUpButtonView() + { + int ret; + ret = ShowUpCheckBoxButton(); + if (ret == OHOS_FAILURE) + { + return OHOS_FAILURE; + } + if (nextButton == nullptr) + { + nextButton = new UIButton(); + } + if (preButton == nullptr) + { + preButton = new UIButton(); + } + if (optionsButton == nullptr) + { + optionsButton = new UIButton(); + } + if (music_list_button == nullptr) + { + music_list_button = new UIButton(); + } + if (pullButton == nullptr) + { + pullButton = new UIButton(); + } + if (playerModelButton == nullptr) + { + playerModelButton = new UIImageView(); + } + if ((nextButton == nullptr) || (preButton == nullptr) || (playerModelButton == nullptr) || (optionsButton == nullptr) || + (pullButton == nullptr)) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UIButton new fail"); + return OHOS_FAILURE; + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowUpButtonView"); -//显示音乐列表按钮 -int PlayersView::ShowUpMusicListbutton() -{ - struct Point pointBtn; - pointBtn.x = 213; - pointBtn.y = 35; - music_list_button_listener = new ButtonOnClickListener(reinterpret_cast(music_list_button)); - if (music_list_button_listener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "music_list_button_listener new fail"); - return OHOS_FAILURE; - } - SetUpButton(music_list_button, pointBtn, 60, 60, music_list_button_listener); // 75:width 76:height - ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_LIST, PLAYER_IAMGES); - music_list_button->SetImageSrc(image, image); - music_list_button->SetViewId("music_list_button"); - music_list_button->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); - music_list_button->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - music_list_button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); - music_list_button->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); - music_list_button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - - return OHOS_SUCCESS; -} -/* - 创建了两个按钮:optionslistener:显示选项按钮,点击后里面有三种模式:1手机音乐,2本地音乐,3蓝牙耳机 - pullButton:上拉按钮上拉后显示歌单 -*/ -int PlayersView::ShowUpButtonOptions() -{ - struct Point pointBtn; - pointBtn.x = 213; - pointBtn.y = 366; - optionslistener = new ButtonOnClickListener(reinterpret_cast(optionsButton)); - if (optionslistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "optionslistener new fail"); - return OHOS_FAILURE; - } - SetUpButton(optionsButton, pointBtn, 60, 60, optionslistener); // 75:width 76:height - ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR, PLAYER_IAMGES); - optionsButton->SetImageSrc(image, image); - optionsButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); - optionsButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - optionsButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); - optionsButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); - optionsButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - - pointBtn.x = 178; // 178:x - pointBtn.y = 394; // 394:y - SetUpButton(pullButton, pointBtn, 95, 48, nullptr); // 95:width 48:height - pullButton->SetImageSrc(PNG_PULLBUTTON_FACE_IMAGE, PNG_PULLBUTTON_FACE_IMAGE); - pullButton->SetVisible(false); - return OHOS_SUCCESS; -} -//显示播放进度条 -int PlayersView::ShowUpCircleProgress() -{ - if (playbackProgress == nullptr) { - playbackProgress = new UICircleProgress(); - if (playbackProgress == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "playbackProgress new fail"); + ret = ShowUpButton(); + if (ret == OHOS_FAILURE) + { + return OHOS_FAILURE; + } + ret = ShowUpButtonOptions(); + if (ret == OHOS_FAILURE) + { return OHOS_FAILURE; } + ret = ShowUpCircleProgress(); + if (ret == OHOS_FAILURE) + { + return OHOS_FAILURE; + } + ret = ShowUpMusicListbutton(); + if (ret == OHOS_FAILURE) + { + return OHOS_FAILURE; + } + return OHOS_SUCCESS; } - playbackProgress->SetPosition(158, 158, 150, 150); - playbackProgress->SetCenterPosition(75, 75); - playbackProgress->SetRange(PLAY_PROGRESS_MAX, PLAY_PROGRESS_MIN); - playbackProgress->SetRadius(70); - playbackProgress->SetStartAngle(0); - playbackProgress->SetEndAngle(360); // 360: end angle - playbackProgress->SetValue(0); - playbackProgress->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - playbackProgress->SetBackgroundStyle(STYLE_BACKGROUND_COLOR, 0xff000000); - playbackProgress->SetBackgroundStyle(STYLE_LINE_COLOR, 0xfff61313); - playbackProgress->SetBackgroundStyle(STYLE_LINE_WIDTH, 0); - playbackProgress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, 0xfffbfbfb); - playbackProgress->SetForegroundStyle(STYLE_BORDER_COLOR, 0xffffffff); - playbackProgress->SetForegroundStyle(STYLE_LINE_COLOR, 0xffffffff); - playbackProgress->SetForegroundStyle(STYLE_LINE_WIDTH, 6); // 6:width - Add(playbackProgress); - return OHOS_SUCCESS; -} -//创建跳转视图 -void PlayersView::CreateJumpView(void) -{ - if (jumpView == nullptr) { - jumpView = new JumpView(); - if (jumpView == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "jumpView new fail"); - return; + + // 显示音乐列表按钮 + int PlayersView::ShowUpMusicListbutton() + { + struct Point pointBtn; + pointBtn.x = 213; + pointBtn.y = 35; + music_list_button_listener = new ButtonOnClickListener(reinterpret_cast(music_list_button)); + if (music_list_button_listener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "music_list_button_listener new fail"); + return OHOS_FAILURE; + } + SetUpButton(music_list_button, pointBtn, 60, 60, music_list_button_listener); // 75:width 76:height + ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_LIST, PLAYER_IAMGES); + music_list_button->SetImageSrc(image, image); + music_list_button->SetViewId("music_list_button"); + music_list_button->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + music_list_button->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + music_list_button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); + music_list_button->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + music_list_button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + + return OHOS_SUCCESS; + } + /* + 创建了两个按钮:optionslistener:显示选项按钮,点击后里面有三种模式:1手机音乐,2本地音乐,3蓝牙耳机 + pullButton:上拉按钮上拉后显示歌单 + */ + int PlayersView::ShowUpButtonOptions() + { + struct Point pointBtn; + pointBtn.x = 213; + pointBtn.y = 366; + optionslistener = new ButtonOnClickListener(reinterpret_cast(optionsButton)); + if (optionslistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "optionslistener new fail"); + return OHOS_FAILURE; + } + SetUpButton(optionsButton, pointBtn, 60, 60, optionslistener); // 75:width 76:height + ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR, PLAYER_IAMGES); + optionsButton->SetImageSrc(image, image); + optionsButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + optionsButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + optionsButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); + optionsButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + optionsButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + + pointBtn.x = 178; // 178:x + pointBtn.y = 394; // 394:y + SetUpButton(pullButton, pointBtn, 95, 48, nullptr); // 95:width 48:height + pullButton->SetImageSrc(PNG_PULLBUTTON_FACE_IMAGE, PNG_PULLBUTTON_FACE_IMAGE); + pullButton->SetVisible(false); + return OHOS_SUCCESS; + } + // 显示播放进度条 + int PlayersView::ShowUpCircleProgress() + { + if (playbackProgress == nullptr) + { + playbackProgress = new UICircleProgress(); + if (playbackProgress == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "playbackProgress new fail"); + return OHOS_FAILURE; + } + } + playbackProgress->SetPosition(158, 158, 150, 150); + playbackProgress->SetCenterPosition(75, 75); + playbackProgress->SetRange(PLAY_PROGRESS_MAX, PLAY_PROGRESS_MIN); + playbackProgress->SetRadius(70); + playbackProgress->SetStartAngle(0); + playbackProgress->SetEndAngle(360); // 360: end angle + playbackProgress->SetValue(0); + playbackProgress->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + playbackProgress->SetBackgroundStyle(STYLE_BACKGROUND_COLOR, 0xff000000); + playbackProgress->SetBackgroundStyle(STYLE_LINE_COLOR, 0xfff61313); + playbackProgress->SetBackgroundStyle(STYLE_LINE_WIDTH, 0); + playbackProgress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, 0xfffbfbfb); + playbackProgress->SetForegroundStyle(STYLE_BORDER_COLOR, 0xffffffff); + playbackProgress->SetForegroundStyle(STYLE_LINE_COLOR, 0xffffffff); + playbackProgress->SetForegroundStyle(STYLE_LINE_WIDTH, 6); // 6:width + Add(playbackProgress); + return OHOS_SUCCESS; + } + // 创建跳转视图 + void PlayersView::CreateJumpView(void) + { + if (jumpView == nullptr) + { + jumpView = new JumpView(); + if (jumpView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "jumpView new fail"); + return; + } } } -} -//创建一个音乐播放器的逻辑层 -void PlayersView::CreatePlayersPresenter(void) -{ - if (playersPresenter == nullptr) { - playersPresenter = new PlayersPresenter(); - if (playersPresenter == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersPresenter new fail"); - return; + // 创建一个音乐播放器的逻辑层 + void PlayersView::CreatePlayersPresenter(void) + { + if (playersPresenter == nullptr) + { + playersPresenter = new PlayersPresenter(); + if (playersPresenter == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersPresenter new fail"); + return; + } } } -} -//创建一个音乐播放器的拖拽监听 -void PlayersView::CreatePlayerOnDragListener(void) -{ - if (playerOnDragListener == nullptr) { - playerOnDragListener = new PlayerOnDragListener(); - if (playerOnDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerOnDragListener new fail"); - return; + // 创建一个音乐播放器的拖拽监听 + void PlayersView::CreatePlayerOnDragListener(void) + { + if (playerOnDragListener == nullptr) + { + playerOnDragListener = new PlayerOnDragListener(); + if (playerOnDragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerOnDragListener new fail"); + return; + } } } -} -//初始化背景图片 -bool PlayersView::InitBackGround(void) -{ - if (backGround == nullptr) { - backGround = new UIImageView(); - if (backGround == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround new fail"); + // 初始化背景图片 + bool PlayersView::InitBackGround(void) + { + if (backGround == nullptr) + { + backGround = new UIImageView(); + if (backGround == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround new fail"); + return false; + } + } + backGround->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + if (LoadPlayerImage(backGround, PLAYER_BACKGROUND) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround LoadPlayerImage fail"); return false; } - } - backGround->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - if (LoadPlayerImage(backGround, PLAYER_BACKGROUND) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround LoadPlayerImage fail"); - return false; - } - /* -------------------------------------------------------------------------- */ - if(elipse == nullptr){ - elipse = new UIImageView(); - if(elipse ==nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "elipse new fail"); + /* -------------------------------------------------------------------------- */ + if (elipse == nullptr) + { + elipse = new UIImageView(); + if (elipse == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "elipse new fail"); + return false; + } + } + elipse->SetPosition(173, 173, 120, 120); + if (LoadPlayerImage(elipse, PLAYER_ELLIPSE) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "elipse LoadPlayerImage fail"); return false; } + Add(backGround); + Add(elipse); + return true; } - elipse->SetPosition(173,173,120,120); - if (LoadPlayerImage(elipse, PLAYER_ELLIPSE) == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "elipse LoadPlayerImage fail"); - return false; - } - Add(backGround); - Add(elipse); - return true; -} -//创建音乐名,作者名 -void PlayersView::CreatePlayerMusicName() -{ - if (titleLabel == nullptr) { - titleLabel = new UILabel(); - if (titleLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel new fail"); - return; + // 创建音乐名,作者名 + void PlayersView::CreatePlayerMusicName() + { + if (titleLabel == nullptr) + { + titleLabel = new UILabel(); + if (titleLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel new fail"); + return; + } } - } - titleLabel->SetPosition(127, 35, 200, 53); // 127:x 35:y 200:width 53:height - titleLabel->SetText("Music Name"); - titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_FORTY_SIZE); - Add(titleLabel); + titleLabel->SetPosition(127, 35, 200, 53); // 127:x 35:y 200:width 53:height + titleLabel->SetText("Music Name"); + titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_FORTY_SIZE); + Add(titleLabel); - if (subTitleLabel == nullptr) { - subTitleLabel = new UILabel(); - if (subTitleLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "subTitleLabel new fail"); - return; + if (subTitleLabel == nullptr) + { + subTitleLabel = new UILabel(); + if (subTitleLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "subTitleLabel new fail"); + return; + } } + subTitleLabel->SetPosition(77, 92, 300, 38); // 77:x 92:y 300:width 38:height + subTitleLabel->SetText("Musical Authors"); + subTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // 30:font data + subTitleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); + Add(subTitleLabel); + return; + } + // 拖拽监听:从下到上拖拽后显示音乐列表 + bool PlayersView::OnDragEvent(const DragEvent &event) + { + /* 300: y limit of drag start point */ + // if ((event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP) && (event.GetStartPoint().y > 300)) { + // PlayersPresenter::GetInstance()->ShowPlayerListGroup(); + // return true; + // } + return false; } - subTitleLabel->SetPosition(77, 92, 300, 38); // 77:x 92:y 300:width 38:height - subTitleLabel->SetText("Musical Authors"); - subTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // 30:font data - subTitleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); - Add(subTitleLabel); - return; -} -//拖拽监听:从下到上拖拽后显示音乐列表 -bool PlayersView::OnDragEvent(const DragEvent& event) -{ - /* 300: y limit of drag start point */ - // if ((event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP) && (event.GetStartPoint().y > 300)) { - // PlayersPresenter::GetInstance()->ShowPlayerListGroup(); - // return true; - // } - return false; -} -/// @brief 创建音乐来源标签 -/// @param -void PlayersView::CreateMusicSourceLabel(void) -{ - if (MusciSourceLabel == nullptr) { - MusciSourceLabel = new UILabel(); - if (MusciSourceLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusciSourceLabel new fail"); - return; + /// @brief 创建音乐来源标签 + /// @param + void PlayersView::CreateMusicSourceLabel(void) + { + if (MusciSourceLabel == nullptr) + { + MusciSourceLabel = new UILabel(); + if (MusciSourceLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusciSourceLabel new fail"); + return; + } } + MusciSourceLabel->SetPosition(163, 90, 140, 41); + MusciSourceLabel->SetText("本地音乐"); + MusciSourceLabel->SetStyle(STYLE_TEXT_FONT, 35); + MusciSourceLabel->SetStyle(STYLE_LINE_HEIGHT, 41); + MusciSourceLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + MusciSourceLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + MusciSourceLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35); + Add(MusciSourceLabel); + } + + /// @brief 设置音乐来源标签内容 + /// @param text 文本内容 + void PlayersView::MusicSourceLabelSetText(const char *text) + { + MusciSourceLabel->SetText(text); + MusciSourceLabel->Invalidate(); } - MusciSourceLabel->SetPosition(163, 90, 140, 41); - MusciSourceLabel->SetText("本地音乐"); - MusciSourceLabel->SetStyle(STYLE_TEXT_FONT, 35); - MusciSourceLabel->SetStyle(STYLE_LINE_HEIGHT, 41); - MusciSourceLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - MusciSourceLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - MusciSourceLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35); - Add(MusciSourceLabel); -} -/// @brief 设置音乐来源标签内容 -/// @param text 文本内容 -void PlayersView::MusicSourceLabelSetText(const char *text) -{ - MusciSourceLabel->SetText(text); - MusciSourceLabel->Invalidate(); -} - -/// @brief 创建手机音乐连接状态标签 -/// @param -void PlayersView::CreatePhoneMusicConnectStatusLabel(void) -{ - if (PhoneMusicConnectStatusLabel == nullptr) { - PhoneMusicConnectStatusLabel = new UILabel(); - if (PhoneMusicConnectStatusLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneMusicConnectStatusLabel new fail"); - return; + /// @brief 创建手机音乐连接状态标签 + /// @param + void PlayersView::CreatePhoneMusicConnectStatusLabel(void) + { + if (PhoneMusicConnectStatusLabel == nullptr) + { + PhoneMusicConnectStatusLabel = new UILabel(); + if (PhoneMusicConnectStatusLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneMusicConnectStatusLabel new fail"); + return; + } } + PhoneMusicConnectStatusLabel->SetPosition(188, 40, 90, 35); + PhoneMusicConnectStatusLabel->SetText("未连接"); + PhoneMusicConnectStatusLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); + PhoneMusicConnectStatusLabel->SetStyle(STYLE_TEXT_FONT, 30); + PhoneMusicConnectStatusLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + PhoneMusicConnectStatusLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + PhoneMusicConnectStatusLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + PhoneMusicConnectStatusLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + PhoneMusicConnectStatusLabel->SetVisible(false); + Add(PhoneMusicConnectStatusLabel); + } + + /// @brief 设置手机音乐连接状态标签内容 + /// @param text 文本内容 + void PlayersView::PhoneMusicConnectStatusLabelSetText(const char *text) + { + PhoneMusicConnectStatusLabel->SetText(text); + PhoneMusicConnectStatusLabel->Invalidate(); } - PhoneMusicConnectStatusLabel->SetPosition(188, 40, 90, 35); - PhoneMusicConnectStatusLabel->SetText("未连接"); - PhoneMusicConnectStatusLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); - PhoneMusicConnectStatusLabel->SetStyle(STYLE_TEXT_FONT, 30); - PhoneMusicConnectStatusLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - PhoneMusicConnectStatusLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - PhoneMusicConnectStatusLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - PhoneMusicConnectStatusLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - PhoneMusicConnectStatusLabel->SetVisible(false); - Add(PhoneMusicConnectStatusLabel); -} - -/// @brief 设置手机音乐连接状态标签内容 -/// @param text 文本内容 -void PlayersView::PhoneMusicConnectStatusLabelSetText(const char *text) -{ - PhoneMusicConnectStatusLabel->SetText(text); - PhoneMusicConnectStatusLabel->Invalidate(); -} - -/// @brief 设置手机连接状态标签是否可见 -/// @param status -void PlayersView::PhoneMusicConnectStatusLabelIsSetVisible(bool status) -{ - PhoneMusicConnectStatusLabel->SetVisible(status); -} - -/// @brief 设置音乐列表按钮是否可见 -/// @param status -void PlayersView::MusicListButtonIsSetVisible(bool status) -{ - music_list_button->SetVisible(status); -} -/// @brief 设置选项按钮的图片样式:点击该按钮后进入音乐来源视图,点击里面的按钮,改选项按钮会被替换相应图片 -/// @param image 图片信息 -void PlayersView::OptionsButtonSetImageStyle(ImageInfo *image) -{ - optionsButton->SetImageSrc(image, image); - optionsButton->Invalidate(); -} -//初始化音乐播放器主视图 -bool PlayersView::InitView(void) -{ - int ret; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " PlayersView InitView"); + /// @brief 设置手机连接状态标签是否可见 + /// @param status + void PlayersView::PhoneMusicConnectStatusLabelIsSetVisible(bool status) + { + PhoneMusicConnectStatusLabel->SetVisible(status); + } - if (InitBackGround() == false) { - return false; + /// @brief 设置音乐列表按钮是否可见 + /// @param status + void PlayersView::MusicListButtonIsSetVisible(bool status) + { + music_list_button->SetVisible(status); } - //CreatePlayerMusicName(); - CreatePhoneMusicConnectStatusLabel(); - CreateMusicSourceLabel(); - // changeView - CreateJumpView(); - // OnClick - CreatePlayersPresenter(); - // OnDrag - CreatePlayerOnDragListener(); - // 按键设置 - ret = ShowUpButtonView(); - if (ret == OHOS_FAILURE) { - return false; + /// @brief 设置选项按钮的图片样式:点击该按钮后进入音乐来源视图,点击里面的按钮,改选项按钮会被替换相应图片 + /// @param image 图片信息 + void PlayersView::OptionsButtonSetImageStyle(ImageInfo *image) + { + optionsButton->SetImageSrc(image, image); + optionsButton->Invalidate(); } - // 需要一个模拟信息,假装发生了按键点击,开始播放音乐 - // 调用 OnClick 回调函数来处理点击事件 - //playerButton.OnClick(,); - // 遍历文件名到list链表 - PlayersListGroup::GetInstance()->SetUpListCase(); - PlayersModel::GetInstance()->PlayerInit(); - ShowUpListView(); - ShowUpDelSongView(); - SetTouchable(true); - SetDraggable(true); - return true; -} + // 初始化音乐播放器主视图 + bool PlayersView::InitView(void) + { + int ret; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " PlayersView InitView"); -void PlayersView::PreLoad(void) -{ - if (!viewiInitStatus) { - if (InitView()) { - viewiInitStatus = true; + if (InitBackGround() == false) + { + return false; + } + + // CreatePlayerMusicName(); + CreatePhoneMusicConnectStatusLabel(); + CreateMusicSourceLabel(); + // changeView + CreateJumpView(); + // OnClick + CreatePlayersPresenter(); + // OnDrag + CreatePlayerOnDragListener(); + // 按键设置 + ret = ShowUpButtonView(); + if (ret == OHOS_FAILURE) + { + return false; + } + // 需要一个模拟信息,假装发生了按键点击,开始播放音乐 + // 调用 OnClick 回调函数来处理点击事件 + // playerButton.OnClick(,); + // 遍历文件名到list链表 + PlayersListGroup::GetInstance()->SetUpListCase(); + PlayersModel::GetInstance()->PlayerInit(); + ShowUpListView(); + ShowUpDelSongView(); + SetTouchable(true); + SetDraggable(true); + return true; + } + + void PlayersView::PreLoad(void) + { + if (!viewiInitStatus) + { + if (InitView()) + { + viewiInitStatus = true; + } } } -} -void PlayersView::UnLoad(void) -{ - // Players's usage scenes is complicated, so we do not release it's resources inner slice. -} -//加载音乐图片 -bool PlayersView::LoadPlayerImage(UIImageView *view, uint32_t resId) -{ - std::string file = PLAYER_IAMGES; - ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file); - if (image == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::LoadPlayerImage %x fail", resId); - return false; + void PlayersView::UnLoad(void) + { + // Players's usage scenes is complicated, so we do not release it's resources inner slice. + } + // 加载音乐图片 + bool PlayersView::LoadPlayerImage(UIImageView *view, uint32_t resId) + { + std::string file = PLAYER_IAMGES; + ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file); + if (image == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::LoadPlayerImage %x fail", resId); + return false; + } + view->SetSrc(image); + return true; } - view->SetSrc(image); - return true; -} } 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 4bf5d9cc9..3edcf98f9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -92,6 +92,7 @@ namespace OHOS static constexpr const char *SPORT_STOP_IMAGE = MODULES "/Sport_stop.bin"; static constexpr const char *SPORT_STRENGTH_IMAGE = MODULES "/Sport_strength.bin"; static constexpr const char *STEP_30_IMAGE = MODULES "/Step_30.bin"; + static constexpr const char *SPORT_HEARTRATE_IMAGE = MODULES "/sport_heartrate.bin"; static constexpr const char *TIME_IMAGE = MODULES "/Time.bin"; static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin"; static constexpr const char *WARNING_IMAGE = MODULES "/Warning.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 5e8b65ff1..3b8814427 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -193,6 +193,8 @@ namespace OHOS void AnalysisData(cywee_activity_result_t *cyweeInfo); /*获取训练数据*/ SportData *GetSportdata(); + /*获取运动卡路里*/ + int GetCal(); private: TraingModel(const TraingModel &) = delete; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 13e680e26..dadbdcac9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -269,7 +269,7 @@ namespace OHOS label->SetFont(fontName, fontSize); // 设置标签的文本和其他属性 label->SetText(text); - label->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + label->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetRollSpeed(0); // 设置标签可见 @@ -315,7 +315,7 @@ namespace OHOS label->SetTextId(id); // label->SetFontId(); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + label->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); label->SetRollSpeed(100); // 设置标签可见 label->SetVisible(true); @@ -483,12 +483,17 @@ namespace OHOS break; } } + /*获取数据*/ SportData *TraingModel::GetSportdata() { return sportdata; } - - /* -------------------------------------------------------------------------- */ + /*获取训练卡路里*/ + int TraingModel::GetCal() + { + return sportdata->calories; + } +/* -------------------------------------------------------------------------- */ #if TIMER /* 时间显示 */ std::string TraingModel::DisplayMotionDuration() diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h index aac83f943..3ceee1fb6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h @@ -34,6 +34,9 @@ #include "alipay/include/AlipayModel.h" namespace OHOS { +#define BUTTONEXIT "button_exit" +#define BUTTONBACK "button_back" + enum Control_Card { CONTROL = 0, @@ -45,6 +48,7 @@ namespace OHOS class TrainingControlView; class TrainingDataView; class TrainingDetailView; + class PlayersView; class TraingCardView : public View { @@ -68,6 +72,9 @@ namespace OHOS void InitList(); void PreLoad(void); + void SetEndViewStatus(bool status); + void ShowEndView(); + UIView *GetTraingCrad(); int GetCurrentPage(); private: @@ -76,13 +83,19 @@ namespace OHOS TraingCardView &operator=(TraingCardView &&) = delete; UICrossView *swipe_ = nullptr; - - TrainingControlView *ControlView{nullptr}; - TrainingDataView *DataVIew{nullptr}; - TrainingDetailView *DetailView{nullptr}; - PlayersView *MusicView{nullptr}; + UIScrollView *endView{nullptr}; + TrainingControlView *ControlView{nullptr}; // 控制卡片 + TrainingDataView *DataVIew{nullptr}; // 数据卡片 + TrainingDetailView *DetailView{nullptr}; // 详细数据卡片 + PlayersView *MusicView{nullptr}; // 音乐卡片 + UILabelExt *endtitle{nullptr}; // 结束弹窗title + UILabelExt *notelabel{nullptr}; // 提醒label + UILabelExt *endnotelabel{nullptr}; + UIButton *exit{nullptr}; // 退出按键 + UIButton *back{nullptr}; // 返回按键 bool viewiInitStatus{false}; + bool momentumFlag{false}; }; } // namespace OHOS #endif // TraingCard_PRESENTER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h index 7fd16b2a0..943f5cced 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h @@ -58,7 +58,7 @@ namespace OHOS UILabelExt *strengthlabel = nullptr; // 运动强度 UIImageView *image_progress = nullptr; - UIImageView *image_arrows = nullptr; + UIImageView *image_heart = nullptr; UIImageView *image_lowIntensity = nullptr; // 低等强度 UIImageView *image_mediumIntensity = nullptr; // 中等强度 UIImageView *image_highIntensity = nullptr; // 高等强度 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingEndNoteView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingEndNoteView.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingEndView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingEndView.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index 7358ad88e..53fe36880 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -106,6 +106,7 @@ namespace OHOS } /* --------------------------------- cywee库操作 -------------------------------- */ + /*开启cywee*/ bool TraingCardPresenter::OpenSensor(ExerciseClass type) { // 根据不同的运动项目进行不同的运动 @@ -114,22 +115,22 @@ namespace OHOS switch (type) { case ExerciseClass::NORMAL: - do_cywee_service_check_msg(SPORT_ACTIVE_MODE_NORMAL); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE); break; case ExerciseClass::TREADMILL: - do_cywee_service_check_msg(SPORT_ACTIVE_MODE_TREADMILL); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE); break; case ExerciseClass::OUTDOOR: - do_cywee_service_check_msg(SPORT_ACTIVE_MODE_OUTDOOR_RUNNING); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE); break; case ExerciseClass::INDOOR: - do_cywee_service_check_msg(SPORT_ACTIVE_MODE_INDOOR_RUNNING); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE); break; case ExerciseClass::FITNESS_PEDOMETER: - do_cywee_service_check_msg(SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE); break; case ExerciseClass::FREE_TRAINING: - do_cywee_service_check_msg(SPORT_ACTIVE_MODE_FREE_TRAINING); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE); break; default: break; @@ -138,6 +139,7 @@ namespace OHOS return true; } + /*控制cywee*/ bool TraingCardPresenter::ControlSensor(ExerciseState state) { switch (state) @@ -169,23 +171,25 @@ namespace OHOS return; } - double distance_km = sportdata->distance / 1000.0; // 转换为公里 - std::stringstream stream; - stream << std::fixed << std::setprecision(2) << distance_km; - std::string distanceStr = stream.str(); + double distance_km = sportdata->distance / 1000.0; // 转换为公里并保留两位小数 + std::stringstream ss; + ss << std::fixed << std::setprecision(2) << distance_km; + std::string distanceStr = ss.str(); - std::string calorieStr = (sportdata->calories != 0) ? std::to_string(sportdata->calories) : "--"; std::string durationStr = std::to_string(sportdata->duration); std::string stepsStr = (sportdata->steps != 0) ? std::to_string(sportdata->steps) : "--"; + std::string calorieStr = (sportdata->calories != 0) ? std::to_string(sportdata->calories) : "--"; TrainingDetailView::GetInstance()->GetHeartLabel()->SetText("0"); TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str()); TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str()); TrainingDetailView::GetInstance()->GetStepLabel()->SetText(stepsStr.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ControlSensor--%s %s %s!!", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str()); - } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ControlSensor--Calories: %s, Distance: %s, Steps: %s", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str()); + // 释放sportdata内存 + } + /*刷新time和data*/ void TraingCardPresenter::Notify(void) { TrainingDataView::GetInstance()->UpdataTime(); @@ -225,11 +229,24 @@ namespace OHOS return true; } } - // 点击结束按键 + // 点击结束按键,弹窗显示 if (strcmp(view.GetViewId(), BUTTONEND) == 0) { - ControlSensor(ExerciseState::End); + ControlSensor(ExerciseState::Pause); // 弹窗显示是否结束 + TraingCardView::GetInstance()->SetEndViewStatus(true); + } + // 退出按键 + if (strcmp(view.GetViewId(), BUTTONEXIT) == 0) + { + ControlSensor(ExerciseState::End); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGWIN); + } + // 返回按键 + if (strcmp(view.GetViewId(), BUTTONBACK) == 0) + { + ControlSensor(ExerciseState::Continue); + TraingCardView::GetInstance()->SetEndViewStatus(false); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index 4801607f1..fbbdc92ca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -79,13 +79,13 @@ namespace OHOS swipe_->HorAdd(ControlView); swipe_->HorAdd(DataVIew); swipe_->HorAdd(MusicView); + ShowEndView(); // swipe_->HorAdd(DetailView); swipe_->VerAdd(DetailView, UICrossView::VPage::DOWN_PAGE); - swipe_->SetHorCurrentPage(Control_Card::CONTROL); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitPage over"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingCardView::InitPage over"); } /* DeInit:删除组件 */ @@ -121,6 +121,37 @@ namespace OHOS delete MusicView; MusicView = nullptr; } + if (MusicView != nullptr) + { + endView->RemoveAll(); + delete endView; + endView = nullptr; + } + if (endtitle != nullptr) + { + delete endtitle; + endtitle = nullptr; + } + if (notelabel != nullptr) + { + delete notelabel; + notelabel = nullptr; + } + if (endnotelabel != nullptr) + { + delete endnotelabel; + endnotelabel = nullptr; + } + if (exit != nullptr) + { + delete exit; + exit = nullptr; + } + if (back != nullptr) + { + delete back; + back = nullptr; + } } UICardPage *TraingCardView::InitControlPage(void) { @@ -201,7 +232,79 @@ namespace OHOS SetContainerView(swipe_); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "swipe_ new ok"); } + /*结束弹窗界面*/ + void TraingCardView::ShowEndView() + { + momentumFlag = false; // 标志位还原 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowEndView"); + endView = new UIScrollView(); + if (endView == nullptr) + { + return; + } + endView->SetPosition(0, 0); + endView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION); + endView->SetScrollBlankSize(20); + endView->SetReboundSize(50); + endView->SetDirection(1); + // 获取训练卡路里判断运动量 + int caldata = TraingModel::GetInstance()->GetCal(); + if (caldata >= 10) + { + momentumFlag = true; + } + // 初始化Lable + if (momentumFlag) + { + TraingModel::GetInstance()->InitLabel(endtitle, 83, 50, 300, 35, "label1", "结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabel(notelabel, 56, 187, 360, 40, "label2", "是否结束本次运动", DEFAULT_VECTOR_FONT_FILENAME, 26); + } + else + { + TraingModel::GetInstance()->InitLabel(endtitle, 83, 50, 300, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabel(notelabel, 56, 167, 360, 80, "label2", "当前运动量过少,无法记录 是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 26); + } + endView->Add(endtitle); + endView->Add(notelabel); + + TraingModel::GetInstance()->InitButton(exit, 111, 299, 100, 100, BUTTONBACK); + exit->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); + exit->SetImageSrc(NO_IMAGE, NO_IMAGE); + TraingModel::GetInstance()->InitButton(back, 256, 299, 100, 100, BUTTONEXIT); + back->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); + back->SetImageSrc(YES_IMAGE, YES_IMAGE); + endView->Add(exit); + endView->Add(back); + RootView::GetInstance()->Add(endView); + endView->SetDraggable(false); + endView->SetTouchable(true); + endView->SetVisible(false); // 界面隐藏 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowEndView end"); + } + /*设置结束弹窗状态*/ + void TraingCardView::SetEndViewStatus(bool status) + { + if (endView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingCardView EndView is NULL"); + return; + } + /*增加训练卡片控制*/ + UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad(); + if (cardview != nullptr) + { + cardview->SetVisible(!status); + } + endView->SetVisible(status); + return; + } + + /*获取卡片View单例*/ + UIView *TraingCardView::GetTraingCrad() + { + return swipe_; + } void TraingCardView::OnSetUpView() { View::OnSetUpView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp index c916ea008..bdac38c8e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp @@ -41,23 +41,23 @@ namespace OHOS void TrainingControlView ::InitView() { // 初始化Button - TraingModel::GetInstance()->InitButton(buttonEnd, 100, 202, 100, 100, BUTTONEND); + TraingModel::GetInstance()->InitButton(buttonEnd, 91, 205, 110, 110, BUTTONEND); // Set additional property buttonEnd->SetImageSrc(SPORT_STOP_IMAGE, SPORT_STOP_IMAGE); // 设置按钮的点击事件监听器为 TraingGPSPresenter 的实例 buttonEnd->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); Add(buttonEnd); - TraingModel::GetInstance()->InitButton(buttonStop, 255, 202, 100, 100, BUTTONSTOP); + TraingModel::GetInstance()->InitButton(buttonStop, 261, 205, 110, 110, BUTTONSTOP); // Set additional property buttonStop->SetImageSrc(SPORT_PAUSE_IMAGE, SPORT_PAUSE_IMAGE); buttonStop->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); Add(buttonStop); // 初始化Lable - TraingModel::GetInstance()->InitLabel(labeltitle, 188, 52, 90, 35, "label1", "训练中", DEFAULT_VECTOR_FONT_FILENAME, 30); - TraingModel::GetInstance()->InitLabel(labeltimer, 98, 110, 60, 35, "label2", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 65); - TraingModel::GetInstance()->InitLabel(labelend, 125, 324, 60, 40, "label3", "结束", DEFAULT_VECTOR_FONT_FILENAME, 20); - TraingModel::GetInstance()->InitLabel(labelstop, 280, 324, 60, 40, "label4", "暂停", DEFAULT_VECTOR_FONT_FILENAME, 20); + TraingModel::GetInstance()->InitLabel(labeltitle, 83, 50, 300, 35, "label1", "训练中", DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabel(labeltimer, 98, 110, 270, 75, "label2", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 65); + TraingModel::GetInstance()->InitLabel(labelend, 81, 330, 130, 35, "label3", "结束", DEFAULT_VECTOR_FONT_FILENAME, 20); + TraingModel::GetInstance()->InitLabel(labelstop, 251, 330, 130, 35, "label4", "暂停", DEFAULT_VECTOR_FONT_FILENAME, 20); Add(labeltitle); Add(labeltimer); Add(labelend); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp index b61bf673f..c2d2092be 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp @@ -40,21 +40,22 @@ namespace OHOS { // 初始化Image TraingModel::GetInstance()->InitImageView(image_progress, 13, 13, 440, 386, "image1", PROGRESS_IMAGE); - TraingModel::GetInstance()->InitImageView(image_arrows, 208, 297, 20, 20, "image2", ARROWS_IMAGE); - TraingModel::GetInstance()->InitImageView(image_lowIntensity, 98, 314, 270, 20, "image3", SPORT_STRENGTH_IMAGE); + TraingModel::GetInstance()->InitImageView(image_heart, 88, 284, 50, 50, "image2", SPORT_HEARTRATE_IMAGE); + // TraingModel::GetInstance()->InitImageView(image_lowIntensity, 98, 314, 270, 20, "image3", SPORT_STRENGTH_IMAGE); TraingModel::GetInstance()->InitImageView(image_iconup, 225, 396, 16, 10, "image4", INCO_UP_IMAGE); TraingModel::GetInstance()->InitImageView(image_iconpoint, 193, 421, 80, 20, "image5", DATA_POINT_IMAGE); Add(image_progress); - Add(image_arrows); - Add(image_lowIntensity); + Add(image_heart); + // Add(image_lowIntensity); Add(image_iconup); Add(image_iconpoint); // 初始化Lable - TraingModel::GetInstance()->InitLabel(curtimelabel, 185, 60, 90, 35, "label1", "23:54", DEFAULT_VECTOR_FONT_FILENAME, 40); - TraingModel::GetInstance()->InitLabel(sportlabel, 158, 120, 150, 35, "label2", "跳绳运动中", DEFAULT_VECTOR_FONT_FILENAME, 30); - TraingModel::GetInstance()->InitLabel(timerlabel, 90, 175, 60, 40, "label3", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 80); - TraingModel::GetInstance()->InitLabel(heartlabel, 150, 276, 60, 40, "label4", "144", DEFAULT_VECTOR_FONT_FILENAME, 23); - TraingModel::GetInstance()->InitLabel(strengthlabel, 167, 350, 60, 40, "label4", "中等强度", DEFAULT_VECTOR_FONT_FILENAME, 26); + TraingModel::GetInstance()->InitLabel(curtimelabel, 185, 60, 90, 50, "label1", "23:54", DEFAULT_VECTOR_FONT_FILENAME, 40); + TraingModel::GetInstance()->InitLabel(sportlabel, 83, 120, 300, 35, "label2", "跳绳运动中", DEFAULT_VECTOR_FONT_FILENAME, 30); + sportlabel->SetStyle(); + TraingModel::GetInstance()->InitLabel(timerlabel, 63, 165, 340, 99, "label3", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 65); + TraingModel::GetInstance()->InitLabel(heartlabel, 144, 284, 230, 80, "label4", "144", DEFAULT_VECTOR_FONT_FILENAME, 60); + TraingModel::GetInstance()->InitLabel(strengthlabel, 167, 284, 230, 80, "label5", "bpm", DEFAULT_VECTOR_FONT_FILENAME, 60); Add(curtimelabel); Add(sportlabel); Add(timerlabel); @@ -67,7 +68,7 @@ namespace OHOS buttonNote->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); Add(buttonNote); - //增加上拉卡片 + // 增加上拉卡片 SetCoverable(true); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingEndNoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingEndNoteView.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingEndView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingEndView.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp index e3f801378..31e10fbd2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp @@ -61,7 +61,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_WATER_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_WATER_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp index 0597be5c1..678d448d2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp @@ -61,7 +61,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_BALL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_BALL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp index fe02e9dfc..137d4a008 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp @@ -61,7 +61,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_DANCING_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_DANCING_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp index ce274fc31..3540568c7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp @@ -59,7 +59,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXERCISE_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_EXERCISE_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp index 47bf3f18d..f34b30c9b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp @@ -69,7 +69,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_ICE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_ICE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 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 index 1be590650..54cc0fd3c 100644 --- 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 @@ -61,7 +61,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp index fc884799b..30a9ba8bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp @@ -66,7 +66,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title,83, 50, 300, 35, "label1", STR_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); scrollView->Add(title); // UIList 的适配器 p_TraingMoreListAdapter = new TraingMoreAdapter(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp index 1d85526ce..5b5bdcb68 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp @@ -61,7 +61,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_OTHER_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title,83, 50, 300, 35, "label1", STR_OTHER_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp index 7fdc25778..555cfd548 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp @@ -61,7 +61,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_RECREATIONAL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); + TraingModel::GetInstance()->InitLabelExt(title, 83, 50, 300, 35, "label1", STR_RECREATIONAL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_continue.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_continue.bin index dfa9eaf08..29fa070bb 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_continue.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_continue.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_pause.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_pause.bin index 80a752d99..09cfcda72 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_pause.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_pause.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_stop.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_stop.bin index 2e1205517..7b5a977a5 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_stop.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_stop.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_heartrate.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_heartrate.bin new file mode 100644 index 000000000..9b6dd786d Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_heartrate.bin differ