From 6692d867a0876b014be3cbd64bc3a237a026dc2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 十月 2022 09:57:15 +0800
Subject: [PATCH] 修改安卓隐私确认弹窗，隐私协议英文的问题
---
HDL-ON_Android/HDL-ON_Android.csproj | 124 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 28741b6..2ca4b05 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,79 @@
<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\BackIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" />
+ <AndroidAsset Include="Assets\h5\index.html" />
+ <AndroidAsset Include="Assets\h5\static\index.b0707a6a.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\chunk-vendors.c6df545a.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.86bf9f46.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" />
+ <AndroidAsset Include="Assets\h5\static\js\index.301c141f.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e47ab5d3.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\Inverter\Icon1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon3.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -441,6 +527,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 +1421,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 +1501,10 @@
<ItemGroup />
<ItemGroup>
<Folder Include="libs\arm64-v8a\" />
+ <Folder Include="Zxing\" />
+ <Folder Include="Assets\Phone\FunctionIcon\CAC\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Panel\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
</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