From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
old mode 100644
new mode 100755
index 4e465c7..75e25ac
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
@@ -91,22 +91,27 @@
//鏁版嵁寮傚父
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;
+ });
+ if (dicData.Count == 0)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鍒锋柊鐗规晥
+ listView.EndHeaderRefreshing();
+ listView.frameTable.Height = listView.Height;
+ });
+ return;
}
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame(dicData);
@@ -268,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