解决，#737,恢复出厂后的语言选择界面，使用滚动编码器没有震动反馈bug

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 55a1cc7..8876031 100644 (file)
--- 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\r
  * @Date: 2024-04-07 18:15:53\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-09-13 09:41:37\r
+ * @LastEditTime: 2024-09-28 17:51:27\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp\r
  */\r
 #include "countdown/include/CountDownModel.h"\r
@@ -359,8 +359,8 @@ namespace OHOS
      */\r
     static void CountDown_TimerCallbackProc(int data)\r
     {\r
-        CountDownModel::g_CountDownTimes--; // 每次回调减少1秒\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes);\r
+        // CountDownModel::g_CountDownTimes--; // 每次回调减少1秒\r
+        // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes);\r
 \r
         if (MainCountDownView::GetInstance() == nullptr)\r
         {\r
@@ -415,6 +415,7 @@ namespace OHOS
      */\r
     static void CountDown_TimerCallback(int data)\r
     {\r
+        CountDownModel::g_CountDownTimes--; // 每次回调减少1秒\r
         GraphicService::GetInstance()->PostGraphicEvent(std::bind(CountDown_TimerCallbackProc, data));\r
     }\r
 \r

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 d8becf8..3be924b 100644 (file)
--- 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<LanguageSwitchView>,
                                     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 7c1274f..e357fdd 100644 (file)
--- 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 b7bb644..24dfd1c 100644 (file)
--- 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);