不是新代码，别 合并

黄学彪

2020-08-07 ec34983e291d1c85284472a27109d55891f9a6b5

 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>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

  </PropertyGroup>

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

@@ -54,6 +58,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>

@@ -200,6 +208,7 @@
  </ItemGroup>

  <ItemGroup>

    <None Include="app.config" />

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

    <None Include="packages.config" />

    <None Include="Resources\AboutResources.txt" />

    <None Include="Properties\AndroidManifest.xml">

@@ -423,8 +432,6 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />

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

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

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

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

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

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

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

@@ -1474,7 +1481,7 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\Repeater.png" />

  </ItemGroup>

  <ItemGroup>

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

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

  </ItemGroup>

  <ItemGroup>

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

@@ -2163,6 +2170,180 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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