This commit is contained in:
ocean 2024-07-05 11:57:20 +08:00
parent c1aa62c693
commit 631618ace4
3 changed files with 19 additions and 19 deletions

View File

@ -16,8 +16,8 @@ android {
applicationId = "com.hi.melody.music.noise" applicationId = "com.hi.melody.music.noise"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 4 versionCode = 5
versionName = "1.0.4" versionName = "1.0.5"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@ -35,13 +35,13 @@ android {
"proguard-rules.pro" "proguard-rules.pro"
) )
} }
// debug { debug {
// isMinifyEnabled = true isMinifyEnabled = true
// proguardFiles( proguardFiles(
// getDefaultProguardFile("proguard-android-optimize.txt"), getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro" "proguard-rules.pro"
// ) )
// } }
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8

View File

@ -93,21 +93,21 @@ class LaunchActivity : MoBaseActivity() {
} }
private fun toMainActivity() { private fun toMainActivity() {
// if (!withPermission()) { if (!withPermission()) {
// if (type == 1) {//如果type等于1则是从后台进入的应用不进行跳转直接关闭启动页 if (type == 1) {//如果type等于1则是从后台进入的应用不进行跳转直接关闭启动页
// finish() finish()
// } else { } else {
// startActivity(Intent(this, MainActivity::class.java)) startActivity(Intent(this, MainActivity::class.java))
// finish() finish()
// } }
// } else { } else {
if (type == 1) { if (type == 1) {
finish() finish()
} else { } else {
startActivity(Intent(this, PrimaryActivity::class.java)) startActivity(Intent(this, PrimaryActivity::class.java))
finish() finish()
} }
// } }
} }
private fun loadAd() { 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 KEY_SHOULD_ENTER_MUSIC_JSON = "key_should_enter_music_json"
const val DEFAULT_SHOULD_ENTER_MUSIC_JSON = """ const val DEFAULT_SHOULD_ENTER_MUSIC_JSON = """
{ {
"versionCode": 4, "versionCode": 5,
"enter": false "enter": false
} }
""" """