From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index 582d120..aad8c36 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -338,11 +338,7 @@
}
//淇℃伅
- var btnMsg = frameTable.AddLeftCaption("", 600, 60);
- btnMsg.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnMsg.Y = Application.GetRealHeight(12) + frameTable.chidrenYaxis;
- frameTable.AddChidren(btnMsg, ChidrenBindMode.NotBind);
+ var btnMsg = frameTable.AddTopView("", 600);
if (historyInfo.OpenLockMode == -1)
{
//鍏朵粬娑堟伅
@@ -387,15 +383,20 @@
//浜虹墿
string perName = dicName.ContainsKey(historyInfo.CloudAccountId) == true ? dicName[historyInfo.CloudAccountId] : Language.StringByID(R.MyInternationalizationString.uOther);
- var btnpersion = frameTable.AddLeftCaption(perName, 600, 50, true);
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnpersion.Y = Application.GetRealHeight(72) + frameTable.chidrenYaxis;
- btnpersion.TextSize = 12;
- btnpersion.TextColor = UserCenterColor.Current.TextGrayColor1;
- frameTable.AddChidren(btnpersion, ChidrenBindMode.NotBind);
+ var btnpersion = frameTable.AddBottomView(perName, 600);
//鏃堕棿
- frameTable.AddMostRightView(Convert.ToDateTime(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);
+ if (this.dateFromControl.dateValue == this.dateToControl.dateValue)
+ {
+ //濡傛灉鏃ユ湡鑼冨洿涓�鏍�,鍒欎笉鏄剧ず骞存湀鏃�
+ frameTable.AddMostRightView(Convert.ToDateTime(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);
+ }
+ else
+ {
+ //濡傛灉鏃ユ湡鑼冨洿涓嶄竴鏍�,鍒欐樉绀哄勾鏈堟棩
+ frameTable.AddMostRightView(Convert.ToDateTime(historyInfo.UnlockTime).ToString("yyyy/MM/dd HH:mm:ss"), 700);
+ }
+
if (addLine == true)
{
//搴曠嚎
@@ -476,6 +477,8 @@
{
//鍘昏幏鍙栧叾浠栦俊鎭�
var pra2 = new MessageInfoPra();
+ pra2.BeginTime = pra.UnlockTimeBegin;
+ pra2.EndTime = pra.UnlockTimeEnd;
pra2.Topic = "/Alarms/SendAlarmInform";
pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
--
Gitblit v1.8.0