From 1de41bc038dcf623834b63422da350693429570b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 13 十二月 2023 16:20:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index b218343..bb57d01 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -133,9 +133,6 @@
<PackageReference Include="RestSharp">
<Version>106.13.0</Version>
</PackageReference>
- <PackageReference Include="Xamarin.iOS.Bugly">
- <Version>1.0.4</Version>
- </PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.0</Version>
</PackageReference>
@@ -1768,6 +1765,19 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_white.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir_hold.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordryContact.png" />
+ <BundleResource Include="Resources\Phone\Collection\FunctionArmOnbg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensormegahealth.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectlocation.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\ganjiedian.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\VideoDoorLockFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorlight.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_off_home_click.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_off_home.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_off.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home_click.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\electricaltvhisense.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0