From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期五, 27 九月 2024 14:01:19 +0800 Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google --- HDL-ON_Android/HDL-ON_Android.csproj | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 677d862..f456c11 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -187,6 +187,9 @@ <Reference Include="Shared.Droid.HDLLinphone"> <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> </Reference> + <Reference Include="System.Net.Http"> + <HintPath>..\..\..\..\..\..\Library\Frameworks\Xamarin.Android.framework\Versions\13.2.2.0\lib\xamarin.android\xbuild-frameworks\MonoAndroid\v1.0\System.Net.Http.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Other\JPush\JPushFirmBroadcast.cs" /> @@ -633,6 +636,9 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg100.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault100.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown100.png" /> + <AndroidAsset Include="Assets\Phone\Collection\TokenInvalidTipIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\RightIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> -- Gitblit v1.8.0