From: luozheng <1732036298@qq.com>
Date: Sat, 30 Nov 2024 09:42:33 +0000 (+0800)
Subject: 解决日程批量同步后，删除指定日程却总是删除日程列表第一项的bug
X-Git-Tag: fd230_release_V1.3.102~7^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6228d601fb475b601a93d8f483c66aa6ed07298a;p=mirrors%2FFD230.git

解决日程批量同步后，删除指定日程却总是删除日程列表第一项的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 fb81711e7..c368d56ac 100644
--- 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);
 
         uint8_t DataCount = ScheduleOriginalDataCountGet();
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleModel::DataCount:%d", DataCount);
         uint8_t i = 0;
         for(i = index; i < (DataCount - 1); i++)
         {
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 ce8b127a8..9d59cfbab 100644
--- 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
  * @Date: 2024-06-20 15:11:17
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-08 09:45:02
+ * @LastEditTime: 2024-11-30 17:38:58
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/SchedulePresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -73,11 +73,11 @@ namespace OHOS
         UNUSED(event);
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);
 
-        if (nullptr == &view) 
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);
-            return false;
-        }
+        // if (nullptr == &view) 
+        // {
+        //     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);
+        //     return false;
+        // }
 
         if(0 == strcmp(view.GetViewId(), SCHEDULE_ViewId_ContentDeleteButton_))
         {
@@ -97,9 +97,7 @@ namespace OHOS
         }
         if(0 == strcmp(view.GetViewId(), SCHEDULE_ViewId_DeleteOKButton_))
         {
-            ScheduleListItem * item = static_cast<ScheduleListItem *>(&view);
-            uint8_t OriginalDataIndex = ScheduleModel_->ScheduleItemDataOriginalDataIndexGet(item->GetViewIndex());
-            ScheduleModel_->ScheduleOriginalDataSetByUI(OriginalDataIndex);
+            ScheduleModel_->ScheduleOriginalDataSetByUI(view_->ContentScreenItemIndexGet() / 2);
             view_->ItemListContentUpdate();
             view_->DisplayDataOrNoScreen();
             return true;
@@ -107,6 +105,7 @@ namespace OHOS
 
         ScheduleListItem * item = static_cast<ScheduleListItem *>(&view);
         view_->ContentScreenItemIndexSet(item->GetViewIndex());
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick,index:%d", __LINE__,item->GetViewIndex());
         view_->DisplayContentScreen();
 
         return true;