From 0326a1d130e2a9686e2463963519cffd28aaccdc Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 10:01:38 +0800
Subject: [PATCH] 还原配置
---
HDL-ON_Android/HDL-ON_Android.csproj | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index bf93a2c..c8338ba 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -37,6 +37,12 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
+ <AndroidKeyStore>true</AndroidKeyStore>
+ <AndroidSigningKeyStore>D:\job\job\On+\HDL_APP_Project\on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
+ <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
+ <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -53,6 +59,9 @@
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</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" />
@@ -157,9 +166,14 @@
<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>
</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" />
@@ -179,6 +193,7 @@
<Compile Include="LeChengVideoActivity.cs" />
</ItemGroup>
<ItemGroup>
+ <AndroidAsset Include="Assets\agconnect-services.json" />
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Assets\AboutAssets.txt" />
@@ -379,28 +394,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>
@@ -481,9 +508,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>
@@ -1354,12 +1378,7 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
- <Folder Include="Assets\Phone\PersonalCenter\FacePassage\" />
- <Folder Include="Assets\Phone\FunctionIcon\Light\LightScene\" />
- <Folder Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\" />
- </ItemGroup>
+ <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" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0