上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -19,7 +19,7 @@
    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>

    <NuGetPackageImportStamp>

    </NuGetPackageImportStamp>

    <AndroidKeyStore>true</AndroidKeyStore>

    <AndroidKeyStore>false</AndroidKeyStore>

    <AndroidSigningKeyStore>C:\Users\admin\AppData\Local\Xamarin\Mono for Android\Keystore\HDL Home\HDL Home.keystore</AndroidSigningKeyStore>

    <AndroidSigningStorePass>85521566</AndroidSigningStorePass>

    <AndroidSigningKeyAlias>HDL Home</AndroidSigningKeyAlias>

@@ -319,7 +319,6 @@
    <AndroidAsset Include="Assets\Phone\Device\Sensor.png" />

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

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

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

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

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

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

@@ -2096,6 +2095,27 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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