合并了全部的代码，IOS 图片需要从新引入工程

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -230,12 +230,6 @@
    <AndroidResource Include="Resources\xml\file_paths.xml" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Language.ini" />

    <AndroidAsset Include="Assets\Phone\Account\Account.png" />

    <AndroidAsset Include="Assets\Phone\Account\Cancle.png" />

@@ -421,19 +415,14 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" />

    <AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1Selected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6Selected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\RealGateway1.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\SearchGateway.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewayInstruct.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewaySelected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGateway.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayImage.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayInstruct.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySelected.png" />

    <AndroidAsset Include="Assets\Phone\Instruct\DeviceSearch.png" />

    <AndroidAsset Include="Assets\Phone\Instruct\DimmableLightOneLoad.png" />

    <AndroidAsset Include="Assets\Phone\Instruct\IntelligentLocksH06C.png" />

@@ -1032,6 +1021,39 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\UpSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Gateway\AddGatewaySuccess.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySearching.png" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\OFF.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\OFFSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\ON.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\OnOff.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\ONSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\Plug.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\PlugSelected.png" />

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />