合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

old mode 100644
new mode 100755
@@ -40,6 +40,10 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

    <DebugSymbols>true</DebugSymbols>

@@ -53,6 +57,10 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

@@ -194,6 +202,8 @@
    <Compile Include="Application.cs" />

    <Compile Include="Resources\Resource.designer.cs" />

    <Compile Include="Properties\AssemblyInfo.cs" />

    <Compile Include="ZXing\ZXingCustomScanView.cs" />

    <Compile Include="ZXing\ZXingOverlayView.cs" />

  </ItemGroup>

  <ItemGroup>

    <None Include="app.config" />

@@ -524,10 +534,8 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelTwo.png" />

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

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

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

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

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

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

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

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

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

@@ -1467,6 +1475,81 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidResource Include="Resources\layout\zxing_layout.xml" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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