合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 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));

            };