From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc
---
HDL-ON_Android/HDL-ON_Android.csproj | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index a3706fa..8c3c5b0 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -164,9 +164,6 @@
<Reference Include="UMSdkDroid">
<HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.HDLLinphone">
- <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
- </Reference>
<Reference Include="Mono.Android.Export" />
<Reference Include="ScanSdk">
<HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
@@ -195,8 +192,14 @@
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
+ <Reference Include="Shared.Droid.HDLLinphone">
+ <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
+ </Reference>
<Reference Include="HdlEzvizDroid">
- <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
+ <HintPath>..\DLL\Android\HdlEzvizDroid.dll</HintPath>
+ </Reference>
+ <Reference Include="Aliyun.Api.LogService">
+ <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -973,6 +976,18 @@
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
</PackageReference>
+ <PackageReference Include="Google.Protobuf">
+ <Version>3.5.1</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AspNet.WebApi.Client">
+ <Version>5.2.4</Version>
+ </PackageReference>
+ <PackageReference Include="Iconic.Zlib.Netstandard">
+ <Version>1.0.0</Version>
+ </PackageReference>
+ <PackageReference Include="lz4net">
+ <Version>1.0.15.93</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Language.ini" />
--
Gitblit v1.8.0