From 79133766997cb86b2e463671b50137588ded6588 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 08 三月 2021 10:07:55 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC
---
HDL-ON_Android/HDL-ON_Android.csproj | 81 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e36dd62..fd72e13 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -153,48 +153,70 @@
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
<AndroidResource Include="Resources\drawable\Loading.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\xml\network_security_config.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\xml\file_paths.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\zxing_layout.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-mdpi\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
@@ -208,6 +230,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Assets\Phone\PirIcon\" />
</ItemGroup>
+ <ItemGroup />
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
@@ -648,7 +671,6 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
- <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\link.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" />
@@ -807,17 +829,18 @@
<AndroidAsset Include="Assets\Phone\PirIcon\icon1.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\icon2.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\succeed.png" />
- <AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
- <AndroidAsset Include="Assets\Phone\PirIcon\right.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\LogicIcon\selected+.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" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0