From 631618ace471309f3f6cf51b08e8c2fc8fe7a8be Mon Sep 17 00:00:00 2001
From: ocean <503259349@qq.com>
Date: Fri, 5 Jul 2024 11:57:20 +0800
Subject: [PATCH] update

---
 app/build.gradle.kts                           | 18 +++++++++---------
 .../offline/music/activity/LaunchActivity.kt   | 18 +++++++++---------
 .../melody/offline/music/firebase/Constants.kt |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 981c241..4c2e913 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
         applicationId = "com.hi.melody.music.noise"
         minSdk = 24
         targetSdk = 34
-        versionCode = 4
-        versionName = "1.0.4"
+        versionCode = 5
+        versionName = "1.0.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -35,13 +35,13 @@ android {
                 "proguard-rules.pro"
             )
         }
-//        debug {
-//            isMinifyEnabled = true
-//            proguardFiles(
-//                getDefaultProguardFile("proguard-android-optimize.txt"),
-//                "proguard-rules.pro"
-//            )
-//        }
+        debug {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/app/src/main/java/melody/offline/music/activity/LaunchActivity.kt b/app/src/main/java/melody/offline/music/activity/LaunchActivity.kt
index 97ff315..9343445 100644
--- a/app/src/main/java/melody/offline/music/activity/LaunchActivity.kt
+++ b/app/src/main/java/melody/offline/music/activity/LaunchActivity.kt
@@ -93,21 +93,21 @@ class LaunchActivity : MoBaseActivity() {
     }
 
     private fun toMainActivity() {
-//        if (!withPermission()) {
-//            if (type == 1) {//如果type等于1，则是从后台进入的应用，不进行跳转直接关闭启动页
-//                finish()
-//            } else {
-//                startActivity(Intent(this, MainActivity::class.java))
-//                finish()
-//            }
-//        } else {
+        if (!withPermission()) {
+            if (type == 1) {//如果type等于1，则是从后台进入的应用，不进行跳转直接关闭启动页
+                finish()
+            } else {
+                startActivity(Intent(this, MainActivity::class.java))
+                finish()
+            }
+        } else {
             if (type == 1) {
                 finish()
             } else {
                 startActivity(Intent(this, PrimaryActivity::class.java))
                 finish()
             }
-//        }
+        }
     }
 
     private fun loadAd() {
diff --git a/app/src/main/java/melody/offline/music/firebase/Constants.kt b/app/src/main/java/melody/offline/music/firebase/Constants.kt
index 412d048..b6f2622 100644
--- a/app/src/main/java/melody/offline/music/firebase/Constants.kt
+++ b/app/src/main/java/melody/offline/music/firebase/Constants.kt
@@ -5,7 +5,7 @@ object Constants {
     const val KEY_SHOULD_ENTER_MUSIC_JSON = "key_should_enter_music_json"
     const val DEFAULT_SHOULD_ENTER_MUSIC_JSON = """
         {
-            "versionCode": 4,
+            "versionCode": 5,
             "enter": false
         }
     """