From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 3168eb9..1ccbe08 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>
@@ -183,6 +181,10 @@
<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>
+ <Reference Include="Mono.Android.Export" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -225,6 +227,72 @@
<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" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
+ <AndroidAsset Include="Assets\Phone\Public\dialogBg2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhelp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpAlarmBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\screenpanel.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelEnviBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\EconomicIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\EconomicIconGray.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\order.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\single_cycle.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ThumbImage2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtaindream_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtaindream_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\curtaindream.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\HvacCacHumidityIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\HvacCacTempIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneRunBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneSitBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneStandBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\FunctionArmOnbg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensormegahealth.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Iot_agreement_icon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\LinkIotIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\IotCheckIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\IotCheckOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BackIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" />
+ <AndroidAsset Include="Assets\h5\index.html" />
+ <AndroidAsset Include="Assets\h5\static\index.2772579d.css" />
+ <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
+ <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
+ <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
+ <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
+ <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.aea6a122.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.7634b70a.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0b8ec7be.js" />
+ <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.9e7e69a0.js" />
+ <AndroidAsset Include="Assets\h5\static\js\index.95903989.js" />
+ <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
+ <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
+ <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
+ <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1431,6 +1499,8 @@
<ItemGroup>
<Folder Include="libs\arm64-v8a\" />
<Folder Include="Zxing\" />
+ <Folder Include="Assets\Phone\FunctionIcon\CAC\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Panel\" />
</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