新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs

@@ -66,7 +66,7 @@
            if (((LightBase)this.device).OnOffStatus == 1)

            {

                //亮度 XX

                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));

            }

            else

            {

@@ -81,7 +81,7 @@
            btnLightView.Y = Application.GetRealHeight(320);

            frameWhiteBack.AddChidren(btnLightView);

            //底线

            var btnLightLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);

            var btnLightLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);

            btnLightLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            btnLightLine.X = btnLightView.X;

            btnLightLine.Y = btnLightView.Bottom + Application.GetRealHeight(37);

@@ -108,7 +108,7 @@
            btnColorView.Y = btnLightLine.Y + Application.GetRealHeight(107);

            frameWhiteBack.AddChidren(btnColorView);

            //底线

            var btnColorLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);

            var btnColorLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);

            btnColorLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            btnColorLine.X = btnColorView.X;

            btnColorLine.Y = btnColorView.Bottom + Application.GetRealHeight(37);

@@ -150,7 +150,7 @@
            btnBuzzerView.Y = btnColorLine.Y + Application.GetRealHeight(107);

            frameWhiteBack.AddChidren(btnBuzzerView);

            //底线

            var btnBuzzerLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);

            var btnBuzzerLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);

            btnBuzzerLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            btnBuzzerLine.X = btnBuzzerView.X;

            btnBuzzerLine.Y = btnBuzzerView.Bottom + Application.GetRealHeight(37);

@@ -178,7 +178,7 @@
            btnMiniView.Y = btnBuzzerLine.Y + Application.GetRealHeight(107);

            frameWhiteBack.AddChidren(btnMiniView);

            //底线

            var btnMiniLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);

            var btnMiniLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);

            btnMiniLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            btnMiniLine.X = btnMiniView.X;

            btnMiniLine.Y = btnMiniView.Bottom + Application.GetRealHeight(37);

@@ -228,7 +228,7 @@
                    //如果住宅为虚拟住宅,直接改缓存

                    ((ColorTemperatureLight)this.device).Level = value * MaxLevel / 100;

                    //亮度 XX

                    this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                    this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));

                }

            };



@@ -412,10 +412,10 @@
        private void AddReceiveBuzzerAckEvent()

        {

            //Ack主题上报

            string mainKeys = LocalDevice.Current.GetDeviceMainKeys(this.device);

            string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.device);

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceBuzzerDetailCardACK", ReceiveComandDiv.A节点控制反馈, (report) =>

            {

                string mainKey2 = LocalDevice.Current.GetDeviceMainKeys(report);

                string mainKey2 = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);

                if (mainKeys != mainKey2)

                {

                    //不是同一个东西

@@ -474,7 +474,7 @@
            if (isOpen == true)

            {

                //亮度是必须要刷新的  亮度 XX

                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));

                if (this.btnMiniSwitch.IsSelected == false)

                {

                    this.btnMiniSwitch.IsSelected = true;