Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs

@@ -89,6 +89,12 @@
            topFrameLayout.Name = "topFrameLayout";
            this.AddChidren(topFrameLayout);

            //线
            var btnLine = new NormalViewControl(topFrameLayout.Width, 1, false);
            btnLine.BackgroundColor = 0x40000000;
            btnLine.Y = topFrameLayout.Height - 1;
            topFrameLayout.AddChidren(btnLine);

            //返回键
            var btnBack = new BackViewControl();
            topFrameLayout.AddChidren(btnBack);
@@ -103,6 +109,8 @@
            //标题
            var txttitle = new TopLayoutTitleControl();
            topFrameLayout.AddChidren(txttitle);
            //粗体
            txttitle.IsBold = true;
            topFrameLayout.AddTag("txtTitle", txttitle);
        }


@@ -162,13 +170,13 @@
        /// <summary>

        /// 画面关闭

        /// </summary>
        public override void CloseForm()
        public override void CloseFormBefore()
        {

            this.m_parameter = null;

            //清空bodyFrame
            this.ClearBodyFrame();


            base.CloseForm();
            base.CloseFormBefore();
        }


        #endregion
@@ -234,9 +242,38 @@
        }



        #endregion


        #region ■ 添加帮助控件_______________________

        /// <summary>

        /// 添加查看帮助控件

        /// </summary>

        /// <returns></returns>
        public NormalViewControl AddHelpControl()

        {

            //查看帮助

            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);

            btnHelp.Y = Application.GetRealHeight(1388);

            btnHelp.TextSize = 12;

            btnHelp.TextAlignment = TextAlignment.Center;

            btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;

            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);

            bodyFrameLayout.AddChidren(btnHelp);

            //底线

            int lineWidth = btnHelp.GetRealWidthByText();

            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            btnLine.Gravity = Gravity.CenterHorizontal;

            btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);

            bodyFrameLayout.AddChidren(btnLine);



            return btnHelp;

        }

        #endregion


        #region ■ 显示没有数据的图像显示特效_________



        /// <summary>

        /// 显示没有数据的图像显示特效

        /// </summary>

@@ -283,6 +320,19 @@


        #endregion


        #region ■ 界面重新激活事件___________________


        /// <summary>

        /// <para>自身的上层界面关闭后,它自身处于最上层时,触发的事件</para>

        /// <para>重写的时候返回值请返回1(返回值是给底层使用的)</para>

        /// </summary>
        public virtual int FormActionAgainEvent()

        {

            return -1;

        }

        #endregion



        #region ■ 清空BodyFrame______________________


        /// <summary>