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_iOS/HDL-ON_iOS.csproj | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ae25681..248888f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -442,6 +442,7 @@
<Folder Include="Other\" />
<Folder Include="Resources\zh-Hans.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
+ <Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -984,7 +985,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\ref.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
@@ -993,6 +993,20 @@
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\SetTimeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\PowerLowIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0