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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4a27923..f456c11 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -78,9 +78,6 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
- <Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\DLL\Shared.Droid.HDLWidget.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.Smartrefresh">
<HintPath>..\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
@@ -153,9 +150,6 @@
<Reference Include="http">
<HintPath>..\DLL\FL\Android\http.dll</HintPath>
</Reference>
- <Reference Include="UMSdkDroid">
- <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
- </Reference>
<Reference Include="Mono.Android.Export" />
<Reference Include="ScanSdk">
<HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
@@ -186,6 +180,15 @@
</Reference>
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
+ <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>
@@ -592,6 +595,50 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
<None Include="libs\armeabi-v7a\libjcore212.so" />
<None Include="libs\arm64-v8a\libjcore212.so" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\NextIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_False.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\PreIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat_On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\TempBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic_On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_True.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconDischarge.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconFault.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconCharg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoIcon_Coal.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgDischarge.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconStandby.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoBg_Coal.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EnergyStorageStatusBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconShutdown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgRun.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconRun.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconFault.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AcstFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\InverterJinmaoFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg100.png" />
+ <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