Merge branch 'wxr1215' into dev

wxr

2022-05-18 b1b3f47f3eeff8536b1a2851781da0b04f346fef

 HDL_ON/Common/HDLCommon.cs

@@ -330,20 +330,26 @@
                        }
                        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();


                            if (json.ContainsKey("spk"))
                            {
                                if (json["spk"].ToString() == "door.gate")
                                {
                                    //new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"呼叫", eSVideoInfo);
#if __IOS__
                                    eSVideoInfo.spk = json["spk"].ToString();
                                    HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, false);
#else
                                    new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"呼叫", eSVideoInfo);

                                    //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,true);
#endif
                                    return;
                                }
                                else
@@ -355,6 +361,14 @@
                                    return;
                                }
                            }
                                else
                                {
                                    //HDL Linphone 狄耐克
                                    //ShowAlert("狄耐克门口机呼叫");
                                    //打开呼叫页面
                                    HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,false);
                                    return;
                                }
                        }

                        //3.打开呼叫页面
@@ -446,8 +460,11 @@
                    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}");