Merge branch 'Dev-Branch' into wjc

wjc

2023-08-24 ac8660d2dd439e8074c1760cbe6cc9465a452193

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -27,7 +27,7 @@
        <MtouchDebug>true</MtouchDebug>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <CodesignProvision>OnPro230605-1-Dev</CodesignProvision>
        <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -59,7 +59,7 @@
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodesignProvision>OnPro230630-1-Dev</CodesignProvision>
<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -124,12 +124,6 @@
      </PackageReference>
      <PackageReference Include="MQTTnet">
        <Version>3.1.0</Version>
      </PackageReference>
      <PackageReference Include="Microsoft.AppCenter.Analytics">
        <Version>4.4.0</Version>
      </PackageReference>
      <PackageReference Include="Microsoft.AppCenter.Crashes">
        <Version>4.4.0</Version>
      </PackageReference>
      <PackageReference Include="ZXing.Net.Mobile">
        <Version>2.4.1</Version>
@@ -1609,9 +1603,9 @@
      <BundleResource Include="Resources\h5\static\images\left-icon.png" />
      <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
      <BundleResource Include="Resources\h5\static\js\index.cf368d6e.js" />
      <BundleResource Include="Resources\h5\static\js\index.31e0ba7a.js" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index.25064587.js" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index.cfb4b30d.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" />
@@ -1795,6 +1789,10 @@
        <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
        <Name>Blufi</Name>
      </ProjectReference>
      <ProjectReference Include="..\UMSdk\UMSdk.csproj">
        <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
        <Name>UMSdk</Name>
      </ProjectReference>
    </ItemGroup>
    <ItemGroup>
      <Content Include="Base.lproj\Intents.intentdefinition" />