From 1d25d355cb0efc9685a8ad5c870b5941b95ce9b8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 30 三月 2021 09:11:57 +0800
Subject: [PATCH] 1
---
HDL-ON_Android/HDL-ON_Android.csproj | 62 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 64aeefc..50d8794 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -129,22 +129,22 @@
<HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath>
</Reference>
<Reference Include="cloudp2p">
- <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\cloudp2p.dll</HintPath>
+ <HintPath>..\DLL\FL\Android\cloudp2p.dll</HintPath>
</Reference>
<Reference Include="corelooper">
- <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\corelooper.dll</HintPath>
+ <HintPath>..\DLL\FL\Android\corelooper.dll</HintPath>
</Reference>
<Reference Include="crypt">
- <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\crypt.dll</HintPath>
+ <HintPath>..\DLL\FL\Android\crypt.dll</HintPath>
</Reference>
<Reference Include="http">
- <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\http.dll</HintPath>
+ <HintPath>..\DLL\FL\Android\http.dll</HintPath>
</Reference>
<Reference Include="VideoLibs">
- <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\VideoLibs.dll</HintPath>
+ <HintPath>..\DLL\FL\Android\VideoLibs.dll</HintPath>
</Reference>
<Reference Include="videophone">
- <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\videophone.dll</HintPath>
+ <HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -335,6 +335,8 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Assets\Phone\PirIcon\" />
+ <Folder Include="Assets\Phone\VideoIcon\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Energy\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
@@ -1034,16 +1036,52 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\answer.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\danyuanji.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\hangup.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\keshiduijiang.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\menjin.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\phone.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\weiqiangji.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\1.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\2.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\3.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\4.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\right.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVAV.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\29.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\13.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\20.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\LowerLimit.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\18.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\InfoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Bg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\5.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\UpperLimit.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\6.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\45.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodDownIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ys\ys.csproj">
- <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
- <Name>ys</Name>
- </ProjectReference>
</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