新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -215,7 +215,7 @@
            btnOk.TextColor = UserCenterColor.Current.TextOrangeColor;

            frameText.AddChidren(btnOk, ChidrenBindMode.BindEvent);

            //底线

            var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), ControlCommonResourse.BottomLineHeight, false);

            var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), HdlControlResourse.BottomLineHeight, false);

            btnLine1.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            btnLine1.Gravity = Gravity.CenterHorizontal;

            btnLine1.Y = btnOk.Bottom - this.GetPictrueRealSize(8);

@@ -230,7 +230,7 @@
            frameText.AddChidren(btnDown, ChidrenBindMode.BindEvent);



            //底线

            var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), ControlCommonResourse.BottomLineHeight, false);

            var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), HdlControlResourse.BottomLineHeight, false);

            btnLine2.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            btnLine2.Gravity = Gravity.CenterHorizontal;

            btnLine2.Y = btnDown.Bottom - this.GetPictrueRealSize(8);

@@ -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) =>

            {

@@ -324,7 +334,7 @@
            btnOk.TextColor = UserCenterColor.Current.TextOrangeColor;

            frameText.AddChidren(btnOk, ChidrenBindMode.BindEvent);

            //底线

            var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), ControlCommonResourse.BottomLineHeight, false);

            var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), HdlControlResourse.BottomLineHeight, false);

            btnLine1.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            btnLine1.Gravity = Gravity.CenterHorizontal;

            btnLine1.Y = btnOk.Bottom - this.GetPictrueRealSize(8);

@@ -339,7 +349,7 @@
            frameText.AddChidren(btnDown, ChidrenBindMode.BindEvent);



            //底线

            var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), ControlCommonResourse.BottomLineHeight, false);

            var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), HdlControlResourse.BottomLineHeight, false);

            btnLine2.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            btnLine2.Gravity = Gravity.CenterHorizontal;

            btnLine2.Y = btnDown.Bottom - this.GetPictrueRealSize(8);

@@ -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,16 +466,23 @@
        /// <returns></returns>

        private bool InitCurtainDefultData()

        {

            this.curtainData = new CurtainData();

            //如果当前是虚拟住宅

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

            {

                var data = HdlTemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);

                curtainData.Direction = data.Direction;

                return true;

            }



            //开启进度条

            this.ShowProgressBar();



            this.curtainData = new CurtainData();



            bool receiptData = false;

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

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

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("CurtainDeviceAttribute", ReceiveComandDiv.A设备属性上报, (device) =>

            {

                string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);

                string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);

                if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)

                {

                    return;

@@ -492,7 +524,7 @@
                //获取窗帘方向与限位设置失败

                string msg = Language.StringByID(R.MyInternationalizationString.uGetCurtainDirectionAndLimitSettionFail);

                //拼接上【网关回复超时】的Msg

                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");

                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, null, "回复超时");

                this.ShowMassage(ShowMsgType.Tip, msg);

                return false;

            }