Merge branch 'WJC' into NewFilePath

wxr

2020-12-21 f25c6122eb7e26be5e7f036cf29b9019c4953be2

 HDL_ON/UI/MainPage.cs

old mode 100755
new mode 100644
@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.0.0924";
        public static string VersionString = "1.0.0124";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -53,6 +53,10 @@
        /// 0:无网络
        /// </summary>
        public static int InternetStatus = 2;
        /// <summary>
        /// 是否进入后台
        /// </summary>
        public static bool IsEnterBackground = false;

        ///// <summary>
        ///// 公司代码
@@ -255,6 +259,8 @@
                Entity.FunctionList.List.DownloadFunctionList();
                //读取云端场景数据
                Entity.FunctionList.List.DownloadSceneList();
                //读取逻辑列表
                UI.UI2.Intelligence.Automation.MainView.GetLogicList();
                #endregion

            })