~wxr/OnPro.git - Gitblit

Binary files differ

			@@ -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" />

			@@ -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
			{

			@@ -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 {

			@@ -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";
			}

	DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_Android/HDL-ON_Android.csproj	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_Android/Resources/Resource.designer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI1-Login/LoginPage.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史