新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

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

@@ -132,7 +132,7 @@
                catch (Exception ex)

                {

                    //Log出力

                    string msg = "当前激活的界面[" + UserCenterResourse.NowActionFormID + "]";

                    string msg = "当前激活的界面[" + HdlFormLogic.Current.NowActionFormID + "]";

                    HdlLogLogic.Current.WriteLog(ex, msg);

                    //电机数据异常,确认已经安装导轨后,请重置电机

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uCurtainDataIsErrorPleaseResetCurtain));

@@ -249,7 +249,7 @@
        {

            //开限位

            var btnProgressView = new NormalViewControl(200, 50, true);

            btnProgressView.X = ControlCommonResourse.XXLeft;

            btnProgressView.X = HdlControlResourse.XXLeft;

            btnProgressView.Y = Application.GetRealHeight(78);

            btnProgressView.TextSize = 12;

            btnProgressView.TextColor = UserCenterColor.Current.TextGrayColor1;

@@ -274,7 +274,7 @@
            frameBack.AddChidren(openSeekBar);



            var btnTemp1 = new NormalViewControl(200, 50, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

            btnTemp1.X = HdlControlResourse.XXLeft;

            btnTemp1.Y = btnProgressView.Bottom + Application.GetRealHeight(115);

            btnTemp1.TextSize = 12;

            btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;

@@ -289,8 +289,8 @@
            btnTemp2.Text = "100%";

            frameBack.AddChidren(btnTemp2);

            //线

            var btnLine = new NormalViewControl(frameBack.Width - ControlCommonResourse.XXLeft * 2, ControlCommonResourse.BottomLineHeight, false);

            btnLine.X = ControlCommonResourse.XXLeft;

            var btnLine = new NormalViewControl(frameBack.Width - HdlControlResourse.XXLeft * 2, HdlControlResourse.BottomLineHeight, false);

            btnLine.X = HdlControlResourse.XXLeft;

            btnLine.Y = btnTemp2.Bottom + Application.GetRealHeight(156);

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frameBack.AddChidren(btnLine);

@@ -431,7 +431,7 @@
        {

            //合限位

            var btnProgressView = new NormalViewControl(200, 50, true);

            btnProgressView.X = ControlCommonResourse.XXLeft;

            btnProgressView.X = HdlControlResourse.XXLeft;

            btnProgressView.Y = Application.GetRealHeight(536);

            btnProgressView.TextSize = 12;

            btnProgressView.TextColor = UserCenterColor.Current.TextGrayColor1;

@@ -456,7 +456,7 @@
            frameBack.AddChidren(closeSeekBar);



            var btnTemp1 = new NormalViewControl(200, 50, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

            btnTemp1.X = HdlControlResourse.XXLeft;

            btnTemp1.Y = btnProgressView.Bottom + Application.GetRealHeight(115);

            btnTemp1.TextSize = 12;

            btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;

@@ -471,8 +471,8 @@
            btnTemp2.Text = "100%";

            frameBack.AddChidren(btnTemp2);

            //线

            var btnLine = new NormalViewControl(frameBack.Width - ControlCommonResourse.XXLeft * 2, ControlCommonResourse.BottomLineHeight, false);

            btnLine.X = ControlCommonResourse.XXLeft;

            var btnLine = new NormalViewControl(frameBack.Width - HdlControlResourse.XXLeft * 2, HdlControlResourse.BottomLineHeight, false);

            btnLine.X = HdlControlResourse.XXLeft;

            btnLine.Y = btnTemp2.Bottom + Application.GetRealHeight(156);

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frameBack.AddChidren(btnLine);

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

                curtainData.CurtainLength = data.curtainLength;

                curtainData.OpenLimitValue = data.upLimit;

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



            int receiptDataCount = 0;

            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;

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

            }

@@ -790,10 +790,10 @@
            {

                HdlGatewayReceiveLogic.Current.RemoveEvent("ReceiveLimitData");

            }

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

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

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

            {

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

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

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

                {

                    return;