From 1830691fd179285d2df7f035e4f7f5a260e819c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 19 九月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch

---
 HDL-ON_iOS/HDL-ON_iOS.csproj |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 323b079..6e85bb0 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1584,6 +1584,35 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
       <BundleResource Include="Resources\Phone\Classification\Room\HomePagebg.png" />
+      <BundleResource Include="Resources\h5\index.html" />
+      <BundleResource Include="Resources\h5\static\index.63b34199.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\chunk-vendors.56c88730.js" />
+      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
+      <BundleResource Include="Resources\h5\static\js\index.31e0ba7a.js" />
+      <BundleResource Include="Resources\h5\static\js\pages-index-index.25064587.js" />
+      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.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\font\SourceHanSansCN-Normal.otf" />
       <BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" />
       <BundleResource Include="Resources\Phone\HisenseTv\caidan.png" />
       <BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" />
@@ -1725,35 +1754,7 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
       <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
-      <BundleResource Include="Resources\h5\index.html" />
-      <BundleResource Include="Resources\h5\static\index.63b34199.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.a5a00a32.js" />
-      <BundleResource Include="Resources\h5\static\js\index.3517131b.js" />
-      <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
-      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
-      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.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\font\SourceHanSansCN-Normal.otf" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
     </ItemGroup>
     <ItemGroup>
       <ITunesArtwork Include="iTunesArtwork" />

--
Gitblit v1.8.0