From e552072d347efcfaed35ebb8050beb741f77badd Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期四, 02 九月 2021 16:01:48 +0800
Subject: [PATCH] 解决home键、荧石sdk冲突
---
HDL-ON_Android/HDL-ON_Android.csproj | 1 +
ys/Jars/app-release.aar | 0
HDL-ON_Android/SplashActivity.cs | 22 ++++++++++++++++++++++
DLL/EZvizMonitor/ys.dll | 0
DLL/Shared.Droid.dll | 0
5 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/DLL/EZvizMonitor/ys.dll b/DLL/EZvizMonitor/ys.dll
index 95a7b56..3017386 100644
--- a/DLL/EZvizMonitor/ys.dll
+++ b/DLL/EZvizMonitor/ys.dll
Binary files differ
diff --git a/DLL/Shared.Droid.dll b/DLL/Shared.Droid.dll
index 999dac3..14a14eb 100644
--- a/DLL/Shared.Droid.dll
+++ b/DLL/Shared.Droid.dll
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 22e975d..9f710d6 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -189,6 +189,7 @@
<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" />
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
new file mode 100644
index 0000000..3ba8ab7
--- /dev/null
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -0,0 +1,22 @@
+锘縰sing Android.App;
+using Android.Content;
+using Android.OS;
+
+using Shared;
+
+namespace HDL_ON_Android
+{
+ [Activity(Label = "SplashActivity", Theme = "@style/MyTheme", MainLauncher = true)]
+ public class SplashActivity : Activity
+ {
+ protected override void OnCreate(Bundle savedInstanceState)
+ {
+ base.OnCreate(savedInstanceState);
+
+ Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
+ i.SetFlags(ActivityFlags.NewTask);
+ StartActivity(i);
+ Finish();
+ }
+ }
+}
\ No newline at end of file
diff --git a/ys/Jars/app-release.aar b/ys/Jars/app-release.aar
index 8277f9d..8bc979d 100644
--- a/ys/Jars/app-release.aar
+++ b/ys/Jars/app-release.aar
Binary files differ
--
Gitblit v1.8.0