Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-04-01 802f200c004348defca5cefd047ad843c74abadd

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -336,6 +336,7 @@
    <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>
@@ -1076,16 +1077,30 @@
    <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" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Energy.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Comfortable.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Humidification.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Ventilate.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.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" />