上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs

@@ -17,7 +17,7 @@
        private bool m_CanClick = true;

        /// <summary>

        /// 设置能否触点击事件

        /// </summary>
        /// </summary>

        public bool CanClick

        {

            get { return m_CanClick; }

@@ -82,8 +82,8 @@
        /// <summary>

        /// 初始化控件大小(不以平均值进行真实数值计算)

        /// </summary>

        /// <param name="i_Width">宽度</param>
        /// <param name="i_Height">高度</param>
        /// <param name="i_Width">宽度</param>

        /// <param name="i_Height">高度</param>

        /// <param name="real">是否计算真实值</param>

        public void InitSize(int i_Width, int i_Height, bool real = true)

        {

@@ -91,50 +91,50 @@
            {

                i_Width = Application.GetRealWidth(i_Width);

                i_Height = Application.GetRealHeight(i_Height);

            }
            this.Height = i_Height;
            }

            this.Height = i_Height;

            this.Width = i_Width;

        }



        /// <summary>

        /// 初始化控件大小(不以平均值进行真实数值计算)

        /// </summary>

        /// <param name="i_Width">宽度</param>
        /// <param name="i_Width">宽度</param>

        /// <param name="real">是否计算真实值</param>

        public void InitSize(int i_Width, bool real = false)

        {

            if (real == true)

            {

                i_Width = Application.GetRealWidth(i_Width);

            }

            this.Height = ControlCommonResourse.NormalControlHeight;
            }



            this.Height = ControlCommonResourse.NormalControlHeight;

            this.Width = i_Width;

        }



        /// <summary>

        /// 初始化图标控件大小(以平均值进行真实数值计算)

        /// </summary>

        /// <param name="i_Width">宽度</param>
        /// <param name="i_Height">高度</param>
        /// <param name="i_Width">宽度</param>

        /// <param name="i_Height">高度</param>

        /// <param name="real">是否计算真实值</param>

        public void InitIconSize(int i_Width, int i_Height, bool real = true)

        {

            if (real == true)

            {

                i_Width = Application.GetMinRealAverage(i_Width);

                i_Height = Application.GetMinRealAverage(i_Height);

            }

            this.Height = i_Height;
                i_Width = this.GetPictrueRealSize(i_Width);

                i_Height = this.GetPictrueRealSize(i_Height);

            }



            this.Height = i_Height;

            this.Width = i_Width;

        }



        /// <summary>

        /// 初始化图片控件大小

        /// </summary>

        /// <param name="i_Width">宽度</param>
        /// <param name="i_Height">高度</param>
        /// <param name="i_Width">宽度</param>

        /// <param name="i_Height">高度</param>

        /// <param name="real">是否计算真实值</param>

        public void InitPictrueSize(int i_Width, int i_Height, bool real = true)

        {

@@ -142,9 +142,9 @@
            {

                i_Width = HdlControlLogic.Current.GetPictrueRealSize(i_Width);

                i_Height = HdlControlLogic.Current.GetPictrueRealSize(i_Height);

            }

            this.Height = i_Height;
            }



            this.Height = i_Height;

            this.Width = i_Width;

        }



@@ -319,6 +319,16 @@
#endif

        }



        /// <summary>

        /// 计算图片的真实高宽度

        /// </summary>

        /// <param name="i_size"></param>

        /// <returns></returns>

        public int GetPictrueRealSize(int i_size)

        {

            return HdlControlLogic.Current.GetPictrueRealSize(i_size);

        }



        #endregion



        #region ■ Log出力____________________________