From: Caisking <3449750381@qq.com> Date: Sat, 20 Jul 2024 01:27:25 +0000 (+0800) Subject: 修复训练设置距离目标死机 X-Git-Tag: release_V1.2.70_20241020_135402~702^2~28 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=079b7d3a0ac7f100617321d409269e66b076fd9d;p=mirrors%2FFD230.git 修复训练设置距离目标死机 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h index 07dfc6ad9..a508bd924 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h @@ -27,14 +27,15 @@ #include "traing/include/TrainingSetTimeView.h" #include "traing/include/TrainingSetMileView.h" #include "traing/include/TrainingSetStepView.h" +#include "traing/include/TraingSetPresenter.h" -#include "TraingSetPresenter.h" namespace OHOS { #define BUTTONTIME "button1" #define BUTTONCALULI "button2" #define BUTTONDISTANCE "button3" #define BUTTONSTEPS "button4" +#define MAXSLECTVIEW 5 class TraingSetPresenter; class TrainingSetCaluliView; @@ -78,12 +79,13 @@ namespace OHOS TraingSetView(TraingSetView &&) = delete; TraingSetView &operator=(TraingSetView &&) = delete; - UIViewGroup *container_ = nullptr; - UIScrollView *SetTagScrollView[4]{nullptr}; + // UIViewGroup *container_ = nullptr; + UIScrollView *SetTagScrollView[MAXSLECTVIEW]{nullptr}; TrainingSetCaluliView *setcalories{nullptr}; TrainingSetTimeView *settime{nullptr}; TrainingSetMileView *setmile{nullptr}; TrainingSetStepView *setstep{nullptr}; + UIScrollView *group{nullptr}; UILabelExt *labeltitle = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp index 080d87ea4..7aae6a107 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp @@ -30,18 +30,17 @@ namespace OHOS TraingSetView *TraingSetView::GetInstance() { - return g_pTraingSetView; } /* InitView:初始化界面*/ void TraingSetView ::InitView() { - if (SetTagScrollView[SET_VIEW] == nullptr) + if (group == nullptr) { - SetTagScrollView[SET_VIEW] = new UIScrollView(); - SetTagScrollView[SET_VIEW]->SetPosition(0, 0, 466, 466); - SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0); + group = new UIScrollView(); + group->SetPosition(0, 0, 466, 466); + group->SetStyle(STYLE_BACKGROUND_OPA, 0); } // 初始化Button InitButton(butTime, 43, 120, 380, 100, BUTTONTIME); @@ -54,23 +53,24 @@ namespace OHOS butDistance->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); butSteps->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); - SetTagScrollView[SET_VIEW]->Add(butTime); - SetTagScrollView[SET_VIEW]->Add(butKcal); - SetTagScrollView[SET_VIEW]->Add(butDistance); - SetTagScrollView[SET_VIEW]->Add(butSteps); + group->Add(butTime); + group->Add(butKcal); + group->Add(butDistance); + group->Add(butSteps); // 初始化Lable UIResourceTextId sportid = TraingModel::GetInstance()->GetSportEvent(); InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(labelTime, 100, 150, 150, 35, "label2", STR_DURATION, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabelExt(labelKcal, 100, 270, 150, 35, "label4", STR_CALORIE, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabelExt(labelDistance, 100, 390, 150, 35, "label3", STR_DISTANCE, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabelExt(labelSteps, 100, 510, 150, 35, "label5", STR_STEP_NUMBER, DEFAULT_VECTOR_FONT_FILENAME, 30); - SetTagScrollView[SET_VIEW]->Add(labeltitle); - SetTagScrollView[SET_VIEW]->Add(labelTime); - SetTagScrollView[SET_VIEW]->Add(labelKcal); - SetTagScrollView[SET_VIEW]->Add(labelDistance); - SetTagScrollView[SET_VIEW]->Add(labelSteps); + group->Add(labeltitle); + group->Add(labelTime); + group->Add(labelKcal); + group->Add(labelDistance); + group->Add(labelSteps); // 初始化Image InitImageView(imagetime, 70, 150, 100, 100, "image1", TIME_IMAGE); @@ -83,155 +83,145 @@ namespace OHOS InitImageView(imagicon3, 380, 400, 100, 100, "image3", ICON_IMAGE); InitImageView(imagicon4, 380, 520, 100, 100, "image4", ICON_IMAGE); - SetTagScrollView[SET_VIEW]->Add(imagetime); - SetTagScrollView[SET_VIEW]->Add(imagcal); - SetTagScrollView[SET_VIEW]->Add(imagedistance); - SetTagScrollView[SET_VIEW]->Add(imagesteps); + group->Add(imagetime); + group->Add(imagcal); + group->Add(imagedistance); + group->Add(imagesteps); - SetTagScrollView[SET_VIEW]->Add(imagicon1); - SetTagScrollView[SET_VIEW]->Add(imagicon2); - SetTagScrollView[SET_VIEW]->Add(imagicon3); - SetTagScrollView[SET_VIEW]->Add(imagicon4); + group->Add(imagicon1); + group->Add(imagicon2); + group->Add(imagicon3); + group->Add(imagicon4); } /* DeInit:删除组件 */ void TraingSetView::DeInit() { - SetTagScrollView[SET_VIEW]->RemoveAll(); + group->RemoveAll(); // 删除Label if (labeltitle != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(labeltitle); + group->Remove(labeltitle); delete labeltitle; labeltitle = nullptr; } if (labelTime != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(labelTime); + group->Remove(labelTime); delete labelTime; labelTime = nullptr; } if (labelKcal != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(labelKcal); + group->Remove(labelKcal); delete labelKcal; labelKcal = nullptr; } if (labelSteps != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(labelSteps); + group->Remove(labelSteps); delete labelSteps; labelSteps = nullptr; } if (labelDistance != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(labelDistance); + group->Remove(labelDistance); delete labelDistance; labelDistance = nullptr; } // 删除Button if (butTime != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(butTime); + group->Remove(butTime); delete butTime; butTime = nullptr; } if (butKcal != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(butKcal); + group->Remove(butKcal); delete butKcal; butKcal = nullptr; } if (butDistance != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(butDistance); + group->Remove(butDistance); delete butDistance; butDistance = nullptr; } if (butSteps != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(butSteps); + group->Remove(butSteps); delete butSteps; butSteps = nullptr; } // 删除Image if (imagetime != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagetime); + group->Remove(imagetime); delete imagetime; imagetime = nullptr; } if (imagcal != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagcal); + group->Remove(imagcal); delete imagcal; imagcal = nullptr; } if (imagedistance != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagedistance); + group->Remove(imagedistance); delete imagedistance; imagedistance = nullptr; } if (imagesteps != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagesteps); + group->Remove(imagesteps); delete imagesteps; imagesteps = nullptr; } if (imagicon1 != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagicon1); + group->Remove(imagicon1); delete imagicon1; imagicon1 = nullptr; } if (imagicon2 != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagicon2); + group->Remove(imagicon2); delete imagicon2; imagicon2 = nullptr; } if (imagicon3 != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagicon3); + group->Remove(imagicon3); delete imagicon3; imagicon3 = nullptr; } if (imagicon4 != nullptr) { - SetTagScrollView[SET_VIEW]->Remove(imagicon4); + group->Remove(imagicon4); delete imagicon4; imagicon4 = nullptr; } - if (setcalories != nullptr) - { - delete setcalories; - setcalories = nullptr; - } - if (settime != nullptr) - { - delete settime; - settime = nullptr; - } - if (setmile != nullptr) - { - delete setmile; - setmile = nullptr; - } - if (setstep != nullptr) - { - delete setstep; - setstep = nullptr; - } + delete group; + group = nullptr; + delete setcalories; + setcalories = nullptr; + delete settime; + settime = nullptr; + delete setmile; + setmile = nullptr; + delete setstep; + setstep = nullptr; - // 删除容器 - if (SetTagScrollView[SET_VIEW] != nullptr) + // 删除数组 + for (int tagnum = SET_VIEW; tagnum < MAX_SETVIEW; tagnum++) { - SetTagScrollView[SET_VIEW]->RemoveAll(); // 移除容器中的所有组件 - delete SetTagScrollView[SET_VIEW]; - SetTagScrollView[SET_VIEW] = nullptr; + SetTagScrollView[tagnum] = nullptr; } + + g_pTraingSetView = nullptr; } // 跳转到设置选项列表 @@ -239,7 +229,11 @@ namespace OHOS { if (SetTagScrollView[thisview] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetView"); + if (group == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView:: new container[%d] fail", thisview); + return false; + } RootView::GetInstance()->Add(SetTagScrollView[thisview]); } return true; @@ -248,7 +242,7 @@ namespace OHOS { if (SetTagScrollView[thisview] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetCaloriesView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetCaloriesView"); setcalories = new TrainingSetCaluliView(); if (setcalories == nullptr) { @@ -258,13 +252,14 @@ namespace OHOS SetTagScrollView[thisview] = setcalories->SetCaluliViewInit(); RootView::GetInstance()->Add(SetTagScrollView[thisview]); } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview); return true; } bool TraingSetView::ChangeSetDurationView(int16_t thisview) { if (SetTagScrollView[thisview] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetDurationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetDurationView"); settime = new TrainingSetTimeView(); if (settime == nullptr) { @@ -274,13 +269,14 @@ namespace OHOS SetTagScrollView[thisview] = settime->SetTimeViewInit(); RootView::GetInstance()->Add(SetTagScrollView[thisview]); } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview); return true; } bool TraingSetView::ChangeSetDistanceView(int16_t thisview) { if (SetTagScrollView[thisview] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetDistanceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetDistanceView"); setmile = new TrainingSetMileView(); if (setmile == nullptr) { @@ -290,13 +286,14 @@ namespace OHOS SetTagScrollView[thisview] = setmile->SetMileViewInit(); RootView::GetInstance()->Add(SetTagScrollView[thisview]); } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview); return true; } bool TraingSetView::ChangeSetStepsView(int16_t thisview) { if (SetTagScrollView[thisview] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetDistanceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingSetView::ChangeSetDistanceView"); setstep = new TrainingSetStepView(); if (setstep == nullptr) { @@ -306,18 +303,19 @@ namespace OHOS SetTagScrollView[thisview] = setstep->SetStepViewInit(); RootView::GetInstance()->Add(SetTagScrollView[thisview]); } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview); return true; } /* -------------------------------------------------------------------------- */ // 1.MainStopWatchViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。 - struct BloodViewMapper + struct SetViewMapper { const int16_t viewId; bool (TraingSetView::*func)(int16_t thisView); }; // 2.ViewMapper[] 是一个静态的视图映射数组,将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。 - static const BloodViewMapper ViewMapper[] = { + static const SetViewMapper ViewMapper[] = { {SET_VIEW, &TraingSetView::ChangeSetView}, {SET_CALORIES, &TraingSetView::ChangeSetCaloriesView}, {SET_DURATION, &TraingSetView::ChangeSetDurationView}, @@ -329,6 +327,7 @@ namespace OHOS bool TraingSetView::ClickFunc(int16_t interface) { int funcSize = sizeof(ViewMapper) / sizeof(ViewMapper[SET_VIEW]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "funcSize:%d interface:%d", funcSize, interface); for (int i = 0; i < funcSize; i++) { if (interface == ViewMapper[i].viewId) @@ -347,16 +346,24 @@ namespace OHOS // 4.切换视图 void TraingSetView::ChangeView(int16_t hideView, int16_t showView) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "hideview:%d showview:%d", hideView, showView); if (hideView > MAX_SETVIEW) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodView:: BloodViewId Overstep ones bounds"); return; } - SetTagScrollView[hideView]->SetVisible(false); - ClickFunc(showView); - SetTagScrollView[showView]->SetVisible(true); - SetCurrentViewId(showView); // 切换页面更换成目标ID - Draw(); + if (ClickFunc(showView)) + { + SetTagScrollView[hideView]->SetVisible(false); + if (SetTagScrollView[showView] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "set new view %d is error!", showView); + return; + } + SetTagScrollView[showView]->SetVisible(true); + SetCurrentViewId(showView); // 切换页面更换成目标ID + Draw(); + } } /* -------------------------------------------------------------------------- */ void TraingSetView::PreLoad(void) @@ -369,16 +376,20 @@ namespace OHOS } void TraingSetView::OnStart() { - SetTagScrollView[SET_VIEW] = new UIScrollView(); - if (SetTagScrollView[SET_VIEW] == nullptr) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingSetView::OnStart"); + View::OnStart(); + BaseView::RootView(Color::Black().full); + + group = new UIScrollView(); + if (group == nullptr) { return; } - SetTagScrollView[SET_VIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0xff); - SetTagScrollView[SET_VIEW]->SetScrollBlankSize(50); - SetTagScrollView[SET_VIEW]->SetReboundSize(100); - SetTagScrollView[SET_VIEW]->SetDirection(1); + group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + group->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + group->SetScrollBlankSize(50); + group->SetReboundSize(100); + group->SetDirection(1); // 创建 draglistener 实例并设置为拖动监听器 UIView::OnDragListener *draglistener = static_cast(TraingSetPresenter::GetInstance()); @@ -386,19 +397,24 @@ namespace OHOS { return; } - SetTagScrollView[SET_VIEW]->SetOnDragListener(draglistener); - SetTagScrollView[SET_VIEW]->SetTouchable(true); - SetTagScrollView[SET_VIEW]->SetDraggable(true); + group->SetOnDragListener(draglistener); + group->SetTouchable(true); + group->SetDraggable(true); PreLoad(); - RootView::GetInstance()->Add(SetTagScrollView[SET_VIEW]); - SetCurrentViewId(SET_VIEW); // 设置当前页面ID + // RootView::GetInstance()->Add(SetTagScrollView[SET_VIEW]); + // SetCurrentViewId(SET_VIEW); // 设置当前页面ID } void TraingSetView::OnSetUpView() { - View::OnSetUpView(); + if (group != nullptr) + { + SetTagScrollView[SET_VIEW] = group; + RootView::GetInstance()->Add(SetTagScrollView[SET_VIEW]); + SetCurrentViewId(SET_VIEW); + } Draw(); } @@ -412,6 +428,14 @@ namespace OHOS void TraingSetView::OnStop() { View::OnStop(); + + if (container_ != nullptr) + { + container_->RemoveAll(); + delete container_; + container_ = nullptr; + } + group->RemoveAll(); RootView::GetInstance()->RemoveAll(); return; }