From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL-ON_Android/HDL-ON_Android.csproj | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 5508cf8..bad00c1 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -204,6 +204,7 @@
<Folder Include="Assets\Phone\DeviceIcon\" />
<Folder Include="Other\" />
<Folder Include="Other\JPush\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -678,6 +679,67 @@
<AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg5.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\location.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\changesinoutdoor.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\UserTypebg2.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\sensor.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirCleanerThiinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobotThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\FixedPointModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Charge.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\CleanSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlUp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\SuctionSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\WallMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\FixedPointMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlLeft.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AreaModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlDisable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ChargeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Suction.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Clean.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AutoModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlDown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\VoiceSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Mute.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\WallModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Voice.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlEnable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\SleepModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\Fan.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\LowGear.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HandModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\Time.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\MidGearSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AutoMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AirCleanerOff.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HandMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HeightGearSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\ComfortableMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\MidGear.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\SleepMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AirCleanerOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\LowGearSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AutoModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud3.png" />
+ <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\ref.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" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0