Merge #1517 into sdk602patch0911 from refs/changes/1517/head

Code review from 罗正

* refs/changes/1517/head: (3 commits squashed)

  - thread main 函数开始将gpio34设置为不使能，鸿蒙os启动后使能gpio34

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 1.解决#1190,日程管理批量同步的时候，手表端只显示有且最后一条bug

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1517

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h
index f154f41..bd02062 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h
@@ -47,6 +47,7 @@ namespace OHOS
         void ItemListAdd(const ScheduleListItemInfo &item);\r
         void ItemListClear(void);\r
         void ItemListContentUpdate(void);\r
+        void ItemListScrollByUpdate(bool isUpScroll = false);\r
         \r
         void ContentScreenItemIndexSet(uint8_t index);\r
         uint8_t ContentScreenItemIndexGet(void);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
index 9d59cfb..761745a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-06-20 15:11:17\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-11-30 17:38:58\r
+ * @LastEditTime: 2024-12-13 16:28:48\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/SchedulePresenter.cpp\r
  */\r
 #include "AppViewIDs.h"\r
@@ -100,6 +100,7 @@ namespace OHOS
             ScheduleModel_->ScheduleOriginalDataSetByUI(view_->ContentScreenItemIndexGet() / 2);\r
             view_->ItemListContentUpdate();\r
             view_->DisplayDataOrNoScreen();\r
+            view_->ItemListScrollByUpdate();\r
             return true;\r
         }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
index 1dfb891..b3c9bd5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
@@ -797,6 +797,16 @@ namespace OHOS
         }\r
     }\r
 \r
+    /// @brief 列表滚动更新\r
+    /// @param isUpScroll true 向上滚动，反之向下滚动\r
+    void ScheduleView::ItemListScrollByUpdate(bool isUpScroll)\r
+    {\r
+        if(ScheduleList_)\r
+        {\r
+            ScheduleList_->ScrollBy(isUpScroll ? -240 : 240);\r
+        }\r
+    }\r
+\r
     void ScheduleView::ResetScheduleList(void)\r
     {\r
         if(ScheduleListAdapter_ == nullptr || ScheduleList_== nullptr)\r

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index ad5ac22..954d837 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -3312,7 +3312,7 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len)
         else\r
         Ble_Set_ScheduleInfo(id_,timetemp_begin,timetemp_end,title,str_,false);\r
 \r
-        id++;\r
+        id_++;\r
 \r
        \r
         if(title)\r