From 5d1faf7f7f062ca7a7bde2a1867449bcc347c53d Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sat, 28 Sep 2024 19:47:23 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=EF=BC=8C#737,=E6=81=A2?= =?utf8?q?=E5=A4=8D=E5=87=BA=E5=8E=82=E5=90=8E=E7=9A=84=E8=AF=AD=E8=A8=80?= =?utf8?q?=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?utf8?q?=E6=BB=9A=E5=8A=A8=E7=BC=96=E7=A0=81=E5=99=A8=E6=B2=A1=E6=9C=89?= =?utf8?q?=E9=9C=87=E5=8A=A8=E5=8F=8D=E9=A6=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/countdown/src/CountDownModel.cpp | 7 ++++--- .../languagecode/include/LanguageSwitchPresenter.h | 6 ++++-- .../nativeui/languagecode/src/LanguageSwitchPresenter.cpp | 7 ++++++- .../nativeui/languagecode/src/LanguageSwitchView.cpp | 1 + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp index 55a1cc71c..887603109 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-07 18:15:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-13 09:41:37 + * @LastEditTime: 2024-09-28 17:51:27 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp */ #include "countdown/include/CountDownModel.h" @@ -359,8 +359,8 @@ namespace OHOS */ static void CountDown_TimerCallbackProc(int data) { - CountDownModel::g_CountDownTimes--; // 每次回调减少1秒 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes); + // CountDownModel::g_CountDownTimes--; // 每次回调减少1秒 + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes); if (MainCountDownView::GetInstance() == nullptr) { @@ -415,6 +415,7 @@ namespace OHOS */ static void CountDown_TimerCallback(int data) { + CountDownModel::g_CountDownTimes--; // 每次回调减少1秒 GraphicService::GetInstance()->PostGraphicEvent(std::bind(CountDown_TimerCallbackProc, data)); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h index d8becf89d..3be924b3e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:16:52 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-28 09:33:07 + * @LastEditTime: 2024-09-28 19:03:36 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h */ #ifndef LANGUAGE_SWITCH_PRESENTER_H @@ -21,7 +21,8 @@ namespace OHOS class LanguageSwitchPresenter : public Presenter, public UIView::OnClickListener, public RootView::OnKeyActListener, - public UIView::OnDragListener + public UIView::OnDragListener, + public ListScrollListener { public: LanguageSwitchPresenter(); @@ -39,6 +40,7 @@ namespace OHOS bool OnDrag(UIView &view, const DragEvent &event) override; bool OnDragEnd(UIView &view, const DragEvent &event) override; bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 + void OnItemSelected(int16 index, UIView *view) override; LanguageSwitchModel *p_LanguageSwitchModel{nullptr}; UILabelExt *m_labelext{nullptr}; bool X_DRAG_FLAG{false}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp index 7c1274f50..e357fdd25 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:17:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-24 18:07:45 + * @LastEditTime: 2024-09-28 19:09:27 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp */ #include "AppViewIDs.h" @@ -223,6 +223,11 @@ namespace OHOS return true; } + void LanguageSwitchPresenter::OnItemSelected(int16 index, UIView *view) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchPresenter::OnItemSelected:%d",index); + } + void LanguageSwitchPresenter::SetLabelExt(UILabelExt *labelext) { m_labelext = labelext; diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp index b7bb644f1..24dfd1c0b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp @@ -176,6 +176,7 @@ namespace OHOS LanguageList->SetThrowDrag(true); // 设置手指抬起屏幕后是否继续滚动。 LanguageList->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。 LanguageList->SetSwipeACCLevel(800); /*设置手指抬起屏幕后的补偿距离。*/ + LanguageList->SetSelectPosition(346/2); LanguageList->SetReboundSize(30); LanguageList->SetScrollBlankSize(20); LanguageList->SetStartIndex(0); -- 2.17.1