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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs

@@ -45,6 +45,10 @@
                }

            }

        }

        /// <summary>

        /// 处于非选中状态时，是否把字体变成灰色(默认变成灰色)

        /// </summary>

        public bool ChangedTextColor = true;



        #endregion



@@ -54,7 +58,7 @@
        /// 做成一个简单的选择控件

        /// </summary>

        /// <param name="i_text">显示文本</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public NormalSelectControl(string i_text, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

            this.textValue = i_text;

@@ -63,8 +67,15 @@
        /// <summary>

        /// 初始化内部控件

        /// </summary>

        public void InitControl()

        /// <param name="iconParh">左侧图标</param>

        public void InitControl(string iconParh = "")

        {

            //图片

            if (iconParh != "")

            {

                var btnIcon = this.AddLeftIcon();

                btnIcon.UnSelectedImagePath = iconParh;

            }

            //显示文本

            btnText = this.AddLeftCaption(this.textValue, 600);

            btnText.TextColor = UserCenterColor.Current.TextGrayColor3;

@@ -88,7 +99,10 @@
                return;

            }

            btnSelect.Visible = true;

            btnText.TextColor = UserCenterColor.Current.TextColor1;

            if (this.ChangedTextColor == true)

            {

                btnText.TextColor = UserCenterColor.Current.TextColor1;

            }

            //状态变更

            Statu = StatuMode.SELECT;

        }

@@ -103,7 +117,10 @@
                return;

            }

            btnSelect.Visible = false;

            btnText.TextColor = UserCenterColor.Current.TextGrayColor3;

            if (this.ChangedTextColor == true)

            {

                btnText.TextColor = UserCenterColor.Current.TextGrayColor3;

            }

            //状态变更

            Statu = StatuMode.UN_SELECT;

        }