From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL-ON_Android/HDL-ON_Android.csproj | 123 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 30 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 58db780..fd2686f 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
@@ -37,6 +37,16 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
+ <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
+ <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
+ <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <BundleAssemblies>false</BundleAssemblies>
+ <AndroidEnableMultiDex>false</AndroidEnableMultiDex>
+ <AndroidUseAapt2>true</AndroidUseAapt2>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -51,8 +61,15 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+ <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
+ <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
+ <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Shared.Droid.JPush">
+ <HintPath>..\DLL\Shared.Droid.JPush.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
@@ -145,9 +162,6 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
- <Reference Include="LC_SDK">
- <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
- </Reference>
<Reference Include="Square.OkHttp3">
<HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
</Reference>
@@ -157,13 +171,22 @@
<Reference Include="ys">
<HintPath>..\DLL\EZvizMonitor\ys.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>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
+ <Compile Include="Other\JPush\JPushFirmBroadcast.cs" />
+ <Compile Include="Other\JPush\JPushOpenClickActivity.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Application.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="SplashActivity.cs" />
<Compile Include="ZXingCustomScanView.cs" />
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
@@ -177,11 +200,17 @@
<Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
<Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
<Compile Include="LeChengVideoActivity.cs" />
+ <Compile Include="Other\HDLONUtils.cs" />
</ItemGroup>
<ItemGroup>
+ <AndroidAsset Include="Assets\agconnect-services.json" />
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Assets\AboutAssets.txt" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -379,28 +408,40 @@
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\launchImage.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xhdpi\Loading.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-hdpi\Loading.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-mdpi\Loading.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xxhdpi\Loading.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xxxhdpi\Loading.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
@@ -427,6 +468,40 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_blue.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irfan.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\AirFreshBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment3.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingCGS1bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingLitebg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AddTargetIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\RightIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\FaceIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\CheckIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\CheckOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\SetLightSceneIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\DefenseStatusIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\DisarmStatusIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\DefenseAlarmIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceInAlarmIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalbreaker.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\FailIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\TrueIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhcho.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HchoBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\security.png" />
+ <AndroidAsset Include="Assets\Phone\Public\HookIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Property.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\PropertyOn.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
@@ -450,9 +525,6 @@
</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="Xamarin.Android.Support.Constraint.Layout">
<Version>1.1.0</Version>
@@ -1237,16 +1309,6 @@
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
@@ -1323,8 +1385,9 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
+ <ItemGroup />
<ItemGroup>
- <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
+ <Folder Include="libs\arm64-v8a\" />
</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