新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

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

@@ -334,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);

@@ -349,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);

@@ -470,7 +470,7 @@
            //如果当前是虚拟住宅

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

            {

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

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

                curtainData.Direction = data.Direction;

                return true;

            }

@@ -479,10 +479,10 @@
            this.ShowProgressBar();



            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;

@@ -524,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;

            }