From 98d002e55304e5c8ff13b7cd195920975bef69f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:16:57 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c3b2a3d..4c76478 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -729,9 +729,30 @@
<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\ref.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