请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -205,6 +205,7 @@
            }

            //让它处于5的整倍数

            this.pirConfigure.iasReportPeriod = (this.pirConfigure.iasReportPeriod / 5) * 5;

            int index = listTime.IndexOf(this.pirConfigure.iasReportPeriod + miao);



            //上报间隔

            var row3 = new FrameRowControl(listView.rowSpace / 2);

@@ -222,7 +223,7 @@
                    btnStatu3.Text = listTime[value];

                    this.pirConfigure.iasReportPeriod = Convert.ToInt32(listTime[value].Replace(miao, string.Empty));



                }, 0, btnCaption3.Text,

                }, index == -1 ? 0 : index, btnCaption3.Text,

                Language.StringByID(R.MyInternationalizationString.uFinish),

                Language.StringByID(R.MyInternationalizationString.uCancel));

            };

@@ -240,8 +241,8 @@
        {

            //打开进度条

            this.ShowProgressBar();

           
            //获取灯光的配置信息



            //获取PIR传感器的【配置信息】

            this.pirConfigure = await HdlDevicePirSensorLogic.Current.GetPirSensorLightSettion(this.iASZone);

            if (pirConfigure == null)

            {