Merge branch 'Dev-Branch' into wxr1215

wxr

2022-05-17 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90

 HDL_ON/Common/HDLCommon.cs

@@ -337,12 +337,33 @@
                            eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
                            eSVideoInfo.DeviceName = json["deviceName"].ToString();
                            eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
                            eSVideoInfo.spk = json["spk"].ToString();

                            if (json.ContainsKey("spk"))
                            {
                                if (json["spk"].ToString() == "door.gate")
                                {
                                    new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"呼叫", eSVideoInfo);

                                    //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,true);
                                    return;
                                }
                                else
                                {
                                    //HDL Linphone 狄耐克
                            //ShowAlert("狄耐克门口机呼叫");
                            //打开呼叫页面
                            HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
                                    HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,false);
                            return;
                                }
                            }
                                else
                                {
                                    //HDL Linphone 狄耐克
                                    //ShowAlert("狄耐克门口机呼叫");
                                    //打开呼叫页面
                                    HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,false);
                                    return;
                                }
                        }

                        //3.打开呼叫页面
@@ -405,13 +426,14 @@
            //账号在别处登陆，被踢下线 跳转到登录页面
            new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();

            Logout();
            Logout(false);
        }

        /// <summary>
        /// 退出登录操作
        /// signOutPush 是否删除推送token
        /// </summary>
        public void Logout()
        public void Logout(bool signOutPush = true)
        {
            //加载Loading效果
            var waitPage = new Loading();
@@ -422,8 +444,11 @@
            {
                try
                {
                    if (signOutPush)
                    {
                    //2.注销推送
                    new HttpServerRequest().SignOutPush();
                    }
                    //3.跳转登录页面
                    UserInfo.Current.LastTime = DateTime.MinValue;
                    UserInfo.Current.SaveUserInfo();