From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
index 75e25ac..9dfbc4a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
@@ -32,6 +32,9 @@
/// </summary>
public void ShowForm()
{
+ //宸︽粦浣胯兘
+ this.ScrollEnabled = false;
+
Common.CommonPage.Instance.IsDrawerLockMode = true;
//璁剧疆澶撮儴淇℃伅
@@ -350,7 +353,7 @@
/// 鏍囪宸茶
/// </summary>
/// <param name="strId"></param>
- private async System.Threading.Tasks.Task<bool> SetTickIsRead(string strId)
+ private async Task<bool> SetTickIsRead(string strId)
{
var pra = new MessageReadStatuPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
@@ -375,19 +378,17 @@
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- foreach (var contr in this.dicAllRow.Values)
- {
- //鏍囪瘑鍏ㄩ儴涓哄凡璇�
- var result = await this.SetTickIsRead(contr.MainKeys);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
- }
+
+ var pra = new MessageReadStatuPra();
+ pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ pra.TagAllOrClearType = 0;
+ var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
HdlThreadLogic.Current.RunMain(() =>
{
@@ -411,7 +412,7 @@
/// <param name="strId"></param>
/// <param name="frameList"></param>
/// <param name="rowContr"></param>
- private async System.Threading.Tasks.Task<bool> DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)
+ private async Task<bool> DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)
{
var pra = new MessageReadStatuPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
@@ -452,16 +453,16 @@
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- foreach (var contr in this.dicAllRow.Values)
+
+ var pra = new MessageReadStatuPra();
+ pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ pra.TagAllOrClearType = 1;
+ var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);
+ if (result == false)
{
- //鍒犻櫎鍏ㄩ儴娑堟伅
- var result = await this.DeleteMsg(contr.MainKeys, null, null);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
}
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleData(true);
--
Gitblit v1.8.0