Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

 HDL_ON/Common/HDLCommon.cs

@@ -330,31 +330,33 @@
                        }
                        else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
                        {
                            //HDL Linphone 狄耐克
                            eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
                            eSVideoInfo.callId = json["callId"].ToString();
                            eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
                            eSVideoInfo.DeviceName = json["deviceName"].ToString();
                            eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
                            eSVideoInfo.spk = json["spk"].ToString();

                            //ShowAlert("狄耐克门口机呼叫");
                            //打开呼叫页面
                            HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
                            return;
                        }
                        else if (interphoneTypeEnum == InterphoneType.FREEVIEW.ToString())
                        {
                            //全视通 Linphone 狄耐克
                            eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
                            eSVideoInfo.callId = json["callId"].ToString();
                            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,false);
                                    return;
                                }
                            }
                            //ShowAlert("狄耐克门口机呼叫");
                            //打开呼叫页面
                            HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
                            return;
                        }

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

            Logout(false);
            Logout();
        }

        /// <summary>
        /// 退出登录操作
        /// signOutPush 是否删除推送token
        /// </summary>
        public void Logout(bool signOutPush = true)
        public void Logout()
        {
            //加载Loading效果
            var waitPage = new Loading();
@@ -435,19 +436,19 @@
            {
                try
                {
                    if (signOutPush)
                    {
                        //2.注销推送
                        new HttpServerRequest().SignOutPush();
                    }
                    //2.注销推送
                    new HttpServerRequest().SignOutPush();
                    //3.跳转登录页面
                    UserInfo.Current.LastTime = DateTime.MinValue;
                    UserInfo.Current.SaveUserInfo();
                    DB_ResidenceData.Instance.EixtAccount();
                    //4.注销HDLSIP账号登录 2021-08-20
                    HDLLinphone.Current.LogoutAllAccount();

#if __IOS__
                    //5.清空Siri共享数据信息
                    //5.全视通登出
                    Shared.IOS.HDLFVSDK.Video.Logout();
                    //6.清空Siri共享数据信息
                    new Other.SkipControl().SetData(false, "", "", "","");
                    var sDM = new SiriKit.SceneDateManager();
                    Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");