YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改点唱房页面展示错误

Browse Source
This commit is contained in:
梁小江
2025-11-19 09:43:33 +08:00
parent 88a94c7c10
commit b3f6d3a3fb
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MainModule/src/main/res/layout/fragment_jukebox.xml
View File

@@ -67,13 +67,15 @@
<com.xscm.moduleutil.widget.CircularImage <com.xscm.moduleutil.widget.CircularImage
android:id="@+id/ci_user_ava" android:id="@+id/ci_user_ava"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_61" android:layout_marginHorizontal="@dimen/dp_95"
android:layout_marginVertical="@dimen/dp_50"
android:src="@mipmap/microphone" android:src="@mipmap/microphone"
app:layout_constraintEnd_toEndOf="@+id/im_performer" app:layout_constraintEnd_toEndOf="@+id/im_performer"
app:layout_constraintStart_toStartOf="@+id/im_performer" app:layout_constraintStart_toStartOf="@+id/im_performer"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintBottom_toBottomOf="@+id/im_performer"
app:layout_constraintTop_toTopOf="@+id/im_performer" />
<TextView <TextView
android:id="@+id/tv_performer_name" android:id="@+id/tv_performer_name"

43
MainModule/src/main/res/layout/fragment_vocal_range.xml
View File

@@ -808,11 +808,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
app:alignContent="flex_start"
app:alignItems="stretch"
app:flexDirection="row"
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_start"> app:alignItems="stretch"
app:justifyContent="flex_start"
app:flexDirection="row"
app:alignContent="flex_start">
<LinearLayout <LinearLayout
android:id="@+id/ll_me_help" android:id="@+id/ll_me_help"
@@ -822,8 +822,8 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
app:layout_flexBasisPercent="25%" app:layout_flexGrow="1"
app:layout_flexGrow="1"> app:layout_flexBasisPercent="25%">
<ImageView <ImageView
android:layout_width="@dimen/dp_24" android:layout_width="@dimen/dp_24"
@@ -847,8 +847,8 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
app:layout_flexBasisPercent="25%" app:layout_flexGrow="1"
app:layout_flexGrow="1"> app:layout_flexBasisPercent="25%">
<ImageView <ImageView
android:layout_width="@dimen/dp_24" android:layout_width="@dimen/dp_24"
@@ -873,8 +873,8 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="visible" android:visibility="visible"
app:layout_flexBasisPercent="25%" app:layout_flexGrow="1"
app:layout_flexGrow="1"> app:layout_flexBasisPercent="25%">
<ImageView <ImageView
android:layout_width="@dimen/dp_24" android:layout_width="@dimen/dp_24"
@@ -898,8 +898,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="invisible"> android:visibility="gone"
android:visibility="visible"
app:layout_flexGrow="1" app:layout_flexGrow="1"
app:layout_flexBasisPercent="25%"> app:layout_flexBasisPercent="25%">
@@ -917,12 +916,6 @@
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@+id/ll_me_income" android:id="@+id/ll_me_income"
@@ -1014,7 +1007,7 @@
android:orientation="vertical" android:orientation="vertical"
android:visibility="invisible" android:visibility="invisible"
app:layout_flexBasisPercent="25%" app:layout_flexBasisPercent="25%"
app:layout_flexGrow="1"></LinearLayout> app:layout_flexGrow="1"/>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@@ -1025,8 +1018,18 @@
android:orientation="vertical" android:orientation="vertical"
android:visibility="invisible" android:visibility="invisible"
app:layout_flexBasisPercent="25%" app:layout_flexBasisPercent="25%"
app:layout_flexGrow="1"></LinearLayout> app:layout_flexGrow="1"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="@dimen/dp_46"
android:layout_gravity="bottom"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="invisible"
app:layout_flexGrow="1"
app:layout_flexBasisPercent="25%"/>
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
</LinearLayout> </LinearLayout>

6
app/build.gradle
View File

@@ -117,9 +117,9 @@ android {
def versionName = variant.versionName def versionName = variant.versionName
def versionCode = variant.versionCode def versionCode = variant.versionCode
// 获取当前时间戳（格式：yyyyMMddHHmmss） // 获取当前时间戳（格式：yyyyMMddHHmmss）
def buildTimes = new Date().format("yyyy-MM-dd_HH_mm_ss") def buildTimes = new Date().format("yyyy-MM-dd")
// def fileName = "羽声_${versionName}_${buildTimes}.apk" def fileName = "羽声_${versionName}_${versionCode}_${buildTimes}.apk"
def fileName = "羽声_${buildTimes}.apk" // def fileName = "羽声_${buildTimes}.apk"
output.outputFileName = fileName output.outputFileName = fileName
} }
} }

4
gradle.properties
View File

@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false #org.gradle.deamon=false
android.injected.testOnly=false android.injected.testOnly=false
APP_VERSION_NAME=1.0.5.3 APP_VERSION_NAME=1.0.6.3
APP_VERSION_CODE=43 APP_VERSION_CODE=53
org.gradle.jvm.toolchain.useLegacyAdapters=false org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15