合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs

@@ -389,12 +389,12 @@
            if (this.dateFromControl.dateValue == this.dateToControl.dateValue)

            {

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

                frameTable.AddMostRightView(Convert.ToDateTime(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);

                frameTable.AddMostRightView(UserCenterLogic.ConvertUtcTimeToLocalTime(historyInfo.UnlockTime).ToString("HH:mm:ss"), 400);

            }

            else

            {

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

                frameTable.AddMostRightView(Convert.ToDateTime(historyInfo.UnlockTime).ToString("yyyy/MM/dd HH:mm:ss"), 700);

                frameTable.AddMostRightView(UserCenterLogic.ConvertUtcTimeToLocalTime(historyInfo.UnlockTime).ToString("yyyy/MM/dd HH:mm:ss"), 700);

            }



            if (addLine == true)

@@ -596,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("");

@@ -625,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;

        }