From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL-ON_Android/HDL-ON_Android.csproj | 221 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 150 insertions(+), 71 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 2a8e2ad..95ee379 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -29,7 +29,7 @@
<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>
@@ -51,6 +51,9 @@
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+ <AndroidLinkTool></AndroidLinkTool>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <WarningsNotAsErrors></WarningsNotAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -61,6 +64,66 @@
<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>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -75,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" />
@@ -127,6 +184,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
+ <Folder Include="Resources\layout\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -232,7 +290,60 @@
<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" />
@@ -276,7 +387,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" />
@@ -331,10 +441,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 +468,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" />
@@ -385,67 +496,35 @@
<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\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\.DS_Store" />
- <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" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Shared.Droid\Shared.Droid.csproj">
- <Project>{B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}</Project>
- <Name>Shared.Droid</Name>
- </ProjectReference>
+ <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" />
</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