diff --git a/app/src/main/res/layout/dialog_notice_layout.xml b/app/src/main/res/layout/dialog_notice_layout.xml index f043553..660f392 100644 --- a/app/src/main/res/layout/dialog_notice_layout.xml +++ b/app/src/main/res/layout/dialog_notice_layout.xml @@ -37,7 +37,6 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" - app:layout_constraintBottom_toTopOf="@+id/tvMySee" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvNewTitle" @@ -55,6 +54,7 @@ android:gravity="center" android:textColor="#FF333333" android:textSize="16sp" + android:textColorLink="@color/blue_0080FF" /> @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="28dp" - android:layout_marginTop="10dp" + android:layout_marginTop="20dp" android:gravity="center" android:text="@string/ReadAlready" android:textColor="#fff" @@ -78,6 +78,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/contentNet" android:layout_marginBottom="20dp" /> diff --git a/build.gradle.kts b/build.gradle.kts index da0e917..d426670 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,8 +64,8 @@ subprojects { } minSdk = 21 targetSdk = 34 - versionName = "1.0.4.7" - versionCode = 1047 + versionName = "1.0.4.8" + versionCode = 1048 resValue("string", "release_name", "v$versionName") resValue("integer", "release_code", "$versionCode") externalNativeBuild { @@ -93,7 +93,7 @@ subprojects { } productFlavors { flavorDimensions("feature") - create("2001") { + create("0000") { isDefault = true dimension = flavorDimensionList[0] buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") @@ -101,7 +101,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("String", "applicationId", "\"com.jsq.wufu\"") buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"") - buildConfigField("String", "productId", "\"2001\"") + buildConfigField("String", "productId", "\"0000\"") manifestPlaceholders( mapOf( "APP_NAME" to "@string/wf", @@ -112,7 +112,7 @@ subprojects { } sourceSets { - getByName("2001") { + getByName("0000") { java.srcDirs("src/foss/java") } }