1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/UI/MainPage.cs

@@ -27,10 +27,11 @@
        /// 版本号
        /// </summary>
        public static string VersionString = "1.0.0924";
        /// <summary>
        /// 客户端类型
        /// </summary>
        public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
        //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();

        /// <summary>
        /// 
        /// </summary>
@@ -95,24 +96,30 @@
                {
                    new System.Threading.Thread(() =>
                    {
                        var pm =new DAL.Server.HttpServerRequest();
                        pm.GetUserInfo();//刷新个人信息
                        var pm = new DAL.Server.HttpServerRequest();
                        pm.RefreshToken();//刷新Token
                        pm.GetHomePager();//刷新住宅信息
                    })
                    { IsBackground = true }.Start();
                    new System.Threading.Thread(() =>
                    {
                        var pm = new DAL.Server.HttpServerRequest();
                        pm.GetHomePager();//刷新住宅信息
                        var pm =new DAL.Server.HttpServerRequest();
                        pm.GetUserInfo();//刷新个人信息
                    })
                    { IsBackground = true }.Start();
                    
                    GoUserPage();
                    //启动密码验证
                    new AppUnlockPage().LoadPage();
                    //读取音乐信息
                    UI.Music.A31MusicModel.ReadMusicStates();
                    //搜索网关

#if DEBUG
                    //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#endif           
                    Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
                    Entity.DB_ResidenceData.residenceData.GatewayType = 0;
#endif
                    DriverLayer.Control.Ins.SearchLoaclGateway();
                }
            }
            catch (Exception ex)