From: Caisking <3449750381@qq.com> Date: Thu, 18 Apr 2024 09:25:00 +0000 (+0800) Subject: 实现训练目标类型以及训练目标数据传递 X-Git-Tag: release_V1.2.70_20241020_135402~1171^2~5 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d2ea385cf40810cd0923a6e5f868c8db8a3ed97d;p=mirrors%2FFD230.git 实现训练目标类型以及训练目标数据传递 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index b67117ab8..e1a3f4596 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -236,12 +236,12 @@ namespace OHOS {VIEW_CONNECT_PHONE, &NativeLauncher::InitConnectPhoneSlice}, {VIEW_INDOORWALK, &NativeLauncher::InitIndoorWalkSlice}, {VIEW_SHUTDOWN_OR_REBOOT, &NativeLauncher::InitRebootSlice}, - {VIEW_WEATHER, &NativeLauncher::InitWeatherSlice}, // 天气 - {VIEW_SYSTEM, &NativeLauncher::InitSystemSlice}, // 系统实例化地址 - {VIEW_SOUND_VIBRATION, &NativeLauncher::InitSoundAndVibrationSlice}, // 声音与震动实例化地址 - {VIEW_SYSTEM_VOLUME, &NativeLauncher::InitSystemVolumeSlice}, // 系统音量 - {VIEW_CLASSIC_BLUETOOTH, &NativeLauncher::InitClassicBluetoothSlice}, // 经典蓝牙slice - {VIEW_DISPLAY_BRIGHTNESS, &NativeLauncher::InitDisplayBrightnessSlice}, // 显示与亮度的实例化地址 + {VIEW_WEATHER, &NativeLauncher::InitWeatherSlice}, // 天气 + {VIEW_SYSTEM, &NativeLauncher::InitSystemSlice}, // 系统实例化地址 + {VIEW_SOUND_VIBRATION, &NativeLauncher::InitSoundAndVibrationSlice}, // 声音与震动实例化地址 + {VIEW_SYSTEM_VOLUME, &NativeLauncher::InitSystemVolumeSlice}, // 系统音量 + {VIEW_CLASSIC_BLUETOOTH, &NativeLauncher::InitClassicBluetoothSlice}, // 经典蓝牙slice + {VIEW_DISPLAY_BRIGHTNESS, &NativeLauncher::InitDisplayBrightnessSlice}, // 显示与亮度的实例化地址 {VIEW_SECONDARY_FUNCTION, &NativeLauncher::InitSecondaryFunction}, {VIEW_FAST_TRAINING, &NativeLauncher::InitFastTrainingSlice}, {VIEW_FAST_TRAINING_ATTENTION, &NativeLauncher::InitFastTrainingAttentionSlice}, @@ -255,7 +255,6 @@ namespace OHOS {VIEW_FLASHLIGHT, &NativeLauncher::InitFlashlightSlice}, {VIEW_BRIGHTNESSLEVEL, &NativeLauncher::InitBrightnessLevelSlice}, - {VIEW_MESSAGE, &NativeLauncher::InitMessageSlice}, {VIEW_ROTATE, &NativeLauncher::InitRotateSlice}, // {VIEW_DIALUPDATE, &NativeLauncher::InitDialUpdateSlice}, @@ -275,12 +274,13 @@ namespace OHOS {VIEW_SAVEELE, &NativeLauncher::InitSaveEleSlice}, {VIEW_SAVEBAT, &NativeLauncher::InitSaveBatSlice}, /* ----------------------------------- 训练 ----------------------------------- */ - {VIEW_TRAINING, &NativeLauncher::InitTraingSlice}, // 训练 - {VIEW_TRAININGNOMAL, &NativeLauncher::InitTraingNomalSlice}, // 正常训练初始界面 - {VIEW_TRAININGSET, &NativeLauncher::InitTraingSetSlice}, // 训练目标设置界面 - {VIEW_TRAININGENDDATA, &NativeLauncher::InitTraingEnddataSlice}, // 训练结束详细数据 - {VIEW_TRAININGWIN, &NativeLauncher::InitTraingWinSlice}, // 训练目标达成 - {VIEW_TRAINING_RECORD, &NativeLauncher::InitTraingRecordSlice}, // 训练目标达成 + {VIEW_TRAINING, &NativeLauncher::InitTraingSlice}, // 训练 + {VIEW_TRAININGNOMAL, &NativeLauncher::InitTraingNomalSlice}, // 正常训练初始界面 + {VIEW_TRAININGSET, &NativeLauncher::InitTraingSetSlice}, // 训练目标设置界面 + {VIEW_TRAININGCRAD, &NativeLauncher::InitTraingCardSlice}, // 训练卡片 + {VIEW_TRAININGENDDATA, &NativeLauncher::InitTraingEnddataSlice}, // 训练结束详细数据 + {VIEW_TRAININGWIN, &NativeLauncher::InitTraingWinSlice}, // 训练目标达成 + {VIEW_TRAINING_RECORD, &NativeLauncher::InitTraingRecordSlice}, // 训练目标达成 {VIEW_TRAININGMORE, &NativeLauncher::InitTraingMoreSlice}, // 更多训练 {VIEW_TRAININGLIMIT, &NativeLauncher::InitTraingLimitSlice}, // 极限训练 @@ -360,7 +360,7 @@ namespace OHOS VocassistModel::GetInstance()->Init(); HeartModel::GetInstance()->Init(); BluetoothModel::GetInstance()->Init(); - TraingModel::GetInstance()->Init();//训练消息订阅 + TraingModel::GetInstance()->Init(); // 训练消息订阅 // 初始化默认首页 ScreenModels::GetInstance()->PreLoadAppimages(); NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); 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 408ba07ce..7ffebf036 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -144,7 +144,9 @@ namespace OHOS { Duration, Calories, - Distance + Distance, + STEP, + UNKNOW, }; struct SportData { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h index 0fd5c5d78..114d088b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h @@ -37,6 +37,10 @@ namespace OHOS void OnStop() override; static TraingSetPresenter *GetInstance(); + + const char *GetButtonIdFromCard(int cardID); + int GetTagFromCard(int cardID); + ExerciseTag GetExerciseTagFromCard(int cardID); private: // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h index 75f69af99..397590447 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h @@ -23,7 +23,7 @@ namespace OHOS { -#define BUTTONCALULIOK "buttoncaluli" +#define BUTTONCALULIOK "buttonCaluli" class TraingSetPresenter; class TrainingSetCaluliView : public View @@ -36,13 +36,14 @@ namespace OHOS UIScrollView *SetCaluliViewInit(); void InitUIPicker(UIPicker *&picker, int x, int y, int width, int height, const char *viewId); + UIPicker *GetCaluliPicker(); private: UIView::OnDragListener *draglistener{nullptr}; UILabelExt *labeltitle_ = nullptr; - UILabelButtonExt*buttonok_ = nullptr; - UIPicker *calPicker_ = nullptr; + UILabelButtonExt *buttonok_ = nullptr; + UIPicker *Picker_ = nullptr; UIScrollView *SetCaluliScrollView; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h index 907bbb7c6..719ca3e89 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h @@ -1,7 +1,7 @@ -/*** +/*** * @Date: 2024-04-18 11:59:51 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-18 15:09:42 + * @LastEditTime: 2024-04-18 16:04:47 * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h */ /*** @@ -29,7 +29,7 @@ namespace OHOS { -#define BUTTONMileOK "buttonMile" +#define BUTTONMILEOK "buttonMile" class TraingSetPresenter; class TrainingSetMileView : public View @@ -42,13 +42,14 @@ namespace OHOS UIScrollView *SetMileViewInit(); void InitUIPicker(UIPicker *&picker, int x, int y, int width, int height, const char *viewId); + UIPicker *GetMilePicker(); private: UIView::OnDragListener *draglistener{nullptr}; UILabelExt *labeltitle_ = nullptr; - UILabelButtonExt*buttonok_ = nullptr; - UIPicker *calPicker_ = nullptr; + UILabelButtonExt *buttonok_ = nullptr; + UIPicker *Picker_ = nullptr; UIScrollView *SetMileScrollView; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h index 0d6118169..1354f4221 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h @@ -1,4 +1,4 @@ -/*** +/*** * @Date: 2024-04-18 11:59:25 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-04-18 15:34:22 @@ -29,7 +29,7 @@ namespace OHOS { -#define BUTTONStepOK "buttonStep" +#define BUTTONSTEPOK "buttonStep" class TraingSetPresenter; class TrainingSetStepView : public View @@ -42,13 +42,14 @@ namespace OHOS UIScrollView *SetStepViewInit(); void InitUIPicker(UIPicker *&picker, int x, int y, int width, int height, const char *viewId); + UIPicker *GetSetpPicker(); private: UIView::OnDragListener *draglistener{nullptr}; UILabelExt *labeltitle_ = nullptr; - UILabelButtonExt*buttonok_ = nullptr; - UIPicker *calPicker_ = nullptr; + UILabelButtonExt *buttonok_ = nullptr; + UIPicker *Picker_ = nullptr; UIScrollView *SetStepScrollView; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h index aa31a7e98..271c29948 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h @@ -23,7 +23,7 @@ namespace OHOS { -#define BUTTONTIMEOK "buttontime" +#define BUTTONTIMEOK "buttonTime" class TraingSetPresenter; class TrainingSetTimeView : public View @@ -36,13 +36,13 @@ namespace OHOS UIScrollView *SetTimeViewInit(); void InitUIPicker(UIPicker *&picker, int x, int y, int width, int height, const char *viewId); - + UIPicker *GetTimePicker(); private: UIView::OnDragListener *draglistener{nullptr}; UILabelExt *labeltitle_ = nullptr; UILabelButtonExt*buttonok_ = nullptr; - UIPicker *calPicker_ = nullptr; + UIPicker *Picker_ = nullptr; UIScrollView *SetTimeScrollView; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp index fec4fbc8c..03d6073b2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp @@ -69,35 +69,6 @@ namespace OHOS UNUSED(view); return true; } -#if 0 - bool TraingNomalPresenter::OnDragEnd(UIView &view, const DragEvent &event) - { - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) - { - //NativeAbility::GetInstance().Back(); // 返回函数 - - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Id:[%d]", preSlice); - if (preSlice == VIEW_MAIN) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - // MainViewSample::GetInstance()->SetPage(CardId::TRAINING); - return true; - } - if (preSlice == VIEW_TRAININGSET) - { - // 回到训练列表 - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); - } - else - { - NativeAbility::GetInstance().ChangeSlice(preSlice); - } - } - UNUSED(view); - return true; - } -#endif bool TraingNomalPresenter::OnClick(UIView &view, const ClickEvent &event) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp index ecdefd021..203288014 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -13,6 +13,7 @@ #include #include #include "traing/include/TraingSetPresenter.h" +#include "traing/training_card/include/TraingCardPresenter.h" // #include "TraingSetView.h" namespace OHOS @@ -89,23 +90,107 @@ namespace OHOS bool TraingSetPresenter::OnClick(UIView &view, const ClickEvent &event) { - // 根据控件id查找是哪个控件触发了点击回调 - if (strcmp(view.GetViewId(), BUTTONTIME) == 0) + int CardID = TraingSetView::GetInstance()->GetCurrentViewId(); + switch (CardID) { - TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_DURATION); + case SET_VIEW: + if (strcmp(view.GetViewId(), BUTTONTIME) == 0) + { + TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_DURATION); + } + else if (strcmp(view.GetViewId(), BUTTONCALULI) == 0) + { + TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_CALORIES); + } + else if (strcmp(view.GetViewId(), BUTTONDISTANCE) == 0) + { + TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_DISTANCE); + } + else if (strcmp(view.GetViewId(), BUTTONSTEPS) == 0) + { + TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_STEPS); + } + break; + case SET_DURATION: + case SET_CALORIES: + case SET_DISTANCE: + case SET_STEPS: + if (strcmp(view.GetViewId(), GetButtonIdFromCard(CardID)) == 0) + { + int tag = GetTagFromCard(CardID); + TraingModel::GetInstance()->SetSportTag(GetExerciseTagFromCard(CardID), tag); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGCRAD); + ExerciseClass type = TraingModel::GetInstance()->GetSportType(); + TraingCardPresenter::GetInstance()->OpenSensor(type); + } + break; + default: + break; } - if (strcmp(view.GetViewId(), BUTTONCALULI) == 0) + return true; + } + + /** + * @brief 获取按键ID + */ + const char *TraingSetPresenter::GetButtonIdFromCard(int cardID) + { + PRINT("GetButtonIdFromCard:%d\r\n", cardID); + switch (cardID) { - TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_CALORIES); + case SET_DURATION: + return BUTTONTIMEOK; + case SET_CALORIES: + return BUTTONCALULIOK; + case SET_DISTANCE: + return BUTTONMILEOK; + case SET_STEPS: + return BUTTONSTEPOK; + default: + return ""; } - if (strcmp(view.GetViewId(), BUTTONDISTANCE) == 0) + } + + /** + * @brief 获取设置目标类型 + */ + ExerciseTag TraingSetPresenter::GetExerciseTagFromCard(int cardID) + { + PRINT("GetExerciseTagFromCard:%d\r\n", cardID); + switch (cardID) { - TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_DISTANCE); + case SET_DURATION: + return ExerciseTag::Duration; + case SET_CALORIES: + return ExerciseTag::Calories; + case SET_DISTANCE: + return ExerciseTag::Distance; + case SET_STEPS: + return ExerciseTag::STEP; + default: + return ExerciseTag::UNKNOW; } - if (strcmp(view.GetViewId(), BUTTONSTEPS) == 0) + } + + /** + * @brief 获取设置目标 + */ + int TraingSetPresenter::GetTagFromCard(int cardID) + { + PRINT("GetTagFromCard:%d\r\n", cardID); + switch (cardID) { - TraingSetView::GetInstance()->ChangeView(SET_VIEW, SET_STEPS); + case SET_DURATION: + return TrainingSetTimeView::GetInstance()->GetTimePicker()->GetSelected(); + case SET_CALORIES: + return TrainingSetCaluliView::GetInstance()->GetCaluliPicker()->GetSelected(); + case SET_DISTANCE: + return TrainingSetMileView::GetInstance()->GetMilePicker()->GetSelected(); + case SET_STEPS: + return TrainingSetStepView::GetInstance()->GetSetpPicker()->GetSelected(); + default: + return 0; } - return true; } + } 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 515fadbaa..e43bca53a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp @@ -203,6 +203,27 @@ namespace OHOS 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; + } + // 删除容器 if (SetTagScrollView[SET_VIEW] != nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp index b46382956..fe01c91b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp @@ -1,7 +1,13 @@ /*** * @Date: 2024-04-18 10:57:22 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-18 14:28:29 + * @LastEditTime: 2024-04-18 16:35:33 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp + */ +/*** + * @Date: 2024-04-18 10:57:22 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-18 16:07:43 * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp */ @@ -41,7 +47,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TrainingSetCaluliView::TrainingSetCaluliView"); labeltitle_ = nullptr; buttonok_ = nullptr; - calPicker_ = nullptr; + Picker_ = nullptr; SetCaluliScrollView = nullptr; g_pTraingSetCaluliView = this; } @@ -66,11 +72,11 @@ namespace OHOS } // 删除滚动选择器 - if (calPicker_ != nullptr) + if (Picker_ != nullptr) { - SetCaluliScrollView->Remove(calPicker_); - delete calPicker_; - calPicker_ = nullptr; + SetCaluliScrollView->Remove(Picker_); + delete Picker_; + Picker_ = nullptr; } // 删除容器 @@ -172,8 +178,8 @@ namespace OHOS SetCaluliScrollView->Add(labeltitle_); // 初始化UIPicker - InitUIPicker(calPicker_, 43, 106, 380, 240, "uiPicker"); - SetCaluliScrollView->Add(calPicker_); + InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker"); + SetCaluliScrollView->Add(Picker_); // 初始化Button TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONCALULIOK, STR_OK, 30); // Set additional property @@ -183,4 +189,8 @@ namespace OHOS return SetCaluliScrollView; } + UIPicker *TrainingSetCaluliView ::GetCaluliPicker() + { + return Picker_; + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp index 6e7a8a3c4..9e5f239f1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp @@ -41,7 +41,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TrainingSetMileView::TrainingSetMileView"); labeltitle_ = nullptr; buttonok_ = nullptr; - calPicker_ = nullptr; + Picker_ = nullptr; SetMileScrollView = nullptr; g_pTraingSetMileView = this; } @@ -66,11 +66,11 @@ namespace OHOS } // 删除滚动选择器 - if (calPicker_ != nullptr) + if (Picker_ != nullptr) { - SetMileScrollView->Remove(calPicker_); - delete calPicker_; - calPicker_ = nullptr; + SetMileScrollView->Remove(Picker_); + delete Picker_; + Picker_ = nullptr; } // 删除容器 @@ -172,10 +172,10 @@ namespace OHOS SetMileScrollView->Add(labeltitle_); // 初始化UIPicker - InitUIPicker(calPicker_, 43, 106, 380, 240, "uiPicker"); - SetMileScrollView->Add(calPicker_); + InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker"); + SetMileScrollView->Add(Picker_); // 初始化Button - TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONMileOK, STR_OK, 30); + TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONMILEOK, STR_OK, 30); // Set additional property buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE); buttonok_->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); @@ -183,4 +183,8 @@ namespace OHOS return SetMileScrollView; } + UIPicker *TrainingSetMileView ::GetMilePicker() + { + return Picker_; + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp index 8642d0929..92e6decb2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp @@ -1,4 +1,4 @@ -/*** +/*** * @Date: 2024-04-18 10:57:22 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-04-18 15:50:37 @@ -41,7 +41,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TrainingSetStepView::TrainingSetStepView"); labeltitle_ = nullptr; buttonok_ = nullptr; - calPicker_ = nullptr; + Picker_ = nullptr; SetStepScrollView = nullptr; g_pTraingSetStepView = this; } @@ -66,11 +66,11 @@ namespace OHOS } // 删除滚动选择器 - if (calPicker_ != nullptr) + if (Picker_ != nullptr) { - SetStepScrollView->Remove(calPicker_); - delete calPicker_; - calPicker_ = nullptr; + SetStepScrollView->Remove(Picker_); + delete Picker_; + Picker_ = nullptr; } // 删除容器 @@ -172,10 +172,10 @@ namespace OHOS SetStepScrollView->Add(labeltitle_); // 初始化UIPicker - InitUIPicker(calPicker_, 43, 106, 380, 240, "uiPicker"); - SetStepScrollView->Add(calPicker_); + InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker"); + SetStepScrollView->Add(Picker_); // 初始化Button - TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONStepOK, STR_OK, 30); + TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONSTEPOK, STR_OK, 30); // Set additional property buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE); buttonok_->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); @@ -183,4 +183,8 @@ namespace OHOS return SetStepScrollView; } + UIPicker *TrainingSetStepView ::GetSetpPicker() + { + return Picker_; + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp index d9a31bf49..d6914fdfd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp @@ -1,4 +1,4 @@ -/*** +/*** * @Date: 2024-04-18 10:57:22 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-04-18 14:24:30 @@ -41,7 +41,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TrainingSetTimeView::TrainingSetTimeView"); labeltitle_ = nullptr; buttonok_ = nullptr; - calPicker_ = nullptr; + Picker_ = nullptr; SetTimeScrollView = nullptr; g_pTraingSetTimeView = this; } @@ -66,11 +66,11 @@ namespace OHOS } // 删除滚动选择器 - if (calPicker_ != nullptr) + if (Picker_ != nullptr) { - SetTimeScrollView->Remove(calPicker_); - delete calPicker_; - calPicker_ = nullptr; + SetTimeScrollView->Remove(Picker_); + delete Picker_; + Picker_ = nullptr; } // 删除容器 @@ -172,8 +172,8 @@ namespace OHOS SetTimeScrollView->Add(labeltitle_); // 初始化UIPicker - InitUIPicker(calPicker_, 43, 106, 380, 240, "uiPicker"); - SetTimeScrollView->Add(calPicker_); + InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker"); + SetTimeScrollView->Add(Picker_); // 初始化Button TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONTIMEOK, STR_OK, 30); // Set additional property @@ -183,4 +183,8 @@ namespace OHOS return SetTimeScrollView; } + UIPicker *TrainingSetTimeView ::GetTimePicker() + { + return Picker_; + } } 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 d88ed8fce..131f04b4f 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 @@ -260,6 +260,7 @@ namespace OHOS return true; } +#if 0 bool TraingCardPresenter::send_sport_cmd(uint32 cmd) { if (cmd > MAXSPORTID || cmd < 0) @@ -273,4 +274,5 @@ namespace OHOS OHOS::TraingCardPresenter::GetInstance()->OpenSensor(exerciseType); return true; } +#endif } 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 d8cffaf48..0969a4779 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 @@ -33,11 +33,10 @@ namespace OHOS TraingCardView::TraingCardView() { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingCardView::TraingCardView"); g_pTraingCardView = this; - // 开启计时器 - InitTimer(); - // 设置运动状态为开始 - TraingModel::GetInstance()->SetSportState(ExerciseState::Start); + InitTimer(); // 开启计时器 + TraingModel::GetInstance()->SetSportState(ExerciseState::Start); // 设置运动状态为开始 TraingModel::GetInstance()->SetTimestamp(); } @@ -45,10 +44,8 @@ namespace OHOS { DeInit(); g_pTraingCardView = nullptr; - // 关闭计时器 - DisableTimer(); - // 设置运动状态为结束 - TraingModel::GetInstance()->SetSportState(ExerciseState::End); + DisableTimer(); // 关闭计时器 + TraingModel::GetInstance()->SetSportState(ExerciseState::End); // 设置运动状态为结束 TraingModel::GetInstance()->SetTimestamp(); }