代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

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

            }

        }

        /// <summary>

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

        /// </summary>

        public bool ChangedTextColor = true;



        #endregion



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

        }