From 981ccd4afab6271422d7f169b30a2efa55eafde1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 二月 2021 16:18:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index b546ec3..b0f5b71 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -206,6 +206,7 @@
<Folder Include="Other\JPush\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
+ <Folder Include="Assets\Phone\PirIcon\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -784,6 +785,28 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIconOn.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\air.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\custom.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\dvd.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\fan.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\Infraredtreasure.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\projector.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\search.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\tv.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\stb.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\offline.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\online.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\priequipment.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\addlbuton.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\del.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\delbuton.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\dropdown.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\adddevice.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\next.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\failed.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\icon1.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\icon2.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\succeed.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0