From e432812ce48e8c5de59a31f9cbc13844b3dcceb5 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Mon, 1 Apr 2024 14:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dahe/gldriver/base/App.kt   | 40 +++----------------
 app/src/main/res/values-night/themes.xml      | 16 --------
 app/src/main/res/values/themes.xml            |  4 +-
 3 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 app/src/main/res/values-night/themes.xml

diff --git a/app/src/main/java/com/dahe/gldriver/base/App.kt b/app/src/main/java/com/dahe/gldriver/base/App.kt
index c7f418f..faed818 100644
--- a/app/src/main/java/com/dahe/gldriver/base/App.kt
+++ b/app/src/main/java/com/dahe/gldriver/base/App.kt
@@ -57,11 +57,11 @@ class App : Application() {
         EsignSdk.getInstance().init(AppConfig.E_KEY, AppConfig.E_LICENSE)
         initUmeng()
 
-        var pendingIntent: PendingIntent = getActivity(
-            applicationContext, 0,
-            Intent(applicationContext, HomeActivity::class.java),
-            FLAG_UPDATE_CURRENT
-        )
+//        var pendingIntent: PendingIntent = getActivity(
+//            applicationContext, 0,
+//            Intent(applicationContext, HomeActivity::class.java),
+//            FLAG_UPDATE_CURRENT
+//        )
 //        Cactus.instance
 //            .isDebug(true)
 //            //.setTitle("大河好运")
@@ -90,36 +90,6 @@ class App : Application() {
 //                }
 //            })
 //            .register(this)
-
-// 定义前台通知的默认样式
-//        val foregroundNotification = ForegroundNotification(
-//            "大河好运2", "大河好运司机端为您提供服务", R.mipmap.app_icon
-//        ) { context, intent ->
-//            // 定义前台服务的通知点击事件
-////            ActivityUtils.startActivity(applicationContext,HomeActivity::class.java)
-//        }
-////        启动保活服务
-//        KeepLive.startWork(this,
-//            KeepLive.RunMode.ENERGY,
-//            foregroundNotification,  //你需要保活的服务，如socket连接、定时任务等，建议不用匿名内部类的方式在这里写
-//            object : UpLocationService23() {
-//                /**
-//                 * 运行中
-//                 * 由于服务可能会多次自动启动，该方法可能重复调用
-//                 */
-//                override fun onWorking() {
-//                    //  do something
-//                }
-//
-//                /**
-//                 * 服务终止
-//                 * 由于服务可能会被多次终止，该方法可能重复调用，需同onWorking配套使用，如注册和注销broadcast
-//                 */
-//                override fun onStop() {
-//                    //   do something
-//                }
-//            }
-//        )
     }
 
     override fun attachBaseContext(base: Context) {
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 34c7d6d..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.GLDriver" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9848c4e..ce15cf6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.GLDriver" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+    <style name="Theme.GLDriver" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -14,7 +14,7 @@
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="Theme.Splash" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+    <style name="Theme.Splash" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowContentOverlay">@null</item>