From: Caisking <3449750381@qq.com>
Date: Thu, 25 Jul 2024 07:58:28 +0000 (+0800)
Subject: 消息返回逻辑优化
X-Git-Tag: release_V1.2.70_20241020_135402~748^2~5
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=10689885401add5bd3dd95e86e0b8550e01b9641;p=mirrors%2FFD230.git

消息返回逻辑优化
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
index 494fd2bfb..2b642cd25 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
@@ -1,33 +1,10 @@
-/***
+/*** 
  * @Date: 2024-06-22 11:36:16
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-07-15 16:53:35
+ * @LastEditTime: 2024-07-25 15:51:56
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
  */
-/***
- * @Date: 2024-06-22 11:36:16
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-07-12 16:34:22
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
- */
-/***
- * @Date: 2024-06-22 11:36:16
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-07-11 19:17:25
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
- */
-/***
- * @Date: 2024-06-22 11:36:16
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-06-24 11:00:22
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
- */
-/***
- * @Date: 2024-04-15 10:55:58
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-04-16 17:36:17
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/training_card/src/MessageControlPresenter.cpp
- */
+
 
 #include "message/include/MessageControlPresenter.h"
 #include "message/include/MessageControlView.h"
@@ -76,7 +53,7 @@ namespace OHOS
 
         MessageModel::GetInstance().SetCurrentIndex(index);
         MessageModel::GetInstance().SetMessageAsRead();
-        NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW); // 切换到详情界面
+        NativeAbility::GetInstance().EnterSlice(VIEW_MESSAGE_SHOW); // 切换到详情界面
         return true;
     }
 } // namespace OHOS
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
index 286fe875e..e389929e7 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
@@ -113,7 +113,7 @@ namespace OHOS
             MessageModel::GetInstance().SetCurrentIndex(index);
             MessageModel::GetInstance().SetMessageAsRead();
             // 切换到详情界面
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW);
+            NativeAbility::GetInstance().EnterSlice(VIEW_MESSAGE_SHOW);
 
             return true; // 返回 true 表示点击事件处理成功
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the messageDataVector is error");
diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
index 25860de82..305e93631 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
@@ -1,33 +1,3 @@
-/*** 
- * @Date: 2024-06-17 19:39:36
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-07-15 17:05:36
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
- */
-/***
- * @Date: 2024-06-17 19:39:36
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-07-11 18:59:45
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
- */
-/***
- * @Date: 2024-06-17 19:39:36
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-06-21 18:57:04
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
- */
-/***
- * @Date: 2024-06-17 19:39:36
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-06-18 11:30:10
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
- */
-/***
- * @Date: 2024-06-17 19:39:36
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-06-17 20:05:13
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
- */
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
@@ -84,7 +54,8 @@ namespace OHOS
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&
             (event.GetDeltaX() > 20) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE);
+            // NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE);
+            NativeAbility::GetInstance().Back();
         }
         return true;
     }
@@ -97,7 +68,8 @@ namespace OHOS
             // 删除当前项
             MessageModel::GetInstance().DeleteCurrentMessage();
 
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE);
+            // NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE);
+            NativeAbility::GetInstance().Back();
         }
         return true;
     }