From bbd6b592a6b883e013ff1e0a574976ceba5009ea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 27 十月 2022 09:11:33 +0800
Subject: [PATCH] Merge branch 'dev--wxr'
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 144 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 136 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f197eec..1953591 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -51,7 +51,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
@@ -59,7 +59,6 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro220307-2-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -96,9 +95,6 @@
<Reference Include="EZSDK.IOS">
<HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS">
- <HintPath>..\DLL\Shared.IOS.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.ESVideoOnSDK">
<HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
</Reference>
@@ -113,6 +109,9 @@
</Reference>
<Reference Include="Shared.IOS.HDLFVSDK">
<HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="HDL.Shared.IOS.ScanQRCode">
+ <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -490,6 +489,7 @@
<Folder Include="Base.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\CAC\" />
<Folder Include="Resources\Phone\FunctionIcon\Panel\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Inverter\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1419,6 +1419,134 @@
<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\Phone\FunctionIcon\Acst\blue\ModeHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\PowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeCoolIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeHeatIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeHeatIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\SceneAtHome2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeFanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\TempAndHumiBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\CollectionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\TopViewBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeCoolIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\SceneSleepIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\SceneSleepIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeFanIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\SceneAtHome.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon2.png" />
+ <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\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\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" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\SceneAtHome.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\PowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeCoolIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeHeatIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeHeatIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\SceneAtHome2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeFanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\TempAndHumiBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\CollectionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\TopViewBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeCoolIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\SceneSleepIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\SceneSleepIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeFanIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\SceneAtHome.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\MsgViewBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\PowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeCoolIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeHeatIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeHeatIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\SceneAtHome2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeFanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\TempAndHumiBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\CollectionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\TopViewBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeCoolIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\SceneSleepIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\SceneSleepIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeFanIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\SceneAtHome.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\orange\MsgViewBg.png" />
+ <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\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\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\pages-inverter-index.8c87c530.js" />
+ <BundleResource Include="Resources\h5\static\js\chunk-vendors.c6df545a.js" />
+ <BundleResource Include="Resources\h5\static\js\index.b9157150.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.3667377f.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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1463,9 +1591,9 @@
<Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
<Name>SiriKit</Name>
</ProjectReference>
- <ProjectReference Include="..\UMSdk\UMSdk.csproj">
- <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
- <Name>UMSdk</Name>
+ <ProjectReference Include="..\..\..\Downloads\Library\Shared.IOS\Shared.IOS.csproj">
+ <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
+ <Name>Shared.IOS</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0