？？？？？？？

黄学彪

2020-03-23 cc0d80c7d86c6d0167269b3408c4b30c24ce84e9

 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(UserCenterLogic.ConvertUtcTimeToLocalTime(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);

            }

            else

            {

                //如果日期范围不一样,则显示年月日

                frameTable.AddMostRightView(UserCenterLogic.ConvertUtcTimeToLocalTime(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);

@@ -483,8 +486,8 @@
                {

                    return null;

                }

                var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);

                foreach (var myInfo in dataInfo.PageData)

                var dataInfo2 = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);

                foreach (var myInfo in dataInfo2.PageData)

                {

                    var data = new HistoryInfo();

                    if (dic.ContainsKey(myInfo.CreatedOnUtc) == false)

@@ -593,17 +596,23 @@
            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);



            //全选则为null

            List<string> listUser = null;

            List<string> listUser = new List<string>();

            if (listSearchUserId.Count == 1 && listSearchUserId[0] == "")

            {

                //如果单纯的只是选择其他,则让检索条件不成立即可

                listUser = new List<string>();

                listUser.Add("其他");

            }

            else if (listSearchUserId.Contains("-1") == false)

            else if (listSearchUserId.Contains("-1") == true)

            {

                listUser = new List<string>();

                //全选

                for (int i = 0; i < listMenberInfo.Count; i++)

                {

                    listUser.Add(listMenberInfo[i].SubAccountDistributedMark);

                }

            }

            else

            {

                //指定用户

                listUser.AddRange(listSearchUserId);

                //移除其他,因为云端固定会给

                listUser.Remove("");

@@ -622,8 +631,8 @@
            pra.DoorLockId = this.DeviceDoor.DeviceAddr + "_" + this.DeviceDoor.DeviceEpoint;

            pra.CloudAccountIdArr = listUser;

            pra.OpenLockModeArr = listLock;

            pra.UnlockTimeBegin = dateFrom.ToString();

            pra.UnlockTimeEnd = dateTo.ToString();

            pra.UnlockTimeBegin = dateFrom.ToUniversalTime().ToString(); 
            pra.UnlockTimeEnd = dateTo.ToUniversalTime().ToString();

            return pra;

        }