From 92f690c0557409b6c23e6b864a6623912c67df4e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:50:49 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into Dev-Wxr
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f55067f..e420bca 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -80,6 +80,8 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
+ <Reference Include="System.Numerics" />
+ <Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="Shared.IOS.TBL">
<HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath>
@@ -118,10 +120,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
- <Version>13.0.3</Version>
+ <Version>13.0.1</Version>
</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>
@@ -439,6 +447,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" />
@@ -1566,7 +1588,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\selectlocation.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1588,6 +1609,8 @@
<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>
--
Gitblit v1.8.0