From 5b77d9d57a6cddb474a66ca54401ad5ab0892db3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 十一月 2022 14:23:42 +0800
Subject: [PATCH] Merge branch 'dev--wxr' into LcSdkV1
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 91 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 36 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 077eb89..514a434 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -113,9 +113,6 @@
<Reference Include="HDL.Shared.IOS.ScanQRCode">
<HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS">
- <HintPath>..\DLL\Shared.IOS.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
@@ -492,6 +489,8 @@
<Folder Include="Base.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\CAC\" />
<Folder Include="Resources\Phone\FunctionIcon\Panel\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Inverter\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1421,37 +1420,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 +1443,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" />
@@ -1544,6 +1511,54 @@
<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\Phone\FunctionIcon\Inverter\Icon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon3.png" />
+ <BundleResource Include="Resources\Phone\Public\IotCheckIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\IotCheckOnIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\LinkIotIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensormmv_pose.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MechanicalArmFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalmechanical_arm.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securityipcamimou.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_white.png" />
+ <BundleResource Include="Resources\h5\index.html" />
+ <BundleResource Include="Resources\h5\static\index.b0707a6a.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\index.fdfbe853.js" />
+ <BundleResource Include="Resources\h5\static\js\chunk-vendors.c6df545a.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-inverter-index.8da2cd44.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.fee066cc.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1588,6 +1603,10 @@
<Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
<Name>SiriKit</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\..\Downloads\Library\Shared.IOS\Shared.IOS.csproj">
+ <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
+ <Name>Shared.IOS</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Base.lproj\Intents.intentdefinition" />
--
Gitblit v1.8.0