From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/GateWay.Droid/GateWay.Droid.csproj | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp20200414/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp20200414/GateWay.Droid/GateWay.Droid.csproj
index 08606e7..b932e19 100644
--- a/ZigbeeApp20200414/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp20200414/GateWay.Droid/GateWay.Droid.csproj
@@ -1413,9 +1413,6 @@
<AndroidAsset Include="Assets\Phone\Device\SwitchSelected.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Logo\2.jpg" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\Room\AddBackground.png" />
</ItemGroup>
<ItemGroup>
@@ -2045,6 +2042,54 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueFreshAir.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\0.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\4.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\5.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\6.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\7.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\8.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\9.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\11.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\12.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneCardIcon\13.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\NormallyOpen.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Logo\2.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')" />
--
Gitblit v1.8.0