From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr

---
 HDL-ON_iOS/HDL-ON_iOS.csproj |   77 ++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ed1416a..d8caeaa 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1421,37 +1421,6 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\SomeoneSitBgIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\SomeoneStandBgIcon.png" />
       <BundleResource Include="Resources\Phone\Public\Iot_agreement_icon.png" />
-      <BundleResource Include="Resources\h5\index.html" />
-      <BundleResource Include="Resources\h5\static\index.2772579d.css" />
-      <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
-      <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
-      <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
-      <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
-      <BundleResource Include="Resources\h5\static\images\eidt.png" />
-      <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
-      <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
-      <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
-      <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
-      <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
-      <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
-      <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
-      <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
-      <BundleResource Include="Resources\h5\static\images\yinying.png" />
-      <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
-      <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
-      <BundleResource Include="Resources\h5\static\images\left-icon.png" />
-      <BundleResource Include="Resources\h5\static\js\pages-index-index.8a722e25.js" />
-      <BundleResource Include="Resources\h5\static\js\index.59e45951.js" />
-      <BundleResource Include="Resources\h5\static\js\chunk-vendors.62a46973.js" />
-      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.657e5979.js" />
-      <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
-      <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
-      <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
-      <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
-      <BundleResource Include="Resources\h5\static\js\index.f0726997.js" />
-      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.565c7b45.js" />
-      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.cac3b1d6.js" />
-      <BundleResource Include="Resources\h5\static\js\pages-index-index.18c69d8a.js" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeHumiIcon2.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\PowerIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeCoolIcon2.png" />
@@ -1475,11 +1444,10 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon2.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\MsgViewBg.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHeatIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeFanIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\CollectionIcon.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeCoolIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\SceneSleepIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\BgSubControlView.png" />
@@ -1534,6 +1502,49 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\BgChooseMode.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Acst\BgChooseScene.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\LvJianLogo.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeCoolIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeFanIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHeatIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHumiIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\SceneAtHome2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\SceneSleepIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\BackIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\ThumbImage.png" />
+      <BundleResource Include="Resources\h5\index.html" />
+      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.3b3b0fdd.js" />
+      <BundleResource Include="Resources\h5\static\js\chunk-vendors.9e7e69a0.js" />
+      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.cac3b1d6.js" />
+      <BundleResource Include="Resources\h5\static\index.2772579d.css" />
+      <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
+      <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
+      <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
+      <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
+      <BundleResource Include="Resources\h5\static\images\eidt.png" />
+      <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
+      <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
+      <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
+      <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
+      <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
+      <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
+      <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
+      <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
+      <BundleResource Include="Resources\h5\static\images\yinying.png" />
+      <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
+      <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
+      <BundleResource Include="Resources\h5\static\images\left-icon.png" />
+      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.aea6a122.js" />
+      <BundleResource Include="Resources\h5\static\js\pages-index-index.7634b70a.js" />
+      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0b8ec7be.js" />
+      <BundleResource Include="Resources\h5\static\js\index.95903989.js" />
+      <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
+      <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
+      <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
+      <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
     </ItemGroup>
     <ItemGroup>
       <ITunesArtwork Include="iTunesArtwork" />

--
Gitblit v1.8.0