This commit is contained in:
ocean 2024-06-27 17:09:51 +08:00
parent c2b80a6763
commit 2d2e5b8940
4 changed files with 13 additions and 13 deletions

View File

@ -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"

View File

@ -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() {

View File

@ -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
}
"""

View File

@ -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" />