合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs

@@ -107,7 +107,7 @@
            var btnIfRinght = frameIfRow.AddMostRightEmptyIcon(58, 58);

            frameIfRow.ChangedChidrenBindMode(btnIfRinght, ChidrenBindMode.NotBind);

            btnIfRinght.UseClickStatu = false;

            btnIfRinght.UnSelectedImagePath = "Item/Next.png";

            btnIfRinght.UnSelectedImagePath = "Item/RightNext.png";

            btnIfRinght.SelectedImagePath = "Item/Down.png";

            btnIfRinght.IsSelected = true;

            btnIfRinght.ButtonClickEvent += (sender, e) =>

@@ -180,7 +180,7 @@
            var btnResultRight = frameDo.AddMostRightEmptyIcon(58, 58);

            frameDo.ChangedChidrenBindMode(btnResultRight, ChidrenBindMode.NotBind);

            btnResultRight.UseClickStatu = false;

            btnResultRight.UnSelectedImagePath = "Item/Next.png";

            btnResultRight.UnSelectedImagePath = "Item/RightNext.png";

            btnResultRight.SelectedImagePath = "Item/Down.png";

            btnResultRight.IsSelected = true;

            btnResultRight.ButtonClickEvent += (sender, e) =>

@@ -440,7 +440,7 @@
            if (listOldData[0] != Lightconfigure.levelSize || listOldData[1] != Lightconfigure.transitionTime)

            {

                //保存灯光配置

                var result = await HdlDevicePirSensorLogic.Current.SetPirSensorLightSettion(this.deviceIASZone, this.Lightconfigure);

                var result = await HdlDevicePirSensorLogic.Current.SetPirSensorSettion(this.deviceIASZone, this.Lightconfigure);

                if (result == false)

                {

                    //关闭进度条