Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/MainPage.cs

@@ -20,7 +20,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.2.0422";
        public static string VersionString = "1.2.0608";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -371,7 +371,10 @@
                    {
                        if (view != null)
                        {
                            view.RemoveFromParent();
                            if(view.Tag.ToString() != "unlockpage")
                            {
                                view.RemoveFromParent();
                            }
                        }
                    }
                }