From 34d49c20c2c2543658e844847c5eaa87f4c954e9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:28:40 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into NewFilePath
---
HDL-ON_Android/HDL-ON_Android.csproj | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 2a00b23..4c76478 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -204,6 +204,7 @@
<Folder Include="Assets\Phone\DeviceIcon\" />
<Folder Include="Other\" />
<Folder Include="Other\JPush\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -678,6 +679,8 @@
<AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg5.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\location.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\changesinoutdoor.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\UserTypebg2.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\sensor.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirCleanerThiinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobotThinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
@@ -725,6 +728,31 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HeightGear.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\FanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WeepRobotIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\SetTimeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\PowerLowIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorPirIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorDoorIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0