From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL-ON_Android/HDL-ON_Android.csproj | 359 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 314 insertions(+), 45 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 397d73a..7c1a945 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -17,12 +17,13 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
+ <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -32,25 +33,25 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
- <AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
- <AndroidSupportedAbis>arm64-v8a;armeabi-v7a</AndroidSupportedAbis>
+ <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
+ <AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
- <Optimize>True</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
- <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
- <AndroidLinkMode>SdkOnly</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+ <MandroidI18n>cjk</MandroidI18n>
+ <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
+ <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -62,10 +63,64 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
<Reference Include="Shared.Droid">
- <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
+ <HintPath>..\DLL\Shared.Droid.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ <HintPath>..\DLL\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.Smartrefresh">
+ <HintPath>..\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.TouchID">
+ <HintPath>..\DLL\Android\Shared.Droid.TouchID.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Arch.Core.Common">
+ <HintPath>..\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
+ <HintPath>..\DLL\Android\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
+ <HintPath>..\DLL\Android\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Annotations">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Annotations.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Compat">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Compat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Core.UI">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Core.UI.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Core.Utils">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Fragment">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Fragment.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Media.Compat">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Transition">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Transition.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v4">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.v4.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.AppCompat">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Vector.Drawable">
+ <HintPath>..\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -73,6 +128,9 @@
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Application.cs" />
+ <Compile Include="Scan.cs" />
+ <Compile Include="ZXingCustomScanView.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -80,12 +138,6 @@
<None Include="Assets\AboutAssets.txt" />
</ItemGroup>
<ItemGroup>
- <AndroidResource Include="Resources\layout\activity_main.xml">
- <SubType>Designer</SubType>
- </AndroidResource>
- <AndroidResource Include="Resources\layout\content_main.xml">
- <SubType>Designer</SubType>
- </AndroidResource>
<AndroidResource Include="Resources\values\colors.xml" />
<AndroidResource Include="Resources\values\dimens.xml" />
<AndroidResource Include="Resources\values\ic_launcher_background.xml" />
@@ -94,21 +146,6 @@
<AndroidResource Include="Resources\menu\menu_main.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
- <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
- <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_foreground.png" />
- <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_round.png" />
- <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
- <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_foreground.png" />
- <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_round.png" />
- <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
- <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_foreground.png" />
- <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_round.png" />
- <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
- <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_foreground.png" />
- <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" />
- <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
- <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_foreground.png" />
- <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable\Loading.png">
<SubType></SubType>
<Generator></Generator>
@@ -121,9 +158,44 @@
<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>
+ <AndroidResource Include="Resources\layout\zxing_layout.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-mdpi\Icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
+ <Folder Include="Resources\layout\" />
+ <Folder Include="Assets\Phone\Intelligence\" />
+ <Folder Include="Assets\Phone\DeviceIcon\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -139,17 +211,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" />
@@ -159,8 +234,6 @@
<AndroidAsset Include="Assets\Phone\Navigation\IntellectualizationIconOn.png" />
<AndroidAsset Include="Assets\Phone\Navigation\ClassificationIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\UserPageNavbg.png" />
- <AndroidAsset Include="Assets\Phone\Navigation\CollectionIconOn.png" />
- <AndroidAsset Include="Assets\Phone\Navigation\CollectionIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\PersonalCenterIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\IntellectualizationIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\ClassificationIconOn.png" />
@@ -179,24 +252,25 @@
<AndroidAsset Include="Assets\Phone\LoginIcon\1.png" />
<AndroidAsset Include="Assets\Phone\Public\ChooseIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\DownIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\.DS_Store" />
<AndroidAsset Include="Assets\Phone\Public\RightIcon.png" />
<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,24 +279,120 @@
<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\FunctionIcon\.DS_Store" />
+ <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\MusicIcon\bluetooth.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\addMusic1.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\prve1Selected.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\love1.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\selectedIcon.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\playList.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\myLove.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\radio.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\filePlay.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\collect.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\loveMusic.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\qqMusic.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\clear.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\radioIcon.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\musicIcon.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\file.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\vol.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\usb.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\localMusic.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\next1.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\loveSelected1.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\selectedMusic.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\noMusic.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\addMusic.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\playBj.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\loveRadio.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\list.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\set.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\nextSelected.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\Merge.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\playStatus.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\random.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\collectSelected.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\pause.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\progressIcon.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\prevSeletced.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\MusicBack.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\fileList.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\myList.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\single.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\edit.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\next.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\filePause.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\line.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\loveSelected.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\sourceNetx.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\love.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\pause1.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\play1.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\play.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\noSelectedIcon.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\next1Selected.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\prev.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\prve1.png" />
<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\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\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" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\.DS_Store" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\LowIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DivBg2.png" />
@@ -244,7 +414,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HighIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HeatIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HeatingIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcThinIcon1.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HightIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainOnIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainCloseWhiteIcon_Shadow.png" />
@@ -275,6 +445,19 @@
<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\Pm25Icon.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\HumidityIcon.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,6 +467,11 @@
<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\ResidenceArmIcon.png" />
@@ -299,7 +487,88 @@
<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\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" />
+ <AndroidAsset Include="Assets\Echarts\index.html" />
+ <AndroidAsset Include="Assets\Echarts\echartsNew.html" />
+ <AndroidAsset Include="Assets\Echarts\js\echarts-gl.min.js" />
+ <AndroidAsset Include="Assets\Echarts\js\20190126.js" />
+ <AndroidAsset Include="Assets\Echarts\js\world.js" />
+ <AndroidAsset Include="Assets\Echarts\js\echarts-all.js" />
+ <AndroidAsset Include="Assets\Echarts\js\dataTool.min.js" />
+ <AndroidAsset Include="Assets\Echarts\js\ecStat.min.js" />
+ <AndroidAsset Include="Assets\Echarts\js\china.js" />
+ <AndroidAsset Include="Assets\Echarts\js\echarts.min.js" />
+ <AndroidAsset Include="Assets\Echarts\js\bmap.min.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\macarons.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\macarons2.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\red.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\roma.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\helianthus.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\green.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\infographic.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\shine.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\gray.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\sakura.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\blue.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\dark.js" />
+ <AndroidAsset Include="Assets\Echarts\theme\mint.js" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DiyThumbIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DiyThumbIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicPlayOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicPlayIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\InfoOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\HomePageIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\CollectionIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\HomePageIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList4bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList2bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList1bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList3bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ResetPassword\DialogTipTitleIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\RelayOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\RelayBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DiyThumbIcon2On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTVOC.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconPm25.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconCO2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTemp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconHumidity.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\CreateScene3Bg.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\CreateScene1Bg.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\CreateScene2Bg.png" />
+ <AndroidAsset Include="Assets\Phone\Public\FuncInfoSetIcon_white.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\chooseTipIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg10.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg9.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg8.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg6.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg7.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg5.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg4.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg1.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg3.png" />
+ <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\BrightnessBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\RollingShutterIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\MotorCurtainIcon.png" />
+ <AndroidAsset Include="Assets\Phone\OnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\TipNot.png" />
+ <AndroidAsset Include="Assets\Phone\DeviceIcon\VoicePanelIcon.png" />
</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