合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaExistSensorForm.cs

@@ -99,7 +99,7 @@
        /// <param name="addLine">是否添加底线</param>

        private void AddRowLayout(Safeguard.ZoneDeviceListData sensorInfo, bool addLine)

        {

            CommonDevice device = HdlDeviceCommonLogic.Current.GetDevice(sensorInfo.MacAddr, sensorInfo.Epoint);

            CommonDevice device = Common.LocalDevice.Current.GetDevice(sensorInfo.MacAddr, sensorInfo.Epoint);

            if (device == null)

            {

                return;

@@ -120,9 +120,9 @@


            //旁路设置

            var btnBypass = new NormalViewControl(Application.GetRealWidth(184), rowLayout.Height, false);

            btnBypass.TextID = R.MyInternationalizationString.uBypass;

            btnBypass.BackgroundColor = 0xff4a4a4a;

            btnBypass.TextColor = UserCenterColor.Current.TextColor3;

            btnBypass.TextID = R.MyInternationalizationString.uBypass;
            btnBypass.BackgroundColor = 0xff4a4a4a;
            btnBypass.TextColor = UserCenterColor.Current.TextColor3;
            btnBypass.TextAlignment = TextAlignment.Center;

            btnBypass.TextSize = 12;

            if (sensorInfo.IsBypass == 1)

@@ -141,9 +141,9 @@


            //删除

            var btnDelete = new NormalViewControl(Application.GetRealWidth(184), rowLayout.Height, false);

            btnDelete.TextID = R.MyInternationalizationString.uDelete;

            btnDelete.BackgroundColor = 0xfff75858;

            btnDelete.TextColor = UserCenterColor.Current.TextColor3;

            btnDelete.TextID = R.MyInternationalizationString.uDelete;
            btnDelete.BackgroundColor = 0xfff75858;
            btnDelete.TextColor = UserCenterColor.Current.TextColor3;
            btnDelete.TextAlignment = TextAlignment.Center;

            btnDelete.TextSize = 12;

            rowLayout.AddRightView(btnDelete);

@@ -257,7 +257,7 @@
        private List<CommonDevice> GetCanAddSensorDevice()

        {

            List<CommonDevice> listNew = new List<CommonDevice>();

            List<CommonDevice> listDevices = HdlDeviceCommonLogic.Current.listAllDevice;

            List<CommonDevice> listDevices = Common.LocalDevice.Current.listAllDevice;

            foreach (CommonDevice device in listDevices)

            {

                //只要传感器