合并新代码

xm

2020-04-15 bff8993501334c4f3c5f902216fe03253be747f8

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

@@ -369,7 +369,9 @@
                }

            }



            //延时

            //延时(半自动没有延时的概念)

            if (this.pirConfigure.mode == 1)

            {

            string strMinute = string.Empty;

            if (pirConfigure.transitionTime / 60 > 0)

            {

@@ -386,6 +388,7 @@
            {

                this.ShowDelayListTime(btnDelayView);

            };

            }



            //保存

            var btnSave = new BottomClickButton();