~wxr/OnPro.git - Gitblit

			@@ -124,8 +124,8 @@



			//登录sip服务器
			#if __IOS__

			Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
			#else
			if (mInterphoneType == InterphoneType.FREEVIEW.ToString())
			@@ -133,7 +133,7 @@
			HDLLinphoneKit.Instance.SetAccountAndLogin(
			mHDLSipInfo.sipAccount,
			mHDLSipInfo.sipPasswd,
			"139.159.157.75:47000",//mHDLSipInfo.realm,
			mHDLSipInfo.realm,
			//"sip:139.159.157.75:47000;transport=udp",
			HDLLinphoneKit.InterPhoneTypeFreeview
			);
			@@ -234,7 +234,7 @@
			//先清空呼叫和监视设备信息
			if (clearCallInfo)
			{
			InitCallInfo(null);
			//InitCallInfo(null);//造成接收呼叫时开锁开锁异常
			}

			HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);
			@@ -338,7 +338,7 @@

			#region ■ -- 新接听和开锁接口_______________________________
			/// <summary>
			/// 开锁
			/// 可视对讲开锁
			/// </summary>
			public void HDLUnlockAction()
			{
			@@ -358,6 +358,10 @@

			Application.RunOnMainThread(() =>
			{
			if(revertObj == null)
			{
			return;
			}

			#if __IOS__
			if (revertObj.Code == StateCode.SUCCESS)
			@@ -450,7 +454,13 @@

			#if __IOS__

			Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
			if (mHDLCallVideoInfo.spk == "door.gate")
			{
			Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallHDLSRWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
			}else{
			Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
			}


			#else
			//1.先呼叫设备