合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs

@@ -120,7 +120,7 @@
                listText.Add(Language.StringByID(R.MyInternationalizationString.uReverseDirection));//反向



                var form = new BottomItemSelectForm();

                form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, nowSelectNo);

                form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, null, nowSelectNo);

                form.FinishSelectEvent += (index) =>

                {

                    //变更方向

@@ -241,6 +241,11 @@
            {

                curtainDevice.CurtainUpDownStopControl(1);

            };

            //展示模板或者虚拟住宅,则无效

            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)

            {

                frameIconback.CanClick = false;

            }

            //重写控件点击效果

            frameIconback.SelectStatuEvent += (select) =>

            {

@@ -265,6 +270,11 @@
                    await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit, -1, -1);

                });

            };

            //展示模板或者虚拟住宅,则无效

            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)

            {

                frameText.CanClick = false;

            }

            //重写控件点击效果

            frameText.SelectStatuEvent += (select) =>

            {

@@ -350,6 +360,11 @@
            {

                curtainDevice.CurtainUpDownStopControl(0);

            };

            //展示模板或者虚拟住宅,则无效

            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)

            {

                frameIconback.CanClick = false;

            }

            //重写控件点击效果

            frameIconback.SelectStatuEvent += (select) =>

            {

@@ -374,6 +389,11 @@
                    await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit, -1, -1);

                });

            };

            //展示模板或者虚拟住宅,则无效

            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)

            {

                frameText.CanClick = false;

            }

            //重写控件点击效果

            frameText.SelectStatuEvent += (select) =>

            {

@@ -429,6 +449,11 @@
                    });

                });

            };

            //展示模板或者虚拟住宅,则无效

            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)

            {

                rowReset.CanClick = false;

            }

        }



        #endregion

@@ -441,10 +466,17 @@
        /// <returns></returns>

        private bool InitCurtainDefultData()

        {

            this.curtainData = new CurtainData();

            //如果当前是虚拟住宅

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

            {

                var data = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);

                curtainData.Direction = data.Direction;

                return true;

            }



            //开启进度条

            this.ShowProgressBar();



            this.curtainData = new CurtainData();



            bool receiptData = false;

            string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);