From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 854 ++++++++++++++++++++------------------------------------
1 files changed, 306 insertions(+), 548 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index 3879f6e..d09ef92 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
-using System.Threading.Tasks;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DeviceDoorLock
@@ -44,15 +43,11 @@
/// <summary>
/// 鑾峰彇鍒扮殑鍘嗗彶璁板綍
/// </summary>
- private List<HistoryInfo> listHistoryInfo = null;
+ private List<DoorHistoryLogInfo> listHistoryInfo = null;
/// <summary>
/// 鍏朵粬娑堟伅鐨勪富閿�,瀹冨瓨鍦ㄥ彟澶栫殑涓�寮犳暟鎹簱琛ㄤ腑
/// </summary>
private List<string> listOtherMsgId = new List<string>();
- /// <summary>
- /// 鏃犳硶璇嗗埆鐨勫紑閿佽褰曠殑鐢ㄦ埛ID(鍥犱负閭ｄ釜瀵嗙爜鏈夊彲鑳芥病鏈夊垎閰嶇粰鎴愬憳)
- /// </summary>
- private List<string> listOtherUserId = new List<string>();
#endregion
@@ -61,55 +56,59 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_DeviceMac">闂ㄩ攣鐨凪ac鍦板潃</param>
- public void ShowForm(string i_DeviceMac)
+ /// <param name="i_DeviceMac">闂ㄩ攣鐨凪ac鍦板潃</param>
+ public void ShowForm(string i_DeviceMac)
{
- this.DeviceDoor = Common.LocalDevice.Current.GetDevicesByMac(i_DeviceMac, false)[0];
-
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryLog));
-
- //鍒犻櫎
- var btnDelete = new MostRightIconControl(69, 69);
- btnDelete.UnSelectedImagePath = "Item/DeleteIcon2Selected.png";
- topFrameLayout.AddChidren(btnDelete);
- btnDelete.InitControl();
- btnDelete.ButtonClickEvent += (sender, e) =>
+ this.DeviceDoor = HdlDeviceCommonLogic.Current.GetDevicesByMac(i_DeviceMac, false)[0];
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryLog));
+
+ //鎴愬憳涓嶅厑璁告竻绌鸿褰�
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
{
- var form = new TopRightMenuControl(1, 2);
- //娓呯┖璁板綍
- form.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uClearLog), "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //鍒犻櫎
+ var btnDelete = new MostRightIconControl(69, 69);
+ btnDelete.UnSelectedImagePath = "Item/DeleteIcon2Selected.png";
+ topFrameLayout.AddChidren(btnDelete);
+ btnDelete.InitControl();
+ btnDelete.ButtonClickEvent += (sender, e) =>
{
- if (this.listView.frameTable.ChildrenCount == 0)
+ var form = new TopRightMenuControl(1, 2);
+ //娓呯┖璁板綍
+ form.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uClearLog), "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
{
- //鏃犳暟鎹彲鍒�
- return;
- }
- //纭娓呯┖褰撳墠璁板綍锛�
- this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uConfirmClearNowLog), () =>
- {
- HdlThreadLogic.Current.RunThread(() =>
+ if (this.listView.frameTable.ChildrenCount == 0)
{
- //娓呯┖鎵�鏈夎褰�
- this.ClearAllHistoryLog();
+ //鏃犳暟鎹彲鍒�
+ return;
+ }
+ //纭娓呯┖褰撳墠璁板綍锛�
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uConfirmClearNowLog), () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //娓呯┖鎵�鏈夎褰�
+ this.ClearAllHistoryLog();
+ });
});
});
- });
- };
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
+ };
+ }
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- //鍒濆鍖栧ご閮ㄦ绱㈡帶浠�
+ this.ClearBodyFrame();
+
+ //鍒濆鍖栧ご閮ㄦ绱㈡帶浠�
this.InitTitleSearchControl();
//鍒濆鍖栬褰曞垪琛�
@@ -121,10 +120,10 @@
/// </summary>
private void InitTitleSearchControl()
{
- var frameTitle = new FrameRowControl();
- frameTitle.UseClickStatu = false;
- frameTitle.Height = Application.GetRealHeight(115);
- frameTitle.BackgroundColor = topFrameLayout.BackgroundColor;
+ var frameTitle = new FrameRowControl();
+ frameTitle.UseClickStatu = false;
+ frameTitle.Height = Application.GetRealHeight(115);
+ frameTitle.BackgroundColor = topFrameLayout.BackgroundColor;
bodyFrameLayout.AddChidren(frameTitle);
var btnDateIcon = frameTitle.AddLeftIcon(69);
@@ -223,12 +222,12 @@
this.listHistoryInfo = null;
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鎴愬憳鍒楄〃
- var result = await this.GetMemberListInfo();
+ var result = this.GetMemberListInfo();
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -239,10 +238,10 @@
var dicMemberName = new Dictionary<string, string>();
for (int i = 0; i < listMenberInfo.Count; i++)
{
- dicMemberName.Add(listMenberInfo[i].SubAccountDistributedMark, string.IsNullOrEmpty(listMenberInfo[i].UserName) == false ? listMenberInfo[i].UserName : listMenberInfo[i].Account);
+ dicMemberName.Add(listMenberInfo[i].ChildAccountId, listMenberInfo[i].ShowName);
}
//鍘嗗彶璁板綍
- var historyLog = await this.GetHistoryLogInfo(dicMemberName);
+ var historyLog = this.GetHistoryLogInfo(dicMemberName);
if (historyLog == null)
{
//鍏抽棴杩涘害鏉�
@@ -276,7 +275,7 @@
/// 鑾峰彇鎴愬憳鍒楄〃淇℃伅
/// </summary>
/// <returns></returns>
- private async Task<bool> GetMemberListInfo()
+ private bool GetMemberListInfo()
{
if (listMenberInfo != null)
{
@@ -287,32 +286,31 @@
//鎶婅嚜宸变篃鍔犺繘鍘�
var myInfo = new MemberInfoRes()
{
- Account = UserCenterResourse.UserInfo.Account,
- UserName = UserCenterResourse.UserInfo.UserName,
- SubAccountDistributedMark = Common.Config.Instance.Guid
+ ChildAccountEmail = HdlUserCenterResourse.UserInfo.UserEmail,
+ ChildAccountPhone = HdlUserCenterResourse.UserInfo.UserPhone,
+ ChildNickName = HdlUserCenterResourse.UserInfo.NickName,
+ ChildAccountId = Common.Config.Instance.Guid
};
listMenberInfo.Add(myInfo);
- if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3)
{
//鎴愬憳鍙兘鐪嬭嚜宸辩殑
return true;
}
-
- var pra = new MemberListInfoPra();
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- if (result == null)
+ //鑾峰彇鎴愬憳鍒楄〃
+ var listInfo = HdlMemberLogic.Current.GetMemberListInfo(ShowNetCodeMode.YES);
+ if (listInfo == null)
{
return false;
}
- List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(result);
var checkList = new List<string>();
foreach (MemberInfoRes infoRes in listInfo)
{
- if (checkList.Contains(infoRes.DistributedMark) == true)
+ if (checkList.Contains(infoRes.ChildAccountId) == true)
{
continue;
}
- checkList.Add(infoRes.DistributedMark);
+ checkList.Add(infoRes.ChildAccountId);
listMenberInfo.Add(infoRes);
}
return true;
@@ -328,28 +326,28 @@
/// <param name="historyInfo">鍘嗗彶璁板綍</param>
/// <param name="dicName">鍚嶅瓧</param>
/// <param name="addLine">娣诲姞搴曠嚎</param>
- private void AddLogInfoRow(HistoryInfo historyInfo, Dictionary<string, string> dicName, bool addLine = true)
+ private void AddLogInfoRow(DoorHistoryLogInfo historyInfo, Dictionary<string, string> dicName, bool addLine = true)
{
var frameTable = new FrameRowControl(listView.rowSpace / 2);
frameTable.UseClickStatu = false;
- this.listView.AddChidrenFrame2(frameTable);
+ this.listView.AddChidren2(frameTable);
//鍥炬爣
var btnIcon = frameTable.AddLeftIcon();
//淇℃伅
var btnMsg = frameTable.AddTopView("", 600);
//浜虹墿
- string perName = dicName.ContainsKey(historyInfo.CloudAccountId) == true ? dicName[historyInfo.CloudAccountId] : Language.StringByID(R.MyInternationalizationString.uOther);
+ string perName = dicName.ContainsKey(historyInfo.UserId) == true ? dicName[historyInfo.UserId] : Language.StringByID(R.MyInternationalizationString.uOther);
frameTable.AddBottomView(perName, 600);
//鏃堕棿
if (this.dateFromControl.dateValue == this.dateToControl.dateValue)
{
//濡傛灉鏃ユ湡鑼冨洿涓�鏍�,鍒欎笉鏄剧ず骞存湀鏃�
- frameTable.AddMostRightView(UserCenterLogic.ConvertUtcTimeToLocalTime(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);
+ frameTable.AddMostRightView(HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);
}
else
{
//濡傛灉鏃ユ湡鑼冨洿涓嶄竴鏍�,鍒欐樉绀哄勾鏈堟棩
- frameTable.AddMostRightView(UserCenterLogic.ConvertUtcTimeToLocalTime(historyInfo.UnlockTime).ToString("yyyy/MM/dd HH:mm:ss"), 700);
+ frameTable.AddMostRightView(HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(historyInfo.UnlockTime).ToString("yyyy/MM/dd HH:mm:ss"), 700);
}
//搴曠嚎
if (addLine == true)
@@ -359,65 +357,84 @@
}
//鍏朵粬娑堟伅
- if (historyInfo.OpenLockMode == -1)
+ if (historyInfo.UnLockMode == -1)
{
//鍥剧墖
- var device = Common.LocalDevice.Current.GetDevice(historyInfo.DeviceMac, historyInfo.DeviceEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(historyInfo.DeviceMac, historyInfo.DeviceEpoint);
if (device == null)
{
btnIcon.UnSelectedImagePath = "Device/IntelligentLocks.png";
}
else
{
- Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
}
//娑堟伅
btnMsg.Text = historyInfo.AlarmMsg;
}
//闂ㄩ攣甯稿紑妯″紡
- else if (historyInfo.OpenLockMode == 9000)
+ else if (historyInfo.UnLockMode == 9000)
{
//鍥剧墖
btnIcon.UnSelectedImagePath = "Item/NormallyOpen.png";
- //娑堟伅
- if (historyInfo.OtherOpenLockMode == 9001)
- {
- //甯稿紑妯″紡鎵嬪姩寮�鍚�
- btnMsg.TextID = R.MyInternationalizationString.uNormallyOpenModeManualOpen;
- }
- else if (historyInfo.OtherOpenLockMode == 9002)
- {
- //甯稿紑妯″紡鎵嬪姩鍙栨秷
- btnMsg.TextID = R.MyInternationalizationString.uNormallyOpenModeManualClose;
- }
- else if (historyInfo.OtherOpenLockMode == 9003)
- {
- //甯稿紑妯″紡鍚敤{0}灏忔椂
- btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uNormallyOpenModeOpenSomeTime).Replace("{0}", historyInfo.NormallyOpenContinuedTime);
- }
- else
- {
- //涓婇潰鏄疉pp鎵嬪姩鎺ㄩ��,杩欓噷鏄綉鍏虫垨鑰呴棬閿佽嚜宸辨帹閫�
- btnMsg.Text = historyInfo.AlarmMsg;
- }
+ //杩欓噷鏄綉鍏虫垨鑰呴棬閿佽嚜宸辨帹閫�
+ btnMsg.Text = historyInfo.AlarmMsg;
+ }
+ //甯稿紑妯″紡鎵嬪姩寮�鍚�
+ else if (historyInfo.UnLockMode == 9001)
+ {
+ //鍥剧墖
+ btnIcon.UnSelectedImagePath = "Item/NormallyOpen.png";
+ btnMsg.TextID = R.MyInternationalizationString.uNormallyOpenModeManualOpen;
+ }
+ //甯稿紑妯″紡鎵嬪姩鍙栨秷
+ else if (historyInfo.UnLockMode == 9002)
+ {
+ //鍥剧墖
+ btnIcon.UnSelectedImagePath = "Item/NormallyOpen.png";
+ btnMsg.TextID = R.MyInternationalizationString.uNormallyOpenModeManualClose;
+ }
+ //甯稿紑妯″紡鍚敤{0}灏忔椂
+ else if (historyInfo.UnLockMode == 9003)
+ {
+ //鍥剧墖
+ btnIcon.UnSelectedImagePath = "Item/NormallyOpen.png";
+ btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uNormallyOpenModeOpenSomeTime).Replace("{0}", historyInfo.NormallyOpenContinuedTime);
+ }
+ //甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+ else if (historyInfo.UnLockMode == 9004)
+ {
+ //鍥剧墖
+ btnIcon.UnSelectedImagePath = "Item/NormallyOpen.png";
+ btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uNormallyOpenLogicManualClose);
}
//寮�閿佹垚鍔�
- else if (historyInfo.UnlockIsSuccess == true)
+ else if (historyInfo.IsUnlockSuccess == true)
{
//鍥剧墖
btnIcon.UnSelectedImagePath = "Item/UnLockSuccess.png";
//娑堟伅
- if (historyInfo.OpenLockMode == 0)
+ if (historyInfo.UnLockMode == 0)
{
//瀵嗙爜寮�閿佹垚鍔�
btnMsg.TextID = R.MyInternationalizationString.uUnlockByPasswordSuccess;
}
- else if (historyInfo.OpenLockMode == 3)
+ else if (historyInfo.UnLockMode == 3)
{
//IC鍗″紑閿佹垚鍔�
btnMsg.TextID = R.MyInternationalizationString.uUnlockByICcardSuccess;
}
- else if (historyInfo.OpenLockMode == 15)
+ else if (historyInfo.UnLockMode == 13)
+ {
+ //闈欒剦绾瑰紑閿佹垚鍔�
+ btnMsg.TextID = R.MyInternationalizationString.uStriaVenosusUnLockSuccess;
+ }
+ else if (historyInfo.UnLockMode == 14)
+ {
+ //浜鸿劯璇嗗埆寮�閿佹垚鍔�
+ btnMsg.TextID = R.MyInternationalizationString.uFaceRecognitionUnLockSuccess;
+ }
+ else if (historyInfo.UnLockMode == 15)
{
//鎸囩汗寮�閿佹垚鍔�
btnMsg.TextID = R.MyInternationalizationString.uUnlockByFingerPrintSuccess;
@@ -429,17 +446,27 @@
//鍥剧墖
btnIcon.UnSelectedImagePath = "Item/UnLockFail.png";
//娑堟伅
- if (historyInfo.OpenLockMode == 0)
+ if (historyInfo.UnLockMode == 0)
{
//瀵嗙爜寮�閿佸け璐�
btnMsg.TextID = R.MyInternationalizationString.uUnlockByPasswordFail;
}
- else if (historyInfo.OpenLockMode == 3)
+ else if (historyInfo.UnLockMode == 3)
{
//IC鍗″紑閿佸け璐�
btnMsg.TextID = R.MyInternationalizationString.uUnlockByICcardFail;
}
- else if (historyInfo.OpenLockMode == 15)
+ else if (historyInfo.UnLockMode == 13)
+ {
+ //闈欒剦绾瑰紑閿佸け璐�
+ btnMsg.TextID = R.MyInternationalizationString.uStriaVenosusUnLockFail;
+ }
+ else if (historyInfo.UnLockMode == 14)
+ {
+ //浜鸿劯璇嗗埆寮�閿佸け璐�
+ btnMsg.TextID = R.MyInternationalizationString.uFaceRecognitionUnLockFail;
+ }
+ else if (historyInfo.UnLockMode == 15)
{
//鎸囩汗寮�閿佸け璐�
btnMsg.TextID = R.MyInternationalizationString.uUnlockByFingerPrintFail;
@@ -459,7 +486,7 @@
var dic = new Dictionary<string, string>();
for (int i = 0; i < listMenberInfo.Count; i++)
{
- dic.Add(listMenberInfo[i].SubAccountDistributedMark, string.IsNullOrEmpty(listMenberInfo[i].UserName) == false ? listMenberInfo[i].UserName : listMenberInfo[i].Account);
+ dic.Add(listMenberInfo[i].ChildAccountId, listMenberInfo[i].ShowName);
}
//鏄剧ず搴曢儴绫诲瀷绛涢��
var form = new DoorLockScreeningTypeForm();
@@ -483,12 +510,11 @@
/// 绛涢�夊巻鍙茶褰�
/// </summary>
/// <returns></returns>
- private List<HistoryInfo> ScreeningHistoryData(Dictionary<string, string> dicMemberName)
+ private List<DoorHistoryLogInfo> ScreeningHistoryData(Dictionary<string, string> dicMemberName)
{
//鍘嗗彶璁板綍澶夯鐑︿簡,瀛樺湪涓嶅悓鐨勬暟鎹簱琛ㄩ噷,骞朵笖鏁版嵁杩樹笉涓�鏍�,鍙兘杩欐牱涓�涓釜鍒ゆ柇浜�
- var listScreeningData = new List<HistoryInfo>();
+ var listScreeningData = new List<DoorHistoryLogInfo>();
//娓呴櫎鎺変箣鍓嶇殑璁板綍
- this.listOtherUserId = new List<string>();
this.listOtherMsgId = new List<string>();
//鏄惁閫夋嫨鍏ㄩ�夌敤鎴�
@@ -520,16 +546,16 @@
/// <param name="selectAllUser">鏄惁閫夋嫨鍏ㄩ�夌敤鎴�</param>
/// <param name="selectOtherUser">鏄惁鍗曢�変簡鍏朵粬</param>
/// <param name="slectAllLockMode">鏄惁閫夋嫨鍏ㄩ�夊紑閿佹柟寮�</param>
- private bool CheckHistoryDataCanShow(HistoryInfo info, Dictionary<string, string> dicMemberName,
+ private bool CheckHistoryDataCanShow(DoorHistoryLogInfo info, Dictionary<string, string> dicMemberName,
bool selectAllUser, bool selectOtherUser, bool slectAllLockMode)
{
//濡傛灉娌℃湁閫夋嫨 鍏ㄩ�夌敤鎴�
if (selectAllUser == false)
{
//濡傛灉杩欎釜鐢ㄦ埛ID涓嶅寘鍚湪鎸囧畾閫夋嫨鐨勬垚鍛樺垪琛ㄩ噷闈�
- if (this.listSearchUserId.Contains(info.CloudAccountId) == false)
+ if (this.listSearchUserId.Contains(info.UserId) == false)
{
- if (dicMemberName.ContainsKey(info.CloudAccountId) == true)
+ if (dicMemberName.ContainsKey(info.UserId) == true)
{
//濡傛灉鑳藉璇嗗埆杩欎釜id鐨勮瘽,鍒欒〃绀哄畠涓嶅睘浜庡叾浠栫被,骞朵笖涔熶笉鍐嶉�夋嫨鐩爣鍐�
return false;
@@ -542,10 +568,10 @@
}
}
//濡傛灉鏄垚鍛樿韩浠�,骞朵笖鐢ㄦ埛ID涓嶄负绌�
- if (UserCenterResourse.UserInfo.AuthorityNo == 3 && info.CloudAccountId != string.Empty)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3 && info.UserId != string.Empty)
{
//鎴愬憳涓嶈兘鐪嬪埌 鍏朵粬浜虹殑璁板綍(鎴愬憳鐨勬椂鍊�,杩欎釜鍙橀噺閲岄潰鍙湁浠栬嚜宸变竴涓�)
- if (dicMemberName.ContainsKey(info.CloudAccountId) == false)
+ if (dicMemberName.ContainsKey(info.UserId) == false)
{
return false;
}
@@ -554,26 +580,20 @@
if (slectAllLockMode == false)
{
//濡傛灉杩欎釜寮�閿佹柟寮忎笉鍦ㄩ�夋嫨鐨勫垪琛ㄩ噷闈㈢殑璇�
- if (this.listSearchLockId.Contains(info.OpenLockMode) == false)
+ if (this.listSearchLockId.Contains(info.UnLockMode) == false)
{
return false;
}
}
//鍙︿竴寮犺〃鐨勬暟鎹富閿�
- if (info.OpenLockMode == -1 || info.OpenLockMode == 9000)
+ if (info.UnLockMode == -1 || info.UnLockMode == 9000)
{
if (info.MsgKeyId != string.Empty)
{
//鍏朵粬娑堟伅鐨勪富閿�,瀹冨瓨鍦ㄥ彟澶栫殑涓�寮犳暟鎹簱琛ㄤ腑
this.listOtherMsgId.Add(info.MsgKeyId);
}
- }
- if (info.CloudAccountId != string.Empty && dicMemberName.ContainsKey(info.CloudAccountId) == false
- && this.listOtherUserId.Contains(info.CloudAccountId) == false)
- {
- //鏃犳硶璇嗗埆鐨勫紑閿佽褰曠殑鐢ㄦ埛ID(鍥犱负閭ｄ釜瀵嗙爜鏈夊彲鑳芥病鏈夊垎閰嶇粰鎴愬憳)
- this.listOtherUserId.Add(info.CloudAccountId);
}
return true;
@@ -587,24 +607,26 @@
/// 鑾峰彇鍘嗗彶璁板綍
/// </summary>
/// <returns></returns>
- private async Task<List<HistoryInfo>> GetHistoryLogInfo(Dictionary<string, string> dicMemberName)
+ private List<DoorHistoryLogInfo> GetHistoryLogInfo(Dictionary<string, string> dicMemberName)
{
if (this.listHistoryInfo != null)
{
//涓嶄簩娆¤幏鍙�,涓昏閽堝鐨勬槸绛涢�夊姛鑳�
return this.ScreeningHistoryData(dicMemberName);
}
- //鑾峰彇璁块棶浜戠鎺ュ彛鐨勫惎鍔ㄥ弬鏁�
- var pra = this.GetReadHistoryPra();
+
+ var dateFrom = new DateTime(dateFromControl.Year, dateFromControl.Month, dateFromControl.Day, 0, 0, 0);
+ var dateTo = new DateTime(dateToControl.Year, dateToControl.Month, dateToControl.Day, 23, 59, 59);
//鑾峰彇闂ㄩ攣鐨勬墦寮�鍜屽叧闂褰�
- var listAllLog = await this.GetDoorOpenHistoryLog(pra);
+ var listAllLog = HdlDeviceDoorLockLogic.Current.GetDoorHistoryLogInfo(this.GetDoorId(), dateFrom, dateTo);
+
//鑾峰彇闂ㄩ攣鐨勫叾浠栬褰�
- var listOtherLog = await this.GetDoorOtherHistoryLog(pra.UnlockTimeBegin, pra.UnlockTimeEnd);
+ var listOtherLog = this.GetDoorOtherHistoryLog(dateFrom, dateTo);
listAllLog.AddRange(listOtherLog);
//鎺掑簭涓�涓�
- var dicAllData = new Dictionary<string, List<HistoryInfo>>();
+ var dicAllData = new Dictionary<string, List<DoorHistoryLogInfo>>();
var listSortTime = new List<string>();
foreach (var data in listAllLog)
@@ -612,7 +634,7 @@
//鎸夋椂闂村垎缁�
if (dicAllData.ContainsKey(data.UnlockTime) == false)
{
- dicAllData[data.UnlockTime] = new List<HistoryInfo>();
+ dicAllData[data.UnlockTime] = new List<DoorHistoryLogInfo>();
listSortTime.Add(data.UnlockTime);
}
dicAllData[data.UnlockTime].Add(data);
@@ -620,54 +642,13 @@
//鎵ц鎺掑簭,鏃堕棿澶х殑鍦ㄥ墠闈�
listSortTime.Sort();
- this.listHistoryInfo = new List<HistoryInfo>();
+ this.listHistoryInfo = new List<DoorHistoryLogInfo>();
for (int i = listSortTime.Count - 1; i >= 0; i--)
{
this.listHistoryInfo.AddRange(dicAllData[listSortTime[i]]);
}
//绛涢�夊巻鍙茶褰�
return this.ScreeningHistoryData(dicMemberName);
- }
-
- /// <summary>
- /// 鑾峰彇闂ㄩ攣鐨勬墦寮�鍜屽叧闂褰�
- /// </summary>
- /// <param name="i_pra"></param>
- /// <returns></returns>
- private async Task<List<HistoryInfo>> GetDoorOpenHistoryLog(GetHistoryDataPra i_pra)
- {
- var listLog = new List<HistoryInfo>();
-
- int nowPage = 0;
- while (true)
- {
- //璁块棶浜戠
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockHistoryPager", true, i_pra);
- if (result == null)
- {
- return null;
- }
- var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetHistoryDataResult>(result);
- foreach (var data in dataInfo.PageData)
- {
- //涓嶇煡閬撲负浠�涔堜細鏈変笂鎶ヤ簡铏氭嫙9000鐨勯偅涓壒娈婄殑涓滆タ
- if (data.OpenLockMode == 9000 && data.OtherOpenLockMode <= 9000)
- {
- continue;
- }
- listLog.Add(data);
- }
-
- if (dataInfo.HasNextPage == false)
- {
- break;
- }
- //鑾峰彇涓嬩竴椤�
- nowPage++;
- i_pra.PageSetting.Page = nowPage;
- }
-
- return listLog;
}
#endregion
@@ -678,40 +659,54 @@
/// 鑾峰彇闂ㄩ攣鐨勫叾浠栬褰�
/// </summary>
/// <returns></returns>
- private async Task<List<HistoryInfo>> GetDoorOtherHistoryLog(string beginTime, string endTime)
+ private List<DoorHistoryLogInfo> GetDoorOtherHistoryLog(DateTime beginTime, DateTime endTime)
{
- var listLog = new List<HistoryInfo>();
+ var listLog = new List<DoorHistoryLogInfo>();
+ //杞负utc鏃堕棿
+ var utcFrom = beginTime.ToUniversalTime();
+ var utcTo = endTime.ToUniversalTime();
- //鑾峰彇闂ㄩ攣鍏朵粬绫讳俊鎭笂鎶�
- var pra2 = new MessageInfoPra();
- pra2.BeginTime = beginTime;
- pra2.EndTime = endTime;
- pra2.Topic = "/Alarms/SendAlarmInform";
- pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
- if (result == null)
+ //鍘诲彟涓�寮犺〃鍘昏幏鍙栧畠鐨勫叾浠栨秷鎭褰�
+ var listMsg = HdlMessageLogic.Current.GetListMessageFromDb();
+ if (listMsg == null)
{
- return null;
+ return listLog;
}
- this.AdjustDoorOtherAlarmData(ref listLog, result);
-
- //浠庤嚜鍔ㄥ寲涓�,鑾峰彇甯稿紑妯″紡璁板綍
- pra2.Topic = "/Logic/Execute_Respon";
- result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
- if (result == null)
+ foreach (var msgInfo in listMsg)
{
- return null;
+ //鏃堕棿涓嶆槸13浣嶇殑閮戒笉鐞�
+ if (msgInfo.CreateTime.Length != 13) { continue; }
+ //鑾峰彇闂ㄩ攣鍏朵粬绫讳俊鎭笂鎶�
+ if (msgInfo.MessageTitle == "/Alarms/SendAlarmInform")
+ {
+ //鍒ゆ柇鏄笉鏄繖涓椂闂存
+ var checkDate = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(msgInfo.CreateTime);
+ if (utcFrom <= checkDate && checkDate <= utcTo)
+ {
+ this.AdjustDoorOtherAlarmData(ref listLog, msgInfo);
+ }
+ }
+ //浠庤嚜鍔ㄥ寲涓�,鑾峰彇甯稿紑妯″紡璁板綍
+ else if (msgInfo.MessageTitle == "/Logic/Execute_Respon")
+ {
+ //鍒ゆ柇鏄笉鏄繖涓椂闂存
+ var checkDate = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(msgInfo.CreateTime);
+ if (utcFrom <= checkDate && checkDate <= utcTo)
+ {
+ this.AdjustDoorNormallyOpenData(ref listLog, msgInfo);
+ }
+ }
+ //鑾峰彇闂ㄩ攣涓存椂瀵嗙爜寮�閿佽褰�
+ else if (msgInfo.MessageTitle == "/DoorLock/DoorLockOperatingEventNotificationCommand")
+ {
+ //鍒ゆ柇鏄笉鏄繖涓椂闂存
+ var checkDate = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(msgInfo.CreateTime);
+ if (utcFrom <= checkDate && checkDate <= utcTo)
+ {
+ this.AdjustDoorTemporaryPasswordData(ref listLog, msgInfo);
+ }
+ }
}
- this.AdjustDoorNormallyOpenData(ref listLog, result);
-
- //鑾峰彇闂ㄩ攣涓存椂瀵嗙爜寮�閿佽褰�
- pra2.Topic = "/DoorLock/DoorLockOperatingEventNotificationCommand";
- result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
- if (result == null)
- {
- return null;
- }
- this.AdjustDoorTemporaryPasswordData(ref listLog, result);
return listLog;
}
@@ -720,143 +715,131 @@
/// 澶勭悊闂ㄩ攣甯稿紑妯″紡璁板綍淇℃伅
/// </summary>
/// <param name="listLog"></param>
- /// <param name="result"></param>
- private void AdjustDoorOtherAlarmData(ref List<HistoryInfo> listLog, string result)
+ /// <param name="i_msgData"></param>
+ private void AdjustDoorOtherAlarmData(ref List<DoorHistoryLogInfo> listLog, MessageRecordInfo i_msgData)
{
- var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- string doorKey = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
- foreach (var myInfo in dataInfo2.PageData)
+ string doorKey = this.GetDoorId();
+ //璁惧瀵硅薄
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(i_msgData.MessageExpand);
+ string deviceAddr = jobject.Value<string>("DeviceAddr");
+ int deviceEpoint = jobject.Value<int>("Epoint");
+ if (doorKey != deviceAddr + "_" + deviceEpoint)
{
- //璁惧瀵硅薄
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(myInfo.PayloadJson);
- string deviceAddr = jobject.Value<string>("DeviceAddr");
- int deviceEpoint = jobject.Value<int>("Epoint");
- if (doorKey != deviceAddr + "_" + deviceEpoint)
- {
- //涓嶆槸鍚屼竴涓棬閿佺殑璁板綍
- continue;
- }
-
- var data = new HistoryInfo();
- data.DeviceMac = deviceAddr;
- data.DeviceEpoint = deviceEpoint;
- //娑堟伅
- var msgInfo = HdlAlarmsLogic.Current.GetDoorLockAlarmInfo(jobject);
- data.AlarmMsg = msgInfo != null ? msgInfo.AlarmMsg : Language.StringByID(R.MyInternationalizationString.uDoorLocksAlarmHadTriggered);
- //鏃堕棿
- data.UnlockTime = myInfo.CreatedOnUtc;
- //涓婚敭
- data.MsgKeyId = myInfo.Id;
- //娑堟伅鍖哄垎
- if (msgInfo.MsgDiv == 9000)
- {
- data.OpenLockMode = 9000;
- }
- listLog.Add(data);
+ //涓嶆槸鍚屼竴涓棬閿佺殑璁板綍
+ return;
}
+
+ var data = new DoorHistoryLogInfo();
+ data.DeviceMac = deviceAddr;
+ data.DeviceEpoint = deviceEpoint;
+ //娑堟伅
+ var msgInfo = HdlAlarmsLogic.Current.GetDoorLockAlarmInfo(jobject);
+ data.AlarmMsg = msgInfo != null ? msgInfo.AlarmMsg : Language.StringByID(R.MyInternationalizationString.uDoorLocksAlarmHadTriggered);
+ //鏃堕棿
+ data.UnlockTime = i_msgData.CreateTime;
+ //涓婚敭
+ data.MsgKeyId = i_msgData.Id;
+ //娑堟伅鍖哄垎
+ if (msgInfo.MsgDiv == 9000)
+ {
+ data.UnLockMode = 9000;
+ }
+ listLog.Add(data);
}
/// <summary>
/// 澶勭悊闂ㄩ攣甯稿紑妯″紡淇℃伅涓婃姤
/// </summary>
/// <param name="listLog"></param>
- /// <param name="result"></param>
- private void AdjustDoorNormallyOpenData(ref List<HistoryInfo> listLog, string result)
+ /// <param name="i_msgData"></param>
+ private void AdjustDoorNormallyOpenData(ref List<DoorHistoryLogInfo> listLog, MessageRecordInfo i_msgData)
{
- var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- string doorKey = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
- foreach (var myInfo in dataInfo2.PageData)
+ string doorKey = this.GetDoorId();
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(i_msgData.MessageExpand);
+ var myActionData = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(jobject["Data"].ToString());
+ if (myActionData.ActionData == null || myActionData.ActionData.Actiontype != 8)
{
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(myInfo.PayloadJson);
- var myActionData = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(jobject["Data"].ToString());
- if (myActionData.ActionData == null || myActionData.ActionData.Actiontype != 8)
- {
- //涓嶆槸甯稿紑妯″紡鐨勮嚜鍔ㄥ寲
- continue;
- }
- string deviceAddr = myActionData.ActionData.MacStr;
- int deviceEpoint = myActionData.ActionData.Epoint;
- if (doorKey != deviceAddr + "_" + deviceEpoint)
- {
- //涓嶆槸鍚屼竴涓棬閿佺殑璁板綍
- continue;
- }
-
- var data = new HistoryInfo();
- data.DeviceMac = deviceAddr;
- data.DeviceEpoint = deviceEpoint;
- //娑堟伅
- if (myActionData.ActionData.PassDataString == "055704010112")
- {
- //甯稿紑妯″紡寮�鍚�(鑷姩鍖栬Е鍙�)
- data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg11);
- }
- else if (myActionData.ActionData.PassDataString == "055704010113")
- {
- //甯稿紑妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
- data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg12);
- }
- else
- {
- continue;
- }
- //鏃堕棿
- data.UnlockTime = myInfo.CreatedOnUtc;
- //涓婚敭
- data.MsgKeyId = myInfo.Id;
- //娑堟伅鍖哄垎
- data.OpenLockMode = 9000;
-
- listLog.Add(data);
+ //涓嶆槸甯稿紑妯″紡鐨勮嚜鍔ㄥ寲
+ return;
}
+ string deviceAddr = myActionData.ActionData.MacStr;
+ int deviceEpoint = myActionData.ActionData.Epoint;
+ if (doorKey != deviceAddr + "_" + deviceEpoint)
+ {
+ //涓嶆槸鍚屼竴涓棬閿佺殑璁板綍
+ return;
+ }
+
+ var data = new DoorHistoryLogInfo();
+ data.DeviceMac = deviceAddr;
+ data.DeviceEpoint = deviceEpoint;
+ //娑堟伅
+ if (myActionData.ActionData.PassDataString == "055704010112")
+ {
+ //甯稿紑妯″紡寮�鍚�(鑷姩鍖栬Е鍙�)
+ data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg11);
+ }
+ else if (myActionData.ActionData.PassDataString == "055704010113")
+ {
+ //甯稿紑妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
+ data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg12);
+ }
+ else
+ {
+ return;
+ }
+ //鏃堕棿
+ data.UnlockTime = i_msgData.CreateTime;
+ //涓婚敭
+ data.MsgKeyId = i_msgData.Id;
+ //娑堟伅鍖哄垎
+ data.UnLockMode = 9000;
+
+ listLog.Add(data);
}
/// <summary>
/// 澶勭悊闂ㄩ攣涓存椂瀵嗙爜涓婃姤
/// </summary>
/// <param name="listLog"></param>
- /// <param name="result"></param>
- private void AdjustDoorTemporaryPasswordData(ref List<HistoryInfo> listLog, string result)
+ /// <param name="i_msgData"></param>
+ private void AdjustDoorTemporaryPasswordData(ref List<DoorHistoryLogInfo> listLog, MessageRecordInfo i_msgData)
{
- var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
- string doorKey = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
- foreach (var myInfo in dataInfo2.PageData)
+ string doorKey = this.GetDoorId();
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(i_msgData.MessageExpand);
+ string deviceAddr = jobject.Value<string>("DeviceAddr");
+ int deviceEpoint = jobject.Value<int>("Epoint");
+ if (doorKey != deviceAddr + "_" + deviceEpoint)
{
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(myInfo.PayloadJson);
- string deviceAddr = jobject.Value<string>("DeviceAddr");
- int deviceEpoint = jobject.Value<int>("Epoint");
- if (doorKey != deviceAddr + "_" + deviceEpoint)
- {
- //涓嶆槸鍚屼竴涓棬閿佺殑璁板綍
- continue;
- }
- var myActionData = Newtonsoft.Json.JsonConvert.DeserializeObject<PasswordOperationData>(jobject["Data"].ToString());
- if (myActionData.UserID != 246)
- {
- //涓嶆槸涓存椂瀵嗙爜
- continue;
- }
- var data = new HistoryInfo();
- data.DeviceMac = deviceAddr;
- data.DeviceEpoint = deviceEpoint;
- //娑堟伅
- if (myActionData.OperationEventCode == 2)
- {
- //涓存椂瀵嗙爜寮�閿佹垚鍔�
- data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg13);
- }
- else
- {
- //涓存椂瀵嗙爜寮�閿佸け璐�
- data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg14);
- }
- //鏃堕棿
- data.UnlockTime = myInfo.CreatedOnUtc;
- //涓婚敭
- data.MsgKeyId = myInfo.Id;
-
- listLog.Add(data);
+ //涓嶆槸鍚屼竴涓棬閿佺殑璁板綍
+ return;
}
+ var myActionData = Newtonsoft.Json.JsonConvert.DeserializeObject<PasswordOperationData>(jobject["Data"].ToString());
+ if (myActionData.UserID != 246)
+ {
+ //涓嶆槸涓存椂瀵嗙爜
+ return;
+ }
+ var data = new DoorHistoryLogInfo();
+ data.DeviceMac = deviceAddr;
+ data.DeviceEpoint = deviceEpoint;
+ //娑堟伅
+ if (myActionData.OperationEventCode == 2)
+ {
+ //涓存椂瀵嗙爜寮�閿佹垚鍔�
+ data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg13);
+ }
+ else
+ {
+ //涓存椂瀵嗙爜寮�閿佸け璐�
+ data.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg14);
+ }
+ //鏃堕棿
+ data.UnlockTime = i_msgData.CreateTime;
+ //涓婚敭
+ data.MsgKeyId = i_msgData.Id;
+
+ listLog.Add(data);
}
#endregion
@@ -866,50 +849,24 @@
/// <summary>
/// 娓呯┖鎵�鏈夎褰�
/// </summary>
- private async void ClearAllHistoryLog()
+ private void ClearAllHistoryLog()
{
- //鑾峰彇璁块棶浜戠鎺ュ彛鐨勫惎鍔ㄥ弬鏁�
- var pra = this.GetDeleteDataPra();
-
+ DateTime dateFrom = new DateTime(dateFromControl.Year, dateFromControl.Month, dateFromControl.Day, 0, 0, 0);
+ DateTime dateTo = new DateTime(dateToControl.Year, dateToControl.Month, dateToControl.Day, 23, 59, 59);
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/ClearDoorLockHistory", true, pra);
- if (result == false)
- {
- return;
- }
- //鍒犻櫎鍏朵粬娑堟伅
- if (listOtherMsgId.Count > 0)
- {
- var pra2 = new MessageReadStatuPra();
- pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- for (int i = 0; i < listOtherMsgId.Count; i++)
- {
- pra2.Id = listOtherMsgId[i];
- result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra2);
- if (result == false)
- {
- return;
- }
- }
- }
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- if (result == false)
- {
- return;
- }
+ //涓嶇缁撴灉
+ var result = HdlDeviceDoorLockLogic.Current.ClearAllDoorHistoryLog(this.GetDoorId(), dateFrom, dateTo, listOtherMsgId);
//娓呯┖
this.listOtherMsgId = new List<string>();
- this.listOtherUserId = new List<string>();
this.listHistoryInfo = null;
HdlThreadLogic.Current.RunMain(() =>
{
- this.listView.frameTable.RemoveAll();
- listView.frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(115 - 3);
+ //閲嶆柊鍒锋柊鐣岄潰
+ this.InitLogListInfo(true);
});
}
@@ -918,216 +875,17 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
- /// 鑾峰彇璁块棶浜戠鎺ュ彛鐨勫惎鍔ㄥ弬鏁�
+ /// 鑾峰彇璁块棶浜戠鐨凞oorID
/// </summary>
/// <returns></returns>
- private GetHistoryDataPra GetReadHistoryPra()
+ private string GetDoorId()
{
- DateTime dateFrom = new DateTime(dateFromControl.Year, dateFromControl.Month, dateFromControl.Day, 0, 0, 0);
- DateTime dateTo = new DateTime(dateToControl.Year, dateToControl.Month, dateToControl.Day, 23, 59, 59);
-
- //鍏ㄩ儴璇诲彇
- var pra = new GetHistoryDataPra();
- pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString();
- pra.UnlockTimeEnd = dateTo.ToUniversalTime().ToString();
- pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
-
- return pra;
- }
-
- /// <summary>
- /// 鑾峰彇鍒犻櫎鏁版嵁鐨勪簯绔帴鍙ｇ殑鍚姩鍙傛暟
- /// </summary>
- /// <returns></returns>
- private DeleteHistoryDataPra GetDeleteDataPra()
- {
- DateTime dateFrom = new DateTime(dateFromControl.Year, dateFromControl.Month, dateFromControl.Day, 0, 0, 0);
- DateTime dateTo = new DateTime(dateToControl.Year, dateToControl.Month, dateToControl.Day, 23, 59, 59);
-
- List<string> listUser = null;
- //鎸囧畾鐢ㄦ埛
- if (listSearchUserId.Contains("-1") == false)
- {
- listUser = new List<string>();
- listUser.AddRange(listSearchUserId);
- //濡傛灉鎸囧畾鏈夊叾浠�
- if (listSearchUserId.Contains("-9999") == true)
- {
- listUser.AddRange(this.listOtherUserId);
- }
- }
-
- //鍏ㄩ�夊垯涓簄ull
- List<int> listLock = null;
- if (listSearchLockId.Contains(-1) == false)
- {
- listLock = new List<int>();
- listLock.AddRange(listSearchLockId);
- }
-
- var pra = new DeleteHistoryDataPra();
- pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString();
- pra.UnlockTimeEnd = dateTo.ToUniversalTime().ToString();
- pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
- pra.CloudAccountIds = listUser;
- pra.OpenLockModes = listLock;
-
- return pra;
+ return this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;
}
#endregion
#region 鈻� 缁撴瀯浣揰____________________________
-
- /// <summary>
- /// 鑾峰彇鍘嗗彶璁板綍鏁版嵁
- /// </summary>
- private class GetHistoryDataPra : IfacePraCommon
- {
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Common.CommonPage.RequestVersion;
- /// <summary>
- /// Token
- /// </summary>
- public string LoginAccessToken = string.Empty;
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string HomeId = Common.Config.Instance.Home.Id;
- /// <summary>
- /// 闂ㄩ攣鐨凪ac鍦板潃
- /// </summary>
- public string DoorLockId = string.Empty;
- /// <summary>
- /// Config.Instance.Guid 鎴栬�� MemberInfoRes.SubAccountDistributedMark
- /// </summary>
- public List<string> CloudAccountIdArr = new List<string>();
- /// <summary>
- /// 寮�閿佹柟寮�(0:瀵嗙爜銆�15:鎸囩汗銆�3:IC鍗�)
- /// </summary>
- public List<int> OpenLockModeArr = null;
- /// <summary>
- /// 寮�閿佹槸鍚︽垚鍔�
- /// </summary>
- public bool? UnlockIsSuccess = null;
- /// <summary>
- /// 鎼滅储寮�閿佸紑濮嬫椂闂�
- /// </summary>
- public string UnlockTimeBegin;
- /// <summary>
- /// 鎼滅储寮�閿佺粨鏉熸椂闂�
- /// </summary>
- public string UnlockTimeEnd;
- /// <summary>
- /// 椤垫暟
- /// </summary>
- public PageSettingInfo PageSetting = new PageSettingInfo() { PageSize = 100 };
- }
-
- /// <summary>
- /// 鑾峰彇鍘嗗彶璁板綍鐨勭粨鏋�
- /// </summary>
- private class GetHistoryDataResult
- {
- /// <summary>
- /// 鏁版嵁
- /// </summary>
- public List<HistoryInfo> PageData = null;
- /// <summary>
- /// 鏄惁瀛樺湪涓嬩竴椤电殑鏁版嵁
- /// </summary>
- public bool HasNextPage = false;
- }
-
- /// <summary>
- /// 鍒犻櫎鍘嗗彶璁板綍鏁版嵁
- /// </summary>
- private class DeleteHistoryDataPra : IfacePraCommon
- {
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Common.CommonPage.RequestVersion;
- /// <summary>
- /// Token
- /// </summary>
- public string LoginAccessToken = string.Empty;
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string HomeId = Common.Config.Instance.Home.Id;
- /// <summary>
- /// 闂ㄩ攣鐨凪ac鍦板潃
- /// </summary>
- public string DoorLockId = string.Empty;
- /// <summary>
- /// Config.Instance.Guid 鎴栬�� MemberInfoRes.SubAccountDistributedMark
- /// </summary>
- public List<string> CloudAccountIds = null;
- /// <summary>
- /// 寮�閿佹柟寮�(0:瀵嗙爜銆�15:鎸囩汗銆�3:IC鍗�)
- /// </summary>
- public List<int> OpenLockModes = null;
- /// <summary>
- /// 鎼滅储寮�閿佸紑濮嬫椂闂�
- /// </summary>
- public string UnlockTimeBegin;
- /// <summary>
- /// 鎼滅储寮�閿佺粨鏉熸椂闂�
- /// </summary>
- public string UnlockTimeEnd;
- }
-
- /// <summary>
- /// 鍘嗗彶璁板綍鐨勭粨鏋�
- /// </summary>
- private class HistoryInfo
- {
- /// <summary>
- /// 寮�閿佹柟寮� 0:瀵嗙爜 15:鎸囩汗 3:IC鍗� 9000:甯稿紑妯″紡(鑷畾涔夌殑)
- /// </summary>
- public int OpenLockMode = -1;
- /// <summary>
- /// 寮�閿佹椂闂�
- /// </summary>
- public string UnlockTime = string.Empty;
- /// <summary>
- /// 寮�閿佹槸鍚︽垚鍔�
- /// </summary>
- public bool UnlockIsSuccess = false;
- /// <summary>
- /// 璐﹀彿鐨処D
- /// </summary>
- public string CloudAccountId = string.Empty;
- /// <summary>
- /// 鍏朵粬寮�閿佹柟寮�(OpenLockMode=9000鏃舵湁鏁�) 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画
- /// </summary>
- public int? OtherOpenLockMode = -1;
- /// <summary>
- /// 甯稿紑鎸佺画鏃堕棿(1~72灏忔椂 OtherOpenLockMode=9003鐨勬椂鍊欐湁鏁�)
- /// </summary>
- public string NormallyOpenContinuedTime = string.Empty;
- /// <summary>
- /// 褰撳紑閿佹柟寮忎负-1鏃朵娇鐢�,瀹冨睘浜庡叾浠栫被
- /// </summary>
- public string AlarmMsg = string.Empty;
- /// <summary>
- /// 褰撳紑閿佹柟寮忎负-1鏃朵娇鐢�,璁惧Mac
- /// </summary>
- public string DeviceMac = string.Empty;
- /// <summary>
- /// 褰撳紑閿佹柟寮忎负-1鏃朵娇鐢�,璁惧绔偣
- /// </summary>
- public int DeviceEpoint = 0;
- /// <summary>
- /// 褰撳紑閿佹柟寮忎负-1鏃朵娇鐢�,娑堟伅鐨勬暟鎹簱涓婚敭
- /// </summary>
- public string MsgKeyId = string.Empty;
- }
/// <summary>
/// 涓存椂瀵嗙爜鏁版嵁
--
Gitblit v1.8.0