新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -41,10 +41,10 @@
            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uWorkMode));



            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //获取初始数据

                var result = await this.GetDeviceAllDefultData();

                var result = this.GetDeviceAllDefultData();

                if (result == false)

                {

                    return;

@@ -103,6 +103,11 @@
                    this.SavePirSensorData();

                });

            };

            //查看模板时,不允许编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                btnSave.CanClick = false;

            }

        }



        #endregion

@@ -132,7 +137,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;

@@ -141,6 +146,11 @@
                    this.pirConfigure.mode = value == 0 ? 1 : 0;

                };

            };

            //查看模板时,不允许编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                row1.CanClick = false;

            }

        }



        #endregion

@@ -170,7 +180,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;

@@ -185,6 +195,11 @@
                    }

                };

            };

            //查看模板时,不允许编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                row2.CanClick = false;

            }

        }



        #endregion

@@ -227,6 +242,11 @@
                Language.StringByID(R.MyInternationalizationString.uFinish),

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

            };

            //查看模板时,不允许编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                row3.CanClick = false;

            }

        }



        #endregion

@@ -237,7 +257,7 @@
        /// 获取初始数据

        /// </summary>

        /// <returns></returns>

        private async Task<bool> GetDeviceAllDefultData()

        private bool GetDeviceAllDefultData()

        {

            //打开进度条

            this.ShowProgressBar();