From c17871cbf0511baadad171df4276bf50a442f3fe Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 30 六月 2022 13:35:38 +0800 Subject: [PATCH] 自研可视对讲优化 --- DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll | 0 HDL-ON_Android/HDL-ON_Android.csproj | 9 +++------ HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 9 +++++++++ HDL-ON_Android/Resources/Resource.designer.cs | 2 +- DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll | 0 HDL_ON/UI/UI1-Login/LoginPage.cs | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll new file mode 100644 index 0000000..38d92a5 --- /dev/null +++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll Binary files differ diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll index 38d92a5..14ed0c8 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_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index da07c5c..3b3f61d 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -181,6 +181,9 @@ <Reference Include="ScanSdk"> <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath> </Reference> + <Reference Include="Shared.Droid.HDLLinphone"> + <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -1452,12 +1455,6 @@ <Folder Include="Zxing\" /> <Folder Include="Assets\Phone\FunctionIcon\CAC\" /> <Folder Include="Assets\Phone\FunctionIcon\Panel\" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone.csproj"> - <Project>{703D29ED-674F-44A8-8AAD-863035899D4B}</Project> - <Name>Shared.Droid.HDLLinphone</Name> - </ProjectReference> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs index 8f1ae9c..11a6b26 100644 --- a/HDL-ON_Android/Resources/Resource.designer.cs +++ b/HDL-ON_Android/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] public partial class Resource { diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs index c644c46..07f7fc6 100644 --- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs +++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs @@ -485,6 +485,15 @@ #if __IOS__ //鑷爺鍙瀵硅 HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount); +#else + var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneReverseCallActivity)); + if (mHDLCallVideoInfo != null) + { + //intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName); + intent.PutExtra("lpTitleName", mHDLCallVideoInfo.DeviceName); + intent.PutExtra("lpSipAccount", mHDLCallVideoInfo.DeviceSipAccount); + } + Shared.Application.Activity.StartActivity(intent); #endif } else { diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs index 949c341..fe9387a 100644 --- a/HDL_ON/UI/UI1-Login/LoginPage.cs +++ b/HDL_ON/UI/UI1-Login/LoginPage.cs @@ -245,7 +245,7 @@ //etAccount.Text = "info@smartlife-ks.com"; //etAccount.Text = "551775569@qq.com";//wcf //etAccount.Text = "15626203746"; - etAccount.Text = "18244942707"; + etAccount.Text = "18186330667"; //etAccount.Text = "zhangquansongjava@163.com"; //etAccount.Text = "s.savinov@hdlautomation.ru"; } -- Gitblit v1.8.0