Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -132,7 +132,7 @@
            row1.ButtonClickEvent += (sender, e) =>

            {

                var form = new BottomItemSelectForm();

                form.AddForm(btnCaption1.Text, listSelect, this.pirConfigure.mode == 0 ? 1 : 0);

                form.AddForm(btnCaption1.Text, listSelect, null, this.pirConfigure.mode == 0 ? 1 : 0);

                form.FinishSelectEvent += (value) =>

                {

                    this.isDataChanged = true;

@@ -170,7 +170,7 @@
            row2.ButtonClickEvent += (sender, e) =>

            {

                var form = new BottomItemSelectForm();

                form.AddForm(btnCaption2.Text, listSelect, this.pirConfigure.type);

                form.AddForm(btnCaption2.Text, listSelect, null, this.pirConfigure.type);

                form.FinishSelectEvent += (value) =>

                {

                    this.isDataChanged = true;