2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -186,6 +186,12 @@
    <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.Smartrefresh">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>

    </Reference>

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

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

    </Reference>

  </ItemGroup>

  <ItemGroup>

    <Compile Include="Application.cs" />

@@ -435,7 +441,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 +542,10 @@
    <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" />

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

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

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

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

  </ItemGroup>

  <ItemGroup>

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

@@ -1227,8 +1232,50 @@
    <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>

  <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')" />