diff --git a/MainModule/src/main/res/layout/fragment_jukebox.xml b/MainModule/src/main/res/layout/fragment_jukebox.xml index 12843c3a..119d39bf 100644 --- a/MainModule/src/main/res/layout/fragment_jukebox.xml +++ b/MainModule/src/main/res/layout/fragment_jukebox.xml @@ -67,13 +67,15 @@ + app:layout_constraintBottom_toBottomOf="@+id/im_performer" + app:layout_constraintTop_toTopOf="@+id/im_performer" /> + app:alignItems="stretch" + app:justifyContent="flex_start" + app:flexDirection="row" + app:alignContent="flex_start"> + app:layout_flexGrow="1" + app:layout_flexBasisPercent="25%"> + app:layout_flexGrow="1" + app:layout_flexBasisPercent="25%"> + app:layout_flexGrow="1" + app:layout_flexBasisPercent="25%"> - android:visibility="visible" + android:visibility="gone" app:layout_flexGrow="1" app:layout_flexBasisPercent="25%"> @@ -917,12 +916,6 @@ android:textSize="@dimen/sp_12" /> - + app:layout_flexGrow="1"/> + app:layout_flexGrow="1"/> + diff --git a/app/build.gradle b/app/build.gradle index 9ddbd701..fb64297d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -117,9 +117,9 @@ android { def versionName = variant.versionName def versionCode = variant.versionCode // 获取当前时间戳(格式:yyyyMMddHHmmss) - def buildTimes = new Date().format("yyyy-MM-dd_HH_mm_ss") -// def fileName = "羽声_${versionName}_${buildTimes}.apk" - def fileName = "羽声_${buildTimes}.apk" + def buildTimes = new Date().format("yyyy-MM-dd") + def fileName = "羽声_${versionName}_${versionCode}_${buildTimes}.apk" +// def fileName = "羽声_${buildTimes}.apk" output.outputFileName = fileName } } diff --git a/gradle.properties b/gradle.properties index 90b7bb32..6be7fae0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.5.3 -APP_VERSION_CODE=43 +APP_VERSION_NAME=1.0.6.3 +APP_VERSION_CODE=53 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15