From 79fe8dab1bcb8e8d92d9058ca2540cd4e8f9ecf9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:05:32 +0800
Subject: [PATCH] 20201127 合并嘉乐代码
---
HDL-ON_Android/HDL-ON_Android.csproj | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4c9a923..e1316cb 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -30,7 +30,7 @@
<DebugType>portable</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
@@ -44,7 +44,7 @@
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>TRACE;__Android__;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
@@ -577,6 +577,22 @@
<AndroidAsset Include="Assets\Phone\OnIcon.png" />
<AndroidAsset Include="Assets\Phone\TipNot.png" />
<AndroidAsset Include="Assets\Phone\DeviceIcon\VoicePanelIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_3.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
+ <AndroidAsset Include="Assets\Phone\LoginIcon\Server.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ServerInfo.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Function.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Menu.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Help.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Telephone.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\SendMessage.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Scene.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Head.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Transfer.png" />
</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