Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

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

@@ -23,29 +23,33 @@
        /// <summary>
        /// 
        /// </summary>
        public EmptyTipView(string tipMsg ="")
        public EmptyTipView(string tipMsg ="",int btnTipNotY=0)
        {
            if(tipMsg == "")
            {
                tipMsg = Language.StringByID(StringId.ContentIsEmpty);
            }
            int tipHeight = Application.GetRealWidth(180);
            int tipHeight = Application.GetRealWidth(180 + btnTipNotY);

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

            BtnTipNot = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Width = tipHeight,
                Height = tipHeight,
                Width = Application.GetRealWidth(180),
                Height = Application.GetRealWidth(180),
                UnSelectedImagePath = "TipNot.png",
            };
            this.AddChidren(BtnTipNot);
            if(btnTipNotY!=0)
            {
                BtnTipNot.Y = Application.GetRealHeight(btnTipNotY);
            }

            //空空如也
            Button btnTipNotText = new Button()
            {
                Y = tipHeight,
                Y = tipHeight ,
                Height = Application.GetRealHeight(17),
                Text = tipMsg,
                TextAlignment = TextAlignment.Center,