合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -483,8 +483,6 @@
    <AndroidAsset Include="Assets\Phone\Item\OpenIcon.png" />

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

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

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

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

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

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

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

@@ -940,6 +938,48 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Scene\Selected.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')" />