Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

 HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs

@@ -11,39 +11,43 @@
    public class EmptyTipView : FrameLayout
    {
        /// <summary>
        /// 
        /// 提示文字
        /// </summary>
        public Button btnTipNotText;
        public Button BtnTipNotText;

        /// <summary>
        /// 提示图片
        /// </summary>
        public Button BtnTipNot;

        /// <summary>
        /// 
        /// </summary>
        public Button btnTipNot;

        /// <summary>
        /// 
        /// </summary>
        public EmptyTipView()
        public EmptyTipView(string tipMsg ="")
        {
            if(tipMsg == "")
            {
                tipMsg = Language.StringByID(StringId.ContentIsEmpty);
            }
            int tipHeight = Application.GetRealWidth(180);

            this.Height = tipHeight + Application.GetRealHeight(17);

            btnTipNot = new Button()
            BtnTipNot = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Width = tipHeight,
                Height = tipHeight,
                UnSelectedImagePath = "TipNot.png",
            };
            this.AddChidren(btnTipNot);
            this.AddChidren(BtnTipNot);

            //空空如也
            Button btnTipNotText = new Button()
            {
                Y = btnTipNot.Bottom,
                Y = tipHeight,
                Height = Application.GetRealHeight(17),
                TextID = StringId.ContentIsEmpty,
                Text = tipMsg,
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,