2020-11-30-2

陈嘉乐

2020-11-30 ed3bfb7462d44747230437717e8673a5192f833f

 HDL_ON/UI/MainPage.cs

@@ -9,31 +9,15 @@
{
    public static class MainPage
    {
        /// <summary>
        /// BaseView
        /// </summary>
        public static FrameLayout BaseView { get; internal set; }
        /// <summary>
        /// BasePageView
        /// </summary>
        public static PageLayout BasePageView { get; set; }
        /// <summary>
        /// DisplayCompleted
        /// </summary>

        public static bool DisplayCompleted = false;

        //public static UserInfo LoginUser;
        /// <summary>
        /// 版本号
        /// </summary>
        public static UserInfo LoginUser;

        public static string VersionString = "1.0.0924";
        /// <summary>
        /// 客户端类型
        /// </summary>
        public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
        /// <summary>
        /// 
        /// </summary>

        public static Entity.CityInfo cityInfo = new Entity.CityInfo();
        /// <summary>
        /// 天气刷新action
@@ -48,12 +32,12 @@
        /// </summary>
        public static bool IsRemote = false;

        ///// <summary>
        ///// 公司代码
        ///// 预留第三方定制标记
        ///// 0:HDL
        ///// </summary>
        //public static int Company = 0;
        /// <summary>
        /// 公司代码
        /// 预留第三方定制标记
        /// 0:HDL
        /// </summary>
        public static int Company = 0;

        /// <summary>
        /// 是否全面屏手机
@@ -87,12 +71,12 @@

                //BusSocket.Start();
                //CommonPage.InitReceiveEvent();
               
                //LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));

                LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
                //判断需不需要登录，有没有登录，或者登录是否过期，
                if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
                if (LoginUser == null || !LoginUser.IsLogin)
                {
                    GoLoginPage(UserInfo.Current);
                    GoLoginPage(LoginUser);
                }
                else
                {
@@ -146,7 +130,7 @@
        /// <summary>
        /// 进入登录界面
        /// </summary>
        public static void GoLoginPage(UserInfo userInfo = null)
        public static void GoLoginPage(UserInfo userInfo =null)
        {
            BaseView.RemoveAll();
            BaseView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -200,7 +184,5 @@
            Console.WriteLine(msg);
#endif
        }


    }
}