2019.12.13

gxc

2019-12-13 eb424d24e39bab4a245725f35deab3f234ea0f13

 ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs

@@ -29,7 +29,7 @@
        /// <summary>
        /// backGround
        /// </summary>
        private Button backGround;
        private ImageView backGround;
        /// <summary>
        /// IconPathType
        /// </summary>
@@ -60,7 +60,7 @@
            room = r;
            IconPathType = r.BackgroundImageType;
            OldIconPathType= r.BackgroundImageType;
            if (IconPathType != 1)
            if (IconPathType != 0)
            {
                OldBackgroundImagePath = r.BackgroundImage;
            }
@@ -72,9 +72,10 @@

        public override void RemoveFromParent()

        {

            HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");

            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");



            CommonPage.Instance.IsDrawerLockMode = false;

            base.RemoveFromParent();

        }

@@ -108,26 +109,21 @@
            };
            AddChidren(bodyFrameLayout);

            var imgFL = new Button
            {
                Y = Application.GetRealHeight(60),
                Width = Application.GetMinRealAverage(916),
                Height = Application.GetMinRealAverage(487),
                Gravity = Gravity.CenterHorizontal,
                UnSelectedImagePath = "Room/Room_Rectangle.png"
            };
            bodyFrameLayout.AddChidren(imgFL);

            backGround = new Button()
            backGround = new ImageView()
            {
                Y = Application.GetRealHeight(60),
                Width = Application.GetMinRealAverage(887),
                Height = Application.GetMinRealAverage(444),
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
                UnSelectedImagePath = room.BackgroundImage
                ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage)
            };
            bodyFrameLayout.AddChidren(backGround);
            backGround.SetViewShadow(true);
            if (room.BackgroundImageType != 0)
            {
                backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(backGround.ImagePath);
            }
            backGround.MouseUpEventHandler += backGroundIMGHander;

            var infoFL = new FrameLayout
@@ -137,6 +133,8 @@
                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
            };
            bodyFrameLayout.AddChidren(infoFL);
            var rectCornerID = HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight;
            infoFL.SetCornerWithSameRadius(Application.GetRealHeight(50), rectCornerID);

            var infoEdit = new Button
            {
@@ -156,39 +154,43 @@
            nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.RoomName)} :");
            nameRow.SetTitle(room.Name);
            infoFL.AddChidren(nameRow);
            if(room.IsLove)
            {
                nameRow.NameText.Enable = false;
            }

            var floorRow = new DeviceInfoRow(308);
            floorRow.Init();
            floorRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongFloor)} :");
            infoFL.AddChidren(floorRow);
            if (!room.IsLove)
            if (Config.Instance.Home.FloorDics.Count > 0 && room.IsLove == false)
            {
                floorRow.SetTitle(room.FloorName);
                floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
                {
                    if (Config.Instance.Home.FloorDics != null)
                    {
                        List<string> floorIds = new List<string> { };
                        List<string> floorNames = new List<string> { };
                        foreach (var floor in Config.Instance.Home.FloorDics)
                        {
                            floorIds.Add(floor.Key);
                            floorNames.Add(floor.Value);
                        }

                        PickerView.Show(floorNames, (index) =>
                        {
                            room.FloorId = floorIds[index];
                            floorRow.SetTitle(room.FloorName);
                        }, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
                    }
                };
                infoFL.AddChidren(floorRow);
            }
            
            floorRow.SetTitle(room.FloorName);
            floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
            {
                if (Config.Instance.Home.FloorDics != null)
                {
                    List<string> floorIds = new List<string> { };
                    List<string> floorNames = new List<string> { };
                    foreach (var floor in Config.Instance.Home.FloorDics)
                    {
                        floorIds.Add(floor.Key);
                        floorNames.Add(floor.Value);
                    }

                    PickerView.Show(floorNames, (index) =>
                    {
                        room.FloorId = floorIds[index];
                        floorRow.SetTitle(room.FloorName);
                    }, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
                }
            };


            var temperatureRow = new DeviceInfoRow(446);
            temperatureRow.Init();
            temperatureRow.SetTipTitle(R.MyInternationalizationString.Temperature);
            temperatureRow.SetTitle("26.8℃");
            temperatureRow.NameText.TextAlignment = TextAlignment.CenterRight;
            infoFL.AddChidren(temperatureRow);
            temperatureRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
@@ -206,8 +208,8 @@
                    }
                    room.TemperatrueDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";

                    HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
                    HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
                    HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
                    HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice",  ReceiveComandDiv.A设备属性上报, (Action<ZigBee.Device.CommonDevice>)((report) =>
                    {
                        string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                        if (room.TemperatrueDevice != mainKeys)
@@ -215,7 +217,7 @@
                            return;
                        }
                        //移除掉事件
                        HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
                        HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

                        foreach (var data in report.DeviceStatusReport.AttriBute)
                        {
@@ -248,11 +250,10 @@
                    (selectTemp as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
                };
            };

            if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
            {
                HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
                HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
                HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
                HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice",  ReceiveComandDiv.A设备属性上报, (Action<ZigBee.Device.CommonDevice>)((report) =>
                {
                    string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                    if (room.TemperatrueDevice != mainKeys)
@@ -260,7 +261,7 @@
                        return;
                    }
                    //移除掉事件
                    HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
                    HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

                    foreach (var data in report.DeviceStatusReport.AttriBute)
                    {
@@ -297,10 +298,10 @@
                }
            }


            var humidityRow = new DeviceInfoRow(585);
            humidityRow.Init();
            humidityRow.SetTipTitle(R.MyInternationalizationString.Humidity);
            humidityRow.SetTitle("66.5%");
            humidityRow.NameText.TextAlignment = TextAlignment.CenterRight;
            infoFL.AddChidren(humidityRow);
            humidityRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
@@ -308,6 +309,7 @@
                var tem = new RoomHumiditySetting { };
                HomePage.Instance.AddChidren(tem);
                HomePage.Instance.PageIndex += 1;
                tem.tempDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
                tem.Show(room);
                tem.selectDeviceAction = (selectTemp) =>
                {
@@ -317,8 +319,8 @@
                    }
                    room.HumidityDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";

                    HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
                    HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
                    HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
                    HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice",  ReceiveComandDiv.A设备属性上报, (report) =>
                    {
                        string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                        if (room.HumidityDevice != mainKeys)
@@ -326,7 +328,7 @@
                            return;
                        }
                        //移除掉事件
                        HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
                        HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
                        foreach (var data in report.DeviceStatusReport.AttriBute)
                        {
                            if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -352,8 +354,8 @@
            };
            if (string.IsNullOrEmpty(room.HumidityDevice) == false)
            {
                HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
                HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
                HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
                HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice",  ReceiveComandDiv.A设备属性上报, (report) =>
                {
                    string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                    if (room.HumidityDevice != mainKeys)
@@ -361,7 +363,7 @@
                        return;
                    }
                    //移除掉事件
                    HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
                    HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
                    foreach (var data in report.DeviceStatusReport.AttriBute)
                    {
                        if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -389,6 +391,11 @@
                }
            }

            if (Config.Instance.Home.FloorDics.Count == 0 || room.IsLove)
            {
                temperatureRow.Y = Application.GetRealHeight(308);
                humidityRow.Y= Application.GetRealHeight(446);
            }

            var confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
            confirm.SetTitle(R.MyInternationalizationString.Confrim);
@@ -396,20 +403,20 @@
            confirm.MouseUpEventHandler += (sender, e) =>
            {
                var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
                var fileName = $"Room_{tradeTime}";
                var fileName = $"RoomIcon_{tradeTime}.png";
                room.Name = nameRow.NameText.Text.Trim();
                if (OldIconPathType != 1)
                if (OldIconPathType != 0)
                {
                    Shared.IO.FileUtils.DeleteFile(OldBackgroundImagePath);
                    Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath,OldBackgroundImagePath));
                }
                if (IconPathType == 0)
                {
                    room.BackgroundImage = backGround.UnSelectedImagePath;
                    room.BackgroundImage = backGround.ImagePath;
                }
                else
                {
                    Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
                    room.BackgroundImage = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
                    room.BackgroundImage = fileName;
                }
                room.BackgroundImageType = IconPathType;
                room.Save();
@@ -515,25 +522,26 @@
                localPic.action = (imgPath) =>
                {
                    IconPathType = 0;
                    backGround.UnSelectedImagePath = imgPath;
                    backGround.ImageBytes = null;
                    backGround.ImagePath = imgPath;
                };
            };
            selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
            {
                selectFL.RemoveFromParent();
                var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
                var fileName = $"Room_{tradeTime}";
                var fileName = $"RoomIcon_{tradeTime}.png";
                //通过相机拍照裁剪
                CropImage.TakePicture((imagePath) =>
                {
                    if (IconPathType != 0)
                    {
                        Global.DeleteFilebyHomeId(backGround.UnSelectedImagePath);
                        Global.DeleteFilebyHomeId(backGround.ImagePath);
                    }

                    IconPathType = 1;
                    backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
                    backGround.UnSelectedImagePath = imagePath;
                    backGround.ImagePath = imagePath;
                    System.IO.File.Delete(imagePath);

                }, fileName, 2, 1);
@@ -549,12 +557,12 @@
                {
                    if (IconPathType != 0)
                    {
                        Global.DeleteFilebyHomeId(backGround.UnSelectedImagePath);
                        Global.DeleteFilebyHomeId(backGround.ImagePath);
                    }

                    IconPathType = 2;
                    backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
                    backGround.UnSelectedImagePath = imagePath;
                    backGround.ImagePath = imagePath;
                    System.IO.File.Delete(imagePath);

                }, fileName, 2, 1);