合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -159,6 +159,9 @@
    <Reference Include="Xamarin.Android.Support.Core.Utils">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.Utils.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Design">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Fragment">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Fragment.dll</HintPath>

    </Reference>

@@ -435,7 +438,6 @@
    <AndroidAsset Include="Assets\Phone\Item\Add_Category.png" />

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

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

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

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

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

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

@@ -537,10 +539,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 +1225,89 @@
    <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>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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