From: 袁清梦 <3449750381@qq.com> Date: Wed, 17 Apr 2024 08:11:35 +0000 (+0000) Subject: Merge #30 into xts_origin from refs/changes/30/head X-Git-Tag: release_V1.2.70_20241020_135402~1162^2~16^2~1 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=71ec4dc98e5b238f6581d5adce562e064d3dc4da;p=mirrors%2FFD230.git Merge #30 into xts_origin from refs/changes/30/head Code review from 袁清梦 * refs/changes/30/head: (2 commits squashed) - 优化训练back逻辑 - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/30 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp index cb70db1fd..d19169544 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp @@ -90,7 +90,8 @@ namespace OHOS } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d", viewId); if (viewId < VIEW_MAX_INTER_APP) { - NativeAbility::GetInstance().ChangeSlice(viewId); + //更改功能列表进入函数 + NativeAbility::GetInstance().EnterSlice(viewId); return true; } else if (viewId == VIEW_EXTERN_APP) { #ifdef JS_ENABLE diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index f88b473f5..7400fced9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -532,6 +532,7 @@ namespace OHOS uint8_t value = 0; value = battery_get_voltage(&voltage); PRINT("Read ALLData!\n"); + // 更新界面显示 showTimeLabel->SetText(timeStr); showWeekLabel->SetText(weekStr); @@ -550,7 +551,7 @@ namespace OHOS if (value <= (i + 1) * 10) { progressImageSrc = progressImages[i]; - PRINT("Update progressImageSrc!\n"); + PRINT("Update progressImageSrc [%d]!\r\n", i); break; } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h index 8033849f1..d2e6356b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-17 14:18:05 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h + */ #ifndef _TraingNomal_PRESENTER_H #define _TraingNomal_PRESENTER_H @@ -28,7 +34,7 @@ namespace OHOS // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承; bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; - bool OnDragEnd(UIView& view, const DragEvent& event) override; + // bool OnDragEnd(UIView& view, const DragEvent& event) override; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp index 8a3a93ac8..a247865bb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -1,7 +1,7 @@ /*** * @Date: 2024-04-15 14:19:47 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-16 10:29:09 + * @LastEditTime: 2024-04-17 14:59:43 * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp */ #include "AppViewIDs.h" @@ -67,7 +67,7 @@ namespace OHOS { if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAINING); } UNUSED(view); return true; @@ -78,7 +78,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONBACK) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING); + NativeAbility::GetInstance().Back(); } return true; } 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 c25f5d40b..fec4fbc8c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp @@ -61,12 +61,21 @@ namespace OHOS } bool TraingNomalPresenter::OnDrag(UIView &view, const DragEvent &event) { + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + { + PRINT("TraingNomalPresenter OnDrag!\r\rn"); + NativeAbility::GetInstance().Back(); // 返回函数 + } + 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) @@ -88,23 +97,23 @@ namespace OHOS UNUSED(view); return true; } +#endif bool TraingNomalPresenter::OnClick(UIView &view, const ClickEvent &event) { // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONSET) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSET); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGSET); } if (strcmp(view.GetViewId(), BUTTONGO) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGCRAD); // 获取运动类型 ExerciseClass type = TraingModel::GetInstance()->GetSportType(); // 开启对应的运动 TraingCardPresenter::GetInstance()->OpenSensor(type); } - return true; } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp index 8f9231862..8040a22b5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp @@ -66,7 +66,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + NativeAbility::GetInstance().Back(); } return true; } @@ -75,22 +75,22 @@ namespace OHOS { if (strcmp(view.GetViewId(), BUTTON1) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL); TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING); } if (strcmp(view.GetViewId(), BUTTON2) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL); TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING); } if (strcmp(view.GetViewId(), BUTTON3) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL); TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING); } if (strcmp(view.GetViewId(), BUTTONMORE) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGMORE); } return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp index b1731eac3..01ed4e696 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp @@ -74,8 +74,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONOK) == 0) { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(); // 返回函数 } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp index 02e391a3c..665ca4466 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-17 11:59:10 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp + */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" #include"language/font/ui_resource_string.h" @@ -74,8 +80,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONOK) == 0) { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGGPSSET); + NativeAbility::GetInstance().Back(); } return true; } 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 a4214dccf..1a4d76cc7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -1,4 +1,4 @@ -/*** +/*** * @Date: 2024-04-15 10:55:58 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-04-16 10:29:50 @@ -73,8 +73,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().Back(); } UNUSED(view); return true; @@ -85,11 +84,11 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONTIME) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSETTIME); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGSETTIME); } if (strcmp(view.GetViewId(), BUTTONCALULI) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSETCALULI); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGSETCALULI); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp index 20d097633..84d7cfcf8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp @@ -74,8 +74,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONOK) == 0) { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGGPSSET); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp index 36f58efe9..73c2261b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-17 11:58:48 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp + */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" #include"language/font/ui_resource_string.h" @@ -74,8 +80,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONOK) == 0) { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(); } if (strcmp(view.GetViewId(), "Remind") == 0) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp index c71226bd7..4bf9d63bb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-17 14:22:58 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp + */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" @@ -75,7 +81,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONOK) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGENDDATA); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGENDDATA); } return true; } 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 4423c08e9..84fe1985c 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 @@ -253,11 +253,11 @@ namespace OHOS if (TraingCardView::GetInstance()->RefreshEndView()) { //进行存储操作？ - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGWIN); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGWIN); } else { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); + NativeAbility::GetInstance().Back(); } } // 返回按键 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp index bec50928d..c4334e3b9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -33,22 +33,26 @@ namespace OHOS } if (strcmp(view.GetViewId(), BUTTON1) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL); + // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING); } if (strcmp(view.GetViewId(), BUTTON2) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL); + // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING); } if (strcmp(view.GetViewId(), BUTTON3) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL); + // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING); } if (strcmp(view.GetViewId(), BUTTONMORE) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); + NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGMORE); + // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); } // 标记进入界面是主界面 // TraingModel::GetInstance()->SetInterface(VIEW_MAIN); diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h index 5da276391..0b0d62edd 100755 --- a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h +++ b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h @@ -28,7 +28,7 @@ #include "stack" #include namespace OHOS { -const static uint16_t gSliceInvalid = 0; +const static uint16_t gSliceInvalid = 0; const static uint16_t gSliceDefaultPriority = 4; // 页面默认是最低优先级 const static uint16_t gMaxHistorySlices = 10; // 默认最多保存三个历史记录 @@ -81,8 +81,13 @@ public: } // 处理后退操作 - bool Back(const uint16_t transitionId = TRANSITION_INVALID, - const uint16_t priority = gSliceDefaultPriority) { + bool Back(const uint16_t transitionId = TRANSITION_INVALID, + const uint16_t priority = gSliceDefaultPriority) { + /* + if (backStack_.empty()) { + backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中 + } + */ if (!backStack_.empty()) { uint16_t preSlice = backStack_.top(); backStack_.pop();