From b8e94316e41eba72d927d5ca7d931b26139ee8ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 六月 2020 09:12:53 +0800
Subject: [PATCH] 20200612
---
HDL-ON_Android/HDL-ON_Android.csproj | 121 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 15 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 397d73a..7f202e6 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -61,18 +61,13 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
- <Reference Include="Shared.Droid">
- <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Application.cs" />
+ <Compile Include="Scan.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -121,6 +116,14 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\xml\network_security_config.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\xml\file_paths.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -139,17 +142,20 @@
<PackageReference Include="MQTTnet">
<Version>3.0.8</Version>
</PackageReference>
+ <PackageReference Include="ZXing.Net.Mobile">
+ <Version>2.4.1</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
+ <AndroidAsset Include="Assets\Language.ini" />
<AndroidAsset Include="Assets\Phone\Classification\ToggleDisplayLarge.png" />
<AndroidAsset Include="Assets\Phone\Classification\ToggleDisplayThumbnail.png" />
<AndroidAsset Include="Assets\Phone\Classification\Room\AllCloseIcon.png" />
<AndroidAsset Include="Assets\Phone\Classification\Room\Roombg.png" />
- <AndroidAsset Include="Assets\Phone\Collection\.DS_Store" />
- <AndroidAsset Include="Assets\Phone\Collection\SceneCoveredOn.png" />
<AndroidAsset Include="Assets\Phone\Collection\MsgIconTip.png" />
<AndroidAsset Include="Assets\Phone\Collection\SceneCovered.png" />
<AndroidAsset Include="Assets\Phone\Collection\MsgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\NoCollectionBg.png" />
<AndroidAsset Include="Assets\Phone\Collection\Functionbg.png" />
<AndroidAsset Include="Assets\Phone\Collection\CollectionIcon.png" />
<AndroidAsset Include="Assets\Phone\Collection\ChangeViewbg.png" />
@@ -184,19 +190,21 @@
<AndroidAsset Include="Assets\Phone\Public\MinusSignIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\EditIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\Fragmentbg.png" />
- <AndroidAsset Include="Assets\Phone\Public\SelectionIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\DownIcon_2.png" />
<AndroidAsset Include="Assets\Phone\Public\LocationAddressIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\TipIcon_Failed.png" />
<AndroidAsset Include="Assets\Phone\Public\ChooseOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Switch_2.png" />
<AndroidAsset Include="Assets\Phone\Public\Logo-bg.png" />
<AndroidAsset Include="Assets\Phone\Public\Logo.png" />
+ <AndroidAsset Include="Assets\Phone\Public\TipIcon_Successfully.png" />
<AndroidAsset Include="Assets\Phone\Public\FuncInfoSetIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\ThumbImage.png" />
<AndroidAsset Include="Assets\Phone\Public\Switch.png" />
<AndroidAsset Include="Assets\Phone\Public\AddIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\UnSelectionIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\PlusSignIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\Edit.png" />
+ <AndroidAsset Include="Assets\Phone\Public\SwitchOn_2.png" />
<AndroidAsset Include="Assets\Phone\Public\Restored_Shadow.png" />
<AndroidAsset Include="Assets\Phone\Public\PowerClose.png" />
<AndroidAsset Include="Assets\Phone\Public\PowerOpen.png" />
@@ -205,18 +213,64 @@
<AndroidAsset Include="Assets\Phone\Public\ChooseRoomListbg.png" />
<AndroidAsset Include="Assets\Phone\Public\Right.png" />
<AndroidAsset Include="Assets\Phone\Public\BackIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\InfoIcon\TempIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\InfoIcon\Pm25Icon.png" />
- <AndroidAsset Include="Assets\Phone\Public\InfoIcon\HumidityIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\InfoIcon\Restored_Shadow.png" />
+ <AndroidAsset Include="Assets\Phone\Public\DeviceInfoIcon\TempIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\DeviceInfoIcon\Pm25Icon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\DeviceInfoIcon\HumidityIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\DeviceInfoIcon\Restored_Shadow.png" />
+ <AndroidAsset Include="Assets\Phone\Public\MsgIcon\LoadingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\MsgIcon\TipIconWhite.png" />
+ <AndroidAsset Include="Assets\Phone\Public\MsgIcon\TipIconBlack.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\29.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\13.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\20.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\18.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\4.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\5.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\6.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\2.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\3.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\45.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\1.png" />
+ <AndroidAsset Include="Assets\Phone\Public\AirIcon\0.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\.DS_Store" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Switch.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\SwitchOn.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\.DS_Store" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TVIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconBgGray.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TVThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVPowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TV123Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVRightIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\.DS_Store" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVleftIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVDownIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVMenuUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVMenuIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\MenuBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVBackIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVMuteIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\ReduceIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVMenuDownIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\FloorHeatingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\OrdinaryIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\NightIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\AwayIconGray.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\OrdinaryIconGray.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\NightIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\FloorHeatingOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\AwayIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AutoIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\LowIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcOnIcon.png" />
@@ -275,6 +329,17 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\ElectricFunctionBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\SensorFunctionBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\DoorLockFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\TipInfoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\WeatherFanSpeedIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\SensorColorTipBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\DiagramIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\SmogIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\UpArrow.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\LocationIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightOnIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheel.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightIcon.png" />
@@ -284,8 +349,14 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Scene\s2.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Scene\DelayIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Scene\SceneIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Socket\SocketIconBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Socket\SocketIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Socket\SocketIconOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Socket\SocketOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Socket\SocketThinIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\GeneralSettingsIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AuxiliaryFunctionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\.DS_Store" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceArmIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\HomeListbg.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AddFunctionIcon.png" />
@@ -299,7 +370,27 @@
<AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceDataBackupIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\MemberTypeIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" />
- <AndroidAsset Include="Assets\Language.ini" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\3On.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerIconRed.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\1On.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\.DS_Store" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerprintIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\2On.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\4On.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\PasswordIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\GestureIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\GestureGrayIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\4.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\2.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FaceIdIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\3.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Shared.Droid\Shared.Droid.csproj">
+ <Project>{B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}</Project>
+ <Name>Shared.Droid</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" />
--
Gitblit v1.8.0