Merge branch 'temp-wxr' into NewFilePath

wxr

2021-03-02 7ef9d95ad31883e85bf5d5eab85c30f70d601077

 HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomDialogCommon.cs

@@ -57,7 +57,6 @@


            var dialogBody = new NormalFrameLayout();

            FrameDialog.AddChidren(dialogBody);

            FrameDialog.Show();

            dialogBody.ButtonClickEvent += (sender, e) =>

            {

                if (ClickBackClose == true && this.btnCancel != null)

@@ -106,6 +105,8 @@
            btnConfirm.TextSize = CSS_FontSize.TextFontSize;

            frameWhiteBack.AddChidren(btnConfirm);



            FrameDialog.Show();



            return frameWhiteBack;

        }