From cae4d4b5b508a666fbd0dff3c2a981fdff841bc8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 三月 2023 13:10:33 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 2843152..ef8ad4d 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>OnPro230308-3-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -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.SwiftRuntimeSupport">
+ <Version>0.2.1</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.MJRefresh">
+ <Version>3.2.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1552,11 +1559,11 @@
<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\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-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\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" />
@@ -1588,10 +1595,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>
@@ -1606,6 +1609,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