Merge branch 'Dev-Branch' into Dev-Wxr

wxr

2023-04-11 93a578f5182792b4dd981e874e2746e8b3e34e2e

 HDL_ON/Common/HDLCommon.cs

@@ -433,6 +433,16 @@
        /// </summary>
        public void CheckLogout()
        {
#if __IOS__
            try{
                HDL_ON_iOS.AppDelegate.rootViewController.PopToRootViewController(false);
            }catch(Exception ex){
                MainPage.Log($"回到跟类失败:{ex.Message}");
            }
#else
            //Application.Activity.StartActivity()
#endif

            //测试账号，不挤下线
            switch (UserInfo.Current.AccountString)
            {
@@ -447,7 +457,13 @@
            //账号在别处登陆，被踢下线 跳转到登录页面
            new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();

            Logout();
            try
            {
                Logout();
            }catch (Exception ex)
            {
                MainPage.Log($"挤下线异常:{ex.Message}");
            }
        }

        /// <summary>
@@ -470,8 +486,10 @@
                    UserInfo.Current.LastTime = DateTime.MinValue;
                    UserInfo.Current.SaveUserInfo();
                    DB_ResidenceData.Instance.EixtAccount();
                    MainPage.Log("退出账号清空数据");
                    //4.注销HDLSIP账号登录 2021-08-20
                    HDLLinphone.Current.LogoutAllAccount();
                    MainPage.Log("注销HDLSIP账号登录");

#if __IOS__
                    //5.全视通登出
@@ -492,6 +510,7 @@
                    {
                        if (waitPage != null)
                        {
                            waitPage.Hide();
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
@@ -582,9 +601,9 @@

        }

        #endregion
#endregion

        #region ■ 常用方法_______________________
#region ■ 常用方法_______________________
        /// <summary>
        /// 设置下划线按钮状态
        /// 统一封装设置方法
@@ -659,9 +678,9 @@
                Control.Ins.SearchLoaclGateway();
            }
        }
        #endregion
#endregion

        #region 跳转打开萤石云方法
#region 跳转打开萤石云方法

        /// <summary>
        /// 获取子账号token并跳转设备列表页面
@@ -782,6 +801,6 @@
            { IsBackground = true }.Start();
        }

        #endregion
#endregion
    }
}