From c047239d340038cea872bae276e713ef866c0a34 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 13:22:21 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL-ON_Android/HDL-ON_Android.csproj | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index cadddce..d35a52a 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -204,6 +204,9 @@
<Folder Include="Assets\Phone\DeviceIcon\" />
<Folder Include="Other\" />
<Folder Include="Other\JPush\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
+ <Folder Include="Assets\Phone\PirIcon\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -727,11 +730,94 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HeightGear.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\FanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WeepRobotIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\SetTimeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\PowerLowIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorPirIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorDoorIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerAnionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerAnionIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBgIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBlueIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDisinfectIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDisinfectIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon1On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon2On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerGrayIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerHotDryIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerHotDryIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerLightIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerLightIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerStopIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerStopIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerTimeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerTimeIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon1On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon2On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\air.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\custom.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\dvd.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\fan.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\Infraredtreasure.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\projector.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\search.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\tv.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\stb.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\offline.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\online.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\priequipment.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\addlbuton.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\del.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\delbuton.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\dropdown.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\adddevice.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\next.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\failed.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\icon1.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\icon2.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\succeed.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\ys\ys.csproj">
+ <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
+ <Name>ys</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0