新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

 ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafeguardLogControl.cs

old mode 100755
new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;

using System.Text;



namespace Shared.Phone.UserCenter

namespace Shared.Phone
{

    /// <summary>

    /// 安防记录控件

@@ -79,7 +79,7 @@
            this.frameTable.AddChidren(btnDay);



            //线

            var btnLine = new NormalViewControl(Application.GetRealWidth(904), ControlCommonResourse.BottomLineHeight, false);

            var btnLine = new NormalViewControl(Application.GetRealWidth(904), HdlControlResourse.BottomLineHeight, false);
            btnLine.X = Application.GetRealWidth(29);

            btnLine.Y = Application.GetRealHeight(98);

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

@@ -329,12 +329,12 @@
            btnRoom.Text = alarmInfo.RoomName;

            rowFrame.AddChidren(btnRoom);

            //设备

            string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(alarmInfo.DeviceAddr, alarmInfo.DeviceEpoint);

            var device = Common.LocalDevice.Current.GetDevice(mainkeys);

            string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(alarmInfo.DeviceAddr, alarmInfo.DeviceEpoint);
            var device = HdlDeviceCommonLogic.Current.GetDevice(mainkeys);
            var btnDevice = new NormalViewControl(271, 58, true);

            btnDevice.X = Application.GetRealWidth(199);

            btnDevice.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnDevice.Text = device == null ? alarmInfo.DeviceName : Common.LocalDevice.Current.GetDeviceEpointName(device);

            btnDevice.Text = device == null ? alarmInfo.DeviceName : HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
            rowFrame.AddChidren(btnDevice);

            //报警信息

            var btnMsg = new NormalViewControl(303, 58, true);