From 271c46f52e74845dac76fa5ece4eb8b94d9168f4 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 08 四月 2022 10:12:31 +0800 Subject: [PATCH] 金茂温控器 --- HDL-ON_Android/HDL-ON_Android.csproj | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 3168eb9..8bf78f3 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -46,6 +46,7 @@ <BundleAssemblies>false</BundleAssemblies> <AndroidEnableMultiDex>false</AndroidEnableMultiDex> <AndroidUseAapt2>true</AndroidUseAapt2> + <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -168,9 +169,6 @@ <Reference Include="Square.OkIO"> <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath> </Reference> - <Reference Include="Shared.Droid.HDLLinphone"> - <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> - </Reference> <Reference Include="Shared.Droid.LCVideoSDK"> <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath> </Reference> @@ -182,6 +180,9 @@ </Reference> <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> @@ -225,6 +226,13 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg2.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" /> + <AndroidAsset Include="Assets\Phone\Collection\FunctionOfflineBg.png" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\CallIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\AnswerIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\HangUpIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\DataIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\JinMaoIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\hvaccac.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> @@ -1431,6 +1439,7 @@ <ItemGroup> <Folder Include="libs\arm64-v8a\" /> <Folder Include="Zxing\" /> + <Folder Include="Assets\Phone\FunctionIcon\CAC\" /> </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" /> -- Gitblit v1.8.0