Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs

@@ -98,7 +98,7 @@


        #endregion



        #region ■ 屏幕亮度级别_______________________ 
        #region ■ 屏幕亮度级别_______________________

        /// <summary>

        /// 添加屏幕亮度级别控件

        /// </summary>

@@ -281,17 +281,17 @@
            btnLevelView.Y = Application.GetRealHeight(54);

            btnLevelView.Gravity = Gravity.CenterVertical;

            btnLevelView.TextID = R.MyInternationalizationString.BackgroundLightColor;

            frameBack.AddChidren(btnLevelView);

            frameBack.AddChidren(btnLevelView);



            var frameColor = new FrameLayoutStatuControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = this.GetPictrueRealSize(79);

            frameColor.Gravity = Gravity.CenterVertical;

            frameColor.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);

            //颜色
            frameBack.AddChidren(frameColor);



            //颜色

            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);

            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

@@ -299,14 +299,14 @@
            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);



            int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);

            int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);

            int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);

            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框 
            //颜色外框

            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = this.GetPictrueRealSize(79);

@@ -314,14 +314,14 @@
            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);



            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

@@ -330,7 +330,7 @@
            btnRight.Y += this.GetPictrueRealSize(8);



            frameColor.ButtonClickEvent += (sender, e) =>

            {
            {

                var form = new PanelColorSelectForm();

                form.AddForm(R1, G1, B1);

                form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>

@@ -350,7 +350,7 @@


        #endregion



        #region ■ 节能模式行_________________________ 
        #region ■ 节能模式行_________________________

        /// <summary>

        ///  添加节能模式行

        /// </summary>

@@ -513,18 +513,18 @@
                //关闭进度条

                this.CloseProgressBar(ShowReLoadMode.YES);

                return false;

            }
            }

            keyColorData = await HdlDevicePanelLogic.Current.GetPanelColorInfo(panelDevice);

            if (this.keyColorData == null)

            {

                //关闭进度条

                this.CloseProgressBar(ShowReLoadMode.YES);

                return false;

            }
            //关闭进度条
            }

            //关闭进度条

            this.CloseProgressBar();



            return true;
            return true;

        }



        #endregion

@@ -561,9 +561,9 @@
            {

                this.CloseProgressBar();

                return;

            }

            //设置按键面板颜色的信息
            }



            //设置按键面板颜色的信息

            result = await HdlDevicePanelLogic.Current.SetPanelColorInfo(panelDevice, this.keyColorData);

            this.CloseProgressBar();

            if (result == false)

@@ -572,10 +572,10 @@
            }

            //关闭自身

            this.CloseForm();

        }
        }

        #endregion


        #region ■ 补充容器___________________________ 


        #region ■ 补充容器___________________________

        /// <summary>

        /// 行数超过容器时，补一个空白FrameLayout，使之能滑动

        /// </summary>