合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 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);