From 92906312dfc5f55b6ef364f4d9da0d5768c00782 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL-ON_Android/HDL-ON_Android.csproj | 375 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 329 insertions(+), 46 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 7f202e6..e7375df 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -17,40 +17,41 @@
<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>
<DebugType>portable</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>DEBUG;TRACE;__Android__</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>
+ <DefineConstants>TRACE;__Android__;</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" />
@@ -61,6 +62,69 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
+ <Reference Include="Shared.Droid">
+ <HintPath>..\DLL\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <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>
+ <Reference Include="Shared.Droid.JLCountryCode">
+ <HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -68,6 +132,11 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Application.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="ZXingCustomScanView.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
+ <Compile Include="Other\JLCountrycode.cs" />
+ <Compile Include="Other\JPush\JPushReceiver.cs" />
+ <Compile Include="Other\JPush\JPushService.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -75,12 +144,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" />
@@ -89,21 +152,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>
@@ -124,15 +172,44 @@
<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\" />
+ <Folder Include="Other\" />
+ <Folder Include="Other\JPush\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
- <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -140,10 +217,19 @@
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
- <Version>3.0.8</Version>
+ <Version>3.0.13</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
+ </PackageReference>
+ <PackageReference Include="RestSharp">
+ <Version>106.11.7</Version>
+ </PackageReference>
+ <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">
+ <Version>3.7.0</Version>
+ </PackageReference>
+ <PackageReference Include="Bugly">
+ <Version>4.3.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -165,8 +251,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" />
@@ -185,7 +269,6 @@
<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" />
@@ -232,13 +315,65 @@
<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\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\.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" />
@@ -250,7 +385,6 @@
<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" />
@@ -276,7 +410,6 @@
<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" />
@@ -298,7 +431,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" />
@@ -331,10 +464,12 @@
<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" />
@@ -356,7 +491,6 @@
<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" />
@@ -373,7 +507,6 @@
<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" />
@@ -385,12 +518,162 @@
<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" />
+ <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_3.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
+ <AndroidAsset Include="Assets\Phone\LoginIcon\Server.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ServerInfo.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Function.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Menu.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Help.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Telephone.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\SendMessage.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Scene.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Head.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Transfer.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\All.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\System.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Alarm.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AllOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Share.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AlarmOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\ShareOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\SystemOn.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg1.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg2.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg3.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg4.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg5.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg6.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg7.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon5.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\weekon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\outletlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\back.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\scene.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\editname.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon1.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon2.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon3.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon4.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheScene.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheTime.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelGray.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelTip.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\time.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ClearIcon.png" />
+ <AndroidAsset Include="Assets\Phone\ErrorIcon.png" />
+ <AndroidAsset Include="Assets\Phone\oRobot.png" />
+ <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\PopupDialog.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIconOn.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Shared.Droid\Shared.Droid.csproj">
- <Project>{B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}</Project>
- <Name>Shared.Droid</Name>
- </ProjectReference>
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
</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