Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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

old mode 100755
new mode 100644
@@ -77,20 +77,30 @@
            };
            contentView.AddChidren(mesView);

            Button btnMes = new Button()
            TextButton btnMes = new TextButton()
            {
                Gravity = Gravity.CenterHorizontal,
                //Gravity = Gravity.CenterHorizontal,
                Width = mesView.Width,
                Height = mesView.Height,
                //Height = mesView.Height,
                Height = Application.GetRealWidth(20),
                TextAlignment = TextAlignment.TopLeft,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.TextFontSize,
                IsMoreLines = true,
                Text = msgStr,
                //BackgroundColor = CSS_Color.AuxiliaryColor2

            };
            mesView.AddChidren(btnMes);
            //动态计算高度
            var needHeight = btnMes.GetMoreLineNeedHeight();
            if(needHeight < mesView.Height)
            {
                needHeight = mesView.Height;
            }
            btnMes.IsMoreLines = true;
            btnMes.Height = needHeight;
            //mesView.AddChidren(btnMes);


            Button btnLine = new Button()
            {
@@ -121,7 +131,7 @@
                    X = contentView.Width - Width144,
                    Y = btnLine.Y,
                    Width = Width144,
                    Height = Application.GetRealHeight(44),
                    Height = Application.GetRealHeight(45),
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextColor = CSS_Color.MainBackgroundColor,
@@ -151,7 +161,7 @@
                {
                    Y = btnLine.Y,
                    Width = contentView.Width,
                    Height = Application.GetRealHeight(44),
                    Height = Application.GetRealHeight(45),
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextColor = CSS_Color.MainBackgroundColor,