合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -537,10 +537,6 @@
    <AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />

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

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>

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

@@ -1227,8 +1223,50 @@
    <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\2.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\3.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\4.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\5.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\6.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\7.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\8.jpg" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />

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