合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs

@@ -24,6 +24,10 @@
        /// </summary>
        public bool UseClickStatu = true;

        /// <summary>

        /// 能否点击

        /// </summary>

        public bool CanClick = true;

        /// <summary>

        /// 原来的背景色

        /// </summary>
        private uint oldBackColor = 0;
@@ -35,17 +39,6 @@
        /// 子控件Y轴偏移量(共通定义而已)

        /// </summary>

        public int chidrenYaxis = 0;



        /// <summary>

        /// 圆角度(安卓和IOS或许需要预编译)

        /// </summary>

        public uint RadiusEx

        {

            set

            {

                this.Radius = value;

            }

        }



        #endregion


@@ -61,14 +54,6 @@


            this.MouseUpEventHandler += ChildrenUpEvent;

            this.MouseDownEventHandler += ChildrenDownEvent;
        }



        /// <summary>

        /// 做成一个普通的FrameLayout控件

        /// </summary>

        /// <param name="flage">没啥用的东西</param>
        public FrameLayoutControl(bool flage)
        {
        }



        #endregion
@@ -215,7 +200,7 @@
        /// <param name="e">E.</param>
        private void ChildrenDownEvent(object sender, MouseEventArgs e)
        {

            if (this.UseClickStatu == false)

            if (this.UseClickStatu == false|| this.CanClick == false)

            {

                return;

            }

@@ -229,6 +214,11 @@
        /// <param name="e">E.</param>
        private void ChildrenUpEvent(object sender, MouseEventArgs e)
        {

            if (this.CanClick == false)

            {

                //不允许点击

                return;

            }

            if (sender is FrameLayoutControl)

            {

                //LOG出力