From 34d49c20c2c2543658e844847c5eaa87f4c954e9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:28:40 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 63 +++++++------------------------
1 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a28c075..248888f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -121,53 +121,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40路40%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60路60%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58路58%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87路87%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80路80%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120路120%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120路120%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180路180%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20路20.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40路40%402x-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29路29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58路58%402x-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024路1024%402x.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
<ImageAsset Include="Assets.xcassets\add_server1.imageset\add_server1.png" />
<ImageAsset Include="Assets.xcassets\add_server1.imageset\add_server1%402x.png" />
<ImageAsset Include="Assets.xcassets\add_server1.imageset\Contents.json" />
@@ -489,6 +442,7 @@
<Folder Include="Other\" />
<Folder Include="Resources\zh-Hans.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
+ <Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1031,7 +985,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\ref.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
@@ -1040,6 +993,20 @@
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\SetTimeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\PowerLowIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0