From 04c9e08d5069c986c918fa2e98b22dd85921effd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 02 九月 2022 15:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxb' into Dev-Wxr
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a1955c5..50f64af 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>
@@ -1422,6 +1421,23 @@
<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\device-normal-status.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\circle-ic.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\yinying.png" />
+ <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
+ <BundleResource Include="Resources\h5\static\images\left-icon.png" />
+ <BundleResource Include="Resources\h5\static\js\index.54a11c2b.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-inverter-index.01a50026.js" />
+ <BundleResource Include="Resources\h5\static\js\chunk-vendors.1f60cf1d.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.bdd0e449.js" />
+ <BundleResource Include="Resources\h5\static\img\circle-ic.0121c69d.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1465,10 +1481,6 @@
<ProjectReference Include="..\SiriKit\SiriKit.csproj">
<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>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0