From b69d7735274b8d0f741da8a6bb8b8e1347477a5a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 19 三月 2020 17:14:16 +0800
Subject: [PATCH] 20200319

---
 HDL-ON_iOS/HDL-ON_iOS.csproj |  101 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a94a4c9..1caf48f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,6 @@
         <MtouchDebug>true</MtouchDebug>
         <CodesignKey>iPhone Developer</CodesignKey>
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
-        <MtouchSdkVersion>13.1</MtouchSdkVersion>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
         <DebugType>none</DebugType>
@@ -139,8 +138,9 @@
         <Folder Include="Resources\Phone\Classification\" />
         <Folder Include="Resources\Phone\Classification\Room\" />
         <Folder Include="Resources\Phone\Collection\" />
-        <Folder Include="Resources\Phone\Public\FunctionIcon\" />
         <Folder Include="Resources\Phone\Public\InfoIcon\" />
+        <Folder Include="Resources\Phone\FunctionIcon\" />
+        <Folder Include="Resources\Phone\FunctionIcon\Scene\" />
     </ItemGroup>
     <ItemGroup>
         <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -200,8 +200,6 @@
       <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
       <BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
       <BundleResource Include="Resources\Phone\PersonalCenter\HomeListbg.png" />
-      <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\EditIcon.png" />
-      <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\Right.png" />
       <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" />
       <BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" />
       <BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" />
@@ -211,27 +209,92 @@
       <BundleResource Include="Resources\Phone\Collection\Functionbg.png" />
       <BundleResource Include="Resources\Phone\Collection\FunctionOnbg.png" />
       <BundleResource Include="Resources\Phone\Collection\ChangeViewbg.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\LightIcon.png" />
       <BundleResource Include="Resources\Phone\Public\InfoIcon\HumidityIcon.png" />
       <BundleResource Include="Resources\Phone\Public\InfoIcon\Pm25Icon.png" />
       <BundleResource Include="Resources\Phone\Public\InfoIcon\TempIcon.png" />
       <BundleResource Include="Resources\Phone\Public\DownIcon.png" />
       <BundleResource Include="Resources\Phone\Public\transparent.png" />
       <BundleResource Include="Resources\Phone\Collection\CollectionIcon.png" />
-      <BundleResource Include="Resources\Phone\Collection\CollectionOnIcon.png" />
-      <BundleResource Include="Resources\Phone\Collection\Switch.png" />
-      <BundleResource Include="Resources\Phone\Collection\SwitchOn.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\AcIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\AcOnIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\CurtainIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\FloorHeatingIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\FloorHeatingOnIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\LightOnIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\MusicIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\MusicOnIcon.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\Switch.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\SwitchOn.png" />
-      <BundleResource Include="Resources\Phone\Public\FunctionIcon\CurtainOnIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\CollectionWhiteIcon.png" />
+      <BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\PowerClose.png" />
+      <BundleResource Include="Resources\Phone\Public\PowerOpen.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Switch.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\SwitchOn.png" />
+      <BundleResource Include="Resources\Phone\Public\FuncInfoSetIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheel.png" />
+      <BundleResource Include="Resources\Phone\Public\ThumbImage.png" />
+      <BundleResource Include="Resources\Phone\Public\Fragmentbg.png" />
+      <BundleResource Include="Resources\Phone\Public\Restored_Shadow.png" />
+      <BundleResource Include="Resources\Phone\Public\Edit.png" />
+      <BundleResource Include="Resources\Phone\Public\RightIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainThinIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\ChooseIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\ChooseOnIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\PlusSignIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\MinusSignIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\CollectionGrayIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\Switch.png" />
+      <BundleResource Include="Resources\Phone\Public\SwitchOn.png" />
+      <BundleResource Include="Resources\Phone\Public\LocationAddressIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\AddIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\EditIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\Right.png" />
+      <BundleResource Include="Resources\Phone\Public\UnSelectionIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\SelectionIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\DownIcon_2.png" />
+      <BundleResource Include="Resources\Phone\Public\ChooseRoomListbg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\MovieMark.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\SceneIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\SceneCovered.png" />
+      <BundleResource Include="Resources\Phone\Collection\SceneCoveredOn.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\DelayIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\s2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\s1.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MusicFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FreshAirFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnergyMonitoringFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnvironmentalFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityMonitoringFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\LightFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\VideoIntercomFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\PanelFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FloorHeatingFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ACFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\CurtainFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ElectricFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SensorFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\DoorLockFunctionBg.png" />
+      <BundleResource Include="Resources\Phone\Public\InfoIcon\Restored_Shadow.png" />
     </ItemGroup>
     <ItemGroup>
       <ITunesArtwork Include="iTunesArtwork" />

--
Gitblit v1.8.0