1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 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" />