解决日程批量同步后，删除指定日程却总是删除日程列表第一项的bug

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp
index fb81711..c368d56 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp
@@ -105,6 +105,7 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataSetByUI,%d", index);\r
 \r
         uint8_t DataCount = ScheduleOriginalDataCountGet();\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleModel::DataCount:%d", DataCount);\r
         uint8_t i = 0;\r
         for(i = index; i < (DataCount - 1); i++)\r
         {\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 ce8b127..9d59cfb 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-07-08 09:45:02\r
+ * @LastEditTime: 2024-11-30 17:38:58\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/SchedulePresenter.cpp\r
  */\r
 #include "AppViewIDs.h"\r
@@ -73,11 +73,11 @@ namespace OHOS
         UNUSED(event);\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);\r
 \r
-        if (nullptr == &view) \r
-        {\r
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);\r
-            return false;\r
-        }\r
+        // if (nullptr == &view) \r
+        // {\r
+        //     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);\r
+        //     return false;\r
+        // }\r
 \r
         if(0 == strcmp(view.GetViewId(), SCHEDULE_ViewId_ContentDeleteButton_))\r
         {\r
@@ -97,9 +97,7 @@ namespace OHOS
         }\r
         if(0 == strcmp(view.GetViewId(), SCHEDULE_ViewId_DeleteOKButton_))\r
         {\r
-            ScheduleListItem * item = static_cast<ScheduleListItem *>(&view);\r
-            uint8_t OriginalDataIndex = ScheduleModel_->ScheduleItemDataOriginalDataIndexGet(item->GetViewIndex());\r
-            ScheduleModel_->ScheduleOriginalDataSetByUI(OriginalDataIndex);\r
+            ScheduleModel_->ScheduleOriginalDataSetByUI(view_->ContentScreenItemIndexGet() / 2);\r
             view_->ItemListContentUpdate();\r
             view_->DisplayDataOrNoScreen();\r
             return true;\r
@@ -107,6 +105,7 @@ namespace OHOS
 \r
         ScheduleListItem * item = static_cast<ScheduleListItem *>(&view);\r
         view_->ContentScreenItemIndexSet(item->GetViewIndex());\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick,index:%d", __LINE__,item->GetViewIndex());\r
         view_->DisplayContentScreen();\r
 \r
         return true;\r