From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
index cf149a7..75e25ac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
@@ -91,7 +91,28 @@
//鏁版嵁寮傚父
return;
}
+ if (this.Parent == null)
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //娓呯┖
+ listView.RemoveAll();
+ });
+ if (dicData.Count == 0)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鍒锋柊鐗规晥
+ listView.EndHeaderRefreshing();
+ listView.frameTable.Height = listView.Height;
+ });
+ return;
+ }
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame(dicData);
}
@@ -114,7 +135,7 @@
maxCount += data.Count;
}
- int waiTime = 1000;
+ int waiTime = 500;
foreach (var keys in dicData.Keys)
{
var listGroup = dicData[keys];
@@ -168,7 +189,7 @@
});
//绗竴娆＄殑鏃跺�欙紝绛夊緟鐨勬椂鍊欎箙涓�鐐�
System.Threading.Thread.Sleep(waiTime);
- waiTime = 500;
+ waiTime = 300;
}
}
}
@@ -252,12 +273,13 @@
var btnTime = rowControl.frameTable.AddMostRightView("", 200, 50);
btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;
btnTime.Y = btnMsg.Bottom + Application.GetRealHeight(12);
- btnTime.Text = Convert.ToDateTime(recordInfo.CreatedOnUtc).ToString("HH锛歮m");
+ var convertTime = UserCenterLogic.ConvertUtcTimeToLocalTime(recordInfo.CreatedOnUtc);
+ btnTime.Text = convertTime.ToString("HH锛歮m");
rowControl.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);
//搴曠嚎
if (addLine == true)
{
- rowControl.frameTable.AddBottomLine();
+ rowControl.frameTable.AddBottomLine();
}
//宸茶
if (recordInfo.IsReading == true)
--
Gitblit v1.8.0