From bb4b3ed9e69ed83c9dd79f3ae4c0f0081cacee83 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 25 八月 2021 18:00:44 +0800 Subject: [PATCH] 2021-08-24 1.更新iOSLinphoneDLL库 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 2 +- HDL_ON/Common/ApiUtlis.cs | 2 +- .vs/HDL_APP_Project/xs/UserPrefs.xml | 11 ++++------- DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll | 0 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index bf566ef..9c10595 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,16 +1,13 @@ -锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> +锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" /> <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> - <Node name="HDL-ON_iOS" expanded="True"> - <Node name="References" expanded="True"> - <Node name="Shared.IOS.HDLLinphoneSDK" selected="True" /> - </Node> - <Node name="Packages" expanded="True" /> - </Node> + <Node name="HDL_ON" expanded="True" /> + <Node name="HDL-ON_Android" expanded="True" /> + <Node name="HDL-ON_iOS" expanded="True" selected="True" /> </Node> </State> </Pad> diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll index b07fa61..3e29d06 100644 --- a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll +++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll Binary files differ diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index d9de373..1c613f2 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -102,7 +102,7 @@ <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLLinphoneSDK"> - <HintPath>..\..\Linphone\HDLLinphoneSDK_IOS\Shared.IOS.HDLLinphoneSDK\Shared.IOS.HDLLinphoneSDK\bin\Release\Shared.IOS.HDLLinphoneSDK.dll</HintPath> + <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs index 5736483..511f838 100644 --- a/HDL_ON/Common/ApiUtlis.cs +++ b/HDL_ON/Common/ApiUtlis.cs @@ -281,7 +281,7 @@ } } //======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃==================== - //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鍒氬惎鍔ㄩ┈涓婃敹鍒版帹閫佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲� + //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲� if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) { //褰撳墠浣忓畢鏄疕DL鍙瀵硅绫诲瀷鐨勮澶� if (isInterphoneType_HDL) -- Gitblit v1.8.0