Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2021-01-21 bee4133c05f9c41f24ec7fa7449faabb79306087

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.0.1225";
        public static string VersionString = "1.1.0119";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -92,6 +92,12 @@
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;


                //#region 测试
                //var ddd = new UI.test.TestDialog();
                //ddd.InitView();
                //return;
                //#endregion

                if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
                {
                    GoLoginPage();