From 2d2e5b89400dfe9c6ea38c82d3cd4dd344ba654a Mon Sep 17 00:00:00 2001
From: ocean <503259349@qq.com>
Date: Thu, 27 Jun 2024 17:09:51 +0800
Subject: [PATCH] update

---
 app/build.gradle.kts                           |  4 ++--
 .../offline/music/activity/LaunchActivity.kt   | 18 +++++++++---------
 .../melody/offline/music/firebase/Constants.kt |  2 +-
 .../main/res/layout/activity_liked_songs.xml   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e10c085..981c241 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 = 3
-        versionName = "1.0.3"
+        versionCode = 4
+        versionName = "1.0.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
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 2d1785b..f62e0ab 100644
--- a/app/src/main/java/melody/offline/music/activity/LaunchActivity.kt
+++ b/app/src/main/java/melody/offline/music/activity/LaunchActivity.kt
@@ -92,21 +92,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 1e27f90..412d048 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": 3,
+            "versionCode": 4,
             "enter": false
         }
     """
diff --git a/app/src/main/res/layout/activity_liked_songs.xml b/app/src/main/res/layout/activity_liked_songs.xml
index c1bcb16..eab4a1c 100644
--- a/app/src/main/res/layout/activity_liked_songs.xml
+++ b/app/src/main/res/layout/activity_liked_songs.xml
@@ -313,7 +313,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="12dp"
-                            android:text="@string/download"
+                            android:text="@string/download_save_offline"
                             android:textColor="@color/white"
                             android:textSize="14dp" />