From a3313818a548d51777ae4e6cc006e9d1e2c1036e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 07 四月 2023 09:15:37 +0800
Subject: [PATCH] 群控备份
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 151 +++++++++++++++++++++++++++++++-------------------
1 files changed, 94 insertions(+), 57 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ed1416a..60b6ad2 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -26,7 +26,7 @@
<MtouchLink>Full</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
- <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
+ <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<CodesignProvision>On+Dev-20210616-1</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
@@ -59,6 +59,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+<CodesignProvision>OnPro230329-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -68,7 +69,7 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
@@ -86,35 +87,35 @@
<HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="MJRefresh_Xamarin">
- <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.JLCountryCode">
<HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
</Reference>
- <Reference Include="EZSDK.IOS">
- <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.ESVideoOnSDK">
- <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.LCVideoOnSDK">
- <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.HDLSceneSiri">
<HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.HDLLinphoneSDK">
- <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
- </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>
<Reference Include="Shared.IOS">
<HintPath>..\DLL\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.HDLLinphoneSDK">
+ <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.LCVideoOnSDK">
+ <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.HDLCNVRSDK">
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLCNVRSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.ESVideoOnSDK">
+ <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.HDLFVSDK">
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="EZSDK.IOS">
+ <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -141,6 +142,12 @@
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.0</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.MJRefresh">
+ <Version>3.2.2</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
+ <Version>0.2.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -492,6 +499,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 +1430,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 +1453,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 +1511,66 @@
<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\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.2e54df77.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-inverter-index.c7bff58c.js" />
+ <BundleResource Include="Resources\h5\static\js\chunk-vendors.c6df545a.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.e7dd0a58.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\MusicIcon\currentPlayList.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1560,10 +1597,6 @@
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
- <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
- <Name>Blufi</Name>
- </ProjectReference>
<ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
<IsAppExtension>true</IsAppExtension>
<Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
@@ -1578,6 +1611,10 @@
<Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
<Name>SiriKit</Name>
</ProjectReference>
+ <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+ <Name>Blufi</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Base.lproj\Intents.intentdefinition" />
--
Gitblit v1.8.0