From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL-ON_iOS/APP_IOS.csproj | 137 +++++++++++++--------------------------------
1 files changed, 40 insertions(+), 97 deletions(-)
diff --git a/HDL-ON_iOS/APP_IOS.csproj b/HDL-ON_iOS/APP_IOS.csproj
index 87c716b..a7553cf 100644
--- a/HDL-ON_iOS/APP_IOS.csproj
+++ b/HDL-ON_iOS/APP_IOS.csproj
@@ -25,9 +25,9 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>Full</MtouchLink>
<MtouchDebug>true</MtouchDebug>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>Apple Development: Zhongwu Zhu (BLBN6556AU)</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
- <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
+ <CodesignProvision>001_SantanOnPro_Dev_2024-04-19</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
@@ -39,9 +39,9 @@
<WarningLevel>4</WarningLevel>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
-<CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+<CodesignKey>Apple Distribution: Zhongwu Zhu (TD9BRHLD68)</CodesignKey>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>ComHdlOnProAdHoc20220117-1</CodesignProvision>
+<CodesignProvision>001_SantanOnPro_AdH_2024-04-19</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -52,7 +52,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: Zhongwu Zhu (BLBN6556AU)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>None</MtouchLink>
@@ -60,7 +60,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
+<CodesignProvision>001_SantanOnPro_Dev_2024-04-19</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -70,12 +70,12 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Distribution: Zhongwu Zhu (TD9BRHLD68)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodesignProvision>OnPro240130-1-Hoc</CodesignProvision>
+ <CodesignProvision>001_SantanOnPro_AdH_2024-04-19</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -92,37 +92,25 @@
<Reference Include="Shared.IOS.JLCountryCode">
<HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.HDLSceneSiri">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
- </Reference>
<Reference Include="HDL.Shared.IOS.ScanQRCode">
<HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.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 Include="Shared.IOS">
+ <HintPath>..\DLL\Shared.IOS.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 Include="Shared.IOS.HDLSceneSiri">
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
<Reference Include="EZSDK.IOS">
<HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS">
- <HintPath>..\DLL\Shared.IOS.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
- <Version>13.0.1</Version>
+ <Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.1.0</Version>
@@ -440,28 +428,20 @@
<ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" />
<ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" />
<ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
<ImageAsset Include="Resources\Assets.xcassets\Contents.json" />
- <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" />
- <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" />
- <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\launchIcon.png" />
<ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\Contents.json" />
- <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" />
- <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" />
<ImageAsset Include="Resources\Assets.xcassets\.DS_Store" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180x180.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\.DS_Store" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640x960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125x2436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750x1334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640x1136.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024x1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024x1024 1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120 1.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\1125x2436.png" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@@ -1724,35 +1704,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
- <BundleResource Include="Resources\h5\index.html" />
- <BundleResource Include="Resources\h5\static\index.63b34199.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.a5a00a32.js" />
- <BundleResource Include="Resources\h5\static\js\index.3517131b.js" />
- <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\pages-index-index~pages-inverter-index.0253e8cd.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\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
@@ -1780,6 +1731,11 @@
<BundleResource Include="Resources\Phone\LogicIcon\electricaltvhisense.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
+ <BundleResource Include="Resources\EZ\zh-Hans.lproj\EZMain.strings" />
+ <BundleResource Include="Resources\EZ\zh-Hans.lproj\AddDevice.strings" />
+ <BundleResource Include="Resources\EZ\en.lproj\EZMain.strings" />
+ <BundleResource Include="Resources\EZ\en.lproj\AddDevice.strings" />
+ <BundleResource Include="Resources\Phone\Collection\MesCenter\default_image.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1793,40 +1749,27 @@
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87x87.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20x20.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29x29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
- <IsAppExtension>true</IsAppExtension>
- <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
- <Name>SiriIntents</Name>
+ <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+ <Name>Blufi</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\SiriKit\SiriKit.csproj">
+ <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
+ <Name>SiriKit</Name>
</ProjectReference>
<ProjectReference Include="..\SiriIntentsUI\SiriIntentsUI.csproj">
<IsAppExtension>true</IsAppExtension>
<Project>{ACC48A7F-250B-4915-A250-9BC399DBD6B3}</Project>
<Name>SiriIntentsUI</Name>
</ProjectReference>
- <ProjectReference Include="..\SiriKit\SiriKit.csproj">
- <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>
- <ProjectReference Include="..\UMSdk\UMSdk.csproj">
- <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
- <Name>UMSdk</Name>
+ <ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
+ <IsAppExtension>true</IsAppExtension>
+ <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
+ <Name>SiriIntents</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0