From 418b0d0a4002bc06ba3a55d1809fe46043f06c09 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 26 九月 2022 14:07:58 +0800 Subject: [PATCH] 光伏更新,金茂科技系统更新 --- HDL-ON_Android/HDL-ON_Android.csproj | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 211 insertions(+), 3 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 28741b6..2024a47 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -46,6 +46,7 @@ <BundleAssemblies>false</BundleAssemblies> <AndroidEnableMultiDex>false</AndroidEnableMultiDex> <AndroidUseAapt2>true</AndroidUseAapt2> + <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -64,6 +65,7 @@ <AndroidSigningStorePass>85521566</AndroidSigningStorePass> <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass> <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias> + <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis> </PropertyGroup> <ItemGroup> <Reference Include="Shared.Droid.JPush"> @@ -167,15 +169,22 @@ <Reference Include="Square.OkIO"> <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath> </Reference> + <Reference Include="Shared.Droid.LCVideoSDK"> + <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath> + </Reference> <Reference Include="ys"> <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath> + </Reference> + <Reference Include="UMSdkDroid"> + <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath> + </Reference> + <Reference Include="ScanSdk"> + <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath> </Reference> <Reference Include="Shared.Droid.HDLLinphone"> <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> </Reference> - <Reference Include="Shared.Droid.LCVideoSDK"> - <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath> - </Reference> + <Reference Include="Mono.Android.Export" /> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -200,6 +209,10 @@ <Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" /> <Compile Include="LeChengVideoActivity.cs" /> <Compile Include="Other\HDLONUtils.cs" /> + <Compile Include="WebviewActivity.cs" /> + <Compile Include="AgreementActivity.cs" /> + <Compile Include="Zxing\CustomCaptureActivity.cs" /> + <Compile Include="Zxing\ScanActivity.cs" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\agconnect-services.json" /> @@ -210,6 +223,170 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg1.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" /> + <AndroidAsset Include="Assets\Phone\Collection\FunctionOfflineBg.png" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\CallIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\AnswerIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\HangUpIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\DataIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\JinMaoIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\hvaccac.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" /> + <AndroidAsset Include="Assets\Phone\Public\dialogBg2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhelp.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpAlarmBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\screenpanel.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelEnviBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\EconomicIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\EconomicIconGray.png" /> + <AndroidAsset Include="Assets\Phone\MusicIcon\order.png" /> + <AndroidAsset Include="Assets\Phone\MusicIcon\single_cycle.png" /> + <AndroidAsset Include="Assets\Phone\Public\ThumbImage2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtaindream_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtaindream_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\curtaindream.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\HvacCacHumidityIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\HvacCacTempIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneRunBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneSitBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneStandBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\Collection\FunctionArmOnbg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensormegahealth.png" /> + <AndroidAsset Include="Assets\Phone\Public\Iot_agreement_icon.png" /> + <AndroidAsset Include="Assets\Phone\Public\LinkIotIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\IotCheckIcon.png" /> + <AndroidAsset Include="Assets\Phone\Public\IotCheckOnIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TempAndHumiBack.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\MsgViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\BgSubControlView.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TempAndHumiBack.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\MsgViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TempAndHumiBack.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\MsgViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TopViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TopViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TopViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseMode.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseScene.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\PowerOffIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\LvJianLogo.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AcstFunctionBg.png" /> + <AndroidAsset Include="Assets\h5\index.html" /> + <AndroidAsset Include="Assets\h5\static\index.2772579d.css" /> + <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" /> + <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" /> + <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" /> + <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" /> + <AndroidAsset Include="Assets\h5\static\images\eidt.png" /> + <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" /> + <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" /> + <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" /> + <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" /> + <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" /> + <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" /> + <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" /> + <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" /> + <AndroidAsset Include="Assets\h5\static\images\yinying.png" /> + <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" /> + <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" /> + <AndroidAsset Include="Assets\h5\static\images\left-icon.png" /> + <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.3b3b0fdd.js" /> + <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.9e7e69a0.js" /> + <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.cac3b1d6.js" /> + <AndroidAsset Include="Assets\h5\static\js\index.12e3fcbf.js" /> + <AndroidAsset Include="Assets\h5\static\js\pages-index-index.66eb9118.js" /> + <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" /> + <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" /> + <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" /> + <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BackIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> @@ -441,6 +618,33 @@ </SubType> <Generator> </Generator> + </AndroidResource> + <AndroidResource Include="Resources\layout\activity_splash.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\dialog_background2.xml"> + <SubType></SubType> + <Generator></Generator> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </AndroidResource> + <AndroidResource Include="Resources\drawable\btn_agree.xml"> + <SubType></SubType> + <Generator></Generator> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </AndroidResource> + <AndroidResource Include="Resources\drawable\btn_disagree.xml"> + <SubType></SubType> + <Generator></Generator> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </AndroidResource> + <AndroidResource Include="Resources\layout\activity_webview.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\layout\activity_zxing_layout.xml"> + <SubType></SubType> + <Generator></Generator> </AndroidResource> </ItemGroup> <ItemGroup> @@ -1308,6 +1512,7 @@ </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> + <AndroidNativeLibrary Include="libs\arm64-v8a\libelianjni.so" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" /> @@ -1387,6 +1592,9 @@ <ItemGroup /> <ItemGroup> <Folder Include="libs\arm64-v8a\" /> + <Folder Include="Zxing\" /> + <Folder Include="Assets\Phone\FunctionIcon\CAC\" /> + <Folder Include="Assets\Phone\FunctionIcon\Panel\" /> </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