合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -75,6 +75,7 @@
            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");



            CommonPage.Instance.IsDrawerLockMode = false;
            base.RemoveFromParent();

        }

@@ -108,16 +109,6 @@
            };
            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()
            {
                Y = Application.GetRealHeight(60),
@@ -128,6 +119,7 @@
                UnSelectedImagePath = room.BackgroundImage
            };
            bodyFrameLayout.AddChidren(backGround);
            backGround.SetViewShadow(true);
            backGround.MouseUpEventHandler += backGroundIMGHander;

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

            var infoEdit = new Button
            {
@@ -188,7 +182,6 @@
            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) =>
@@ -300,7 +293,6 @@
            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 +300,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) =>
                {
@@ -515,6 +508,7 @@
                localPic.action = (imgPath) =>
                {
                    IconPathType = 0;
                    backGround.ImageBytes = null;
                    backGround.UnSelectedImagePath = imgPath;
                };
            };