请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Common/CommonPage.cs

@@ -43,11 +43,6 @@
            Application.MainPage.AddChidren(Loading);
            //}
            Phone.UserView.HomePage.Instance.InitPage();

            var roomList = new Shared.Phone.Device.Room.RoomManagement();

            Instance.AddLeftView(roomList);
            roomList.Show();
        }

        public static string SoftTitle = "ZigBee";
@@ -57,12 +52,12 @@
        public static int SoftSmsType = 0;
        public static string LogoString = @"Logo/Logo.png";
        public static string RegisterLogoString = @"Logo/Register_logo.png";
        public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
        //public static string RequestHttpsHost = "http://172.16.2.192:13061";
        //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
        public static string RequestHttpsHost = "https://global.hdlcontrol.com/ProposedProductionApi";
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.0.20011801";
        public static string CodeIDString = "1.0.20041501";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>
@@ -379,30 +374,30 @@
                    }
                }
            }
        }



        /// <summary>

        /// 登出

        /// </summary>

        public void SingOut()

        {

            try

            {

                Application.RunOnMainThread(() =>

                {

                    //设定一个时间

                    Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);

                    Config.Instance.Save();

                    CommonPage.Instance.RemoveAll();

                    CommonPage.Instance.Show();

                    var login = new Phone.Login.AccountLogin();

                    CommonPage.Instance.AddChidren(login);

                    login.Show();

                });

            }

            catch { }

        }


        /// <summary>
        /// 登出
        /// </summary>
        public void SingOut()
        {
            try
            {
                Application.RunOnMainThread(() =>
                {
                    //设定一个时间
                    Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
                    Config.Instance.Save();
                    CommonPage.Instance.RemoveAll();
                    CommonPage.Instance.Show();
                    var login = new Phone.Device.Account.AccountLogin();
                    CommonPage.Instance.AddChidren(login);
                    login.Show();
                });
            }
            catch { }
        }
        /// <summary>
        /// 退出登录时调用，清除推送数据
        /// </summary>