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

bug fix

Browse Source
This commit is contained in:
huangjian
2020-05-08 11:14:12 +08:00
parent c96c4a7cf7
commit 9ec916c53f
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
View File

@@ -3,10 +3,14 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import androidx.recyclerview.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.View;
@@ -45,6 +49,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
private Context context;
private Unbinder unbinder;
private OptAdapter optAdapter;
public RoomOperationDialog(@NonNull Context context) {
super(context, R.style.ErbanBottomSheetDialogDimFalse);
this.context = context;
@@ -86,8 +91,8 @@ public class RoomOperationDialog extends BottomSheetDialog {
addOpenOrClosePublicScreenAction(optAdapter);
addGiftValueAction(optAdapter);
addRoomSettingAction(optAdapter);
addRoomModuleHallAction(optAdapter);
// addRoomManagerAction(optAdapter);
//addRoomModuleHallAction(optAdapter);
//addRoomManagerAction(optAdapter);
addSuperAdminAction(optAdapter);
rvOPtList.setAdapter(optAdapter);
@@ -206,6 +211,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
}
}
/**
* 礼物特效
*
@@ -313,8 +319,8 @@ public class RoomOperationDialog extends BottomSheetDialog {
getContext().getResources().getString(R.string.room_setting), () -> {
if (onActionListener != null) {
onActionListener.onSetting();
}
}));
}
}));
}
}

19
app/src/main/res/layout/activity_room_setting.xml
View File

@@ -264,7 +264,8 @@
android:id="@+id/room_bg_layout"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/white">
android:background="@color/white"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -413,16 +414,16 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:visibility="gone"
android:background="@color/line_color" />
android:background="@color/line_color"
android:visibility="gone" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/room_pure_mode_layout"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/dp_45">
android:minHeight="@dimen/dp_45"
android:visibility="gone">
<TextView
android:id="@+id/tv_room_pure_mode"
@@ -448,11 +449,11 @@
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_12"
android:visibility="gone"
tools:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_room_pure_mode"
app:layout_constraintTop_toBottomOf="@+id/tv_room_pure_mode"
tools:ignore="SpUsage" />
tools:ignore="SpUsage"
tools:visibility="gone" />
<ImageView
android:id="@+id/switch_room_pure_mode"
@@ -512,11 +513,11 @@
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_12"
android:visibility="gone"
tools:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_leave_mode"
app:layout_constraintTop_toBottomOf="@id/tv_leave_mode"
tools:ignore="SpUsage" />
tools:ignore="SpUsage"
tools:visibility="gone" />
<ImageView
android:id="@+id/switch_leave_mode"

3
app/src/module_music/res/layout/layout_music_player_view.xml
View File

@@ -18,6 +18,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:src="@drawable/icon_music_flag" />
@@ -25,7 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="24dp"
android:layout_marginStart="24dp"
android:lines="1"
android:text="播放音乐"
android:textColor="@color/white"

3
app/src/module_treasure_box/res/layout/activity_treasure_box.xml
View File

@@ -108,8 +108,8 @@
android:onClick="@{click}"
app:autoPlay="true"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:layout_constraintWidth_percent="0.53"
app:source="svga/gold_box_bg.svga" />
@@ -153,6 +153,7 @@
android:layout_height="23dp"
android:background="@color/white_transparent_12"
android:gravity="center"
android:inputType="number"
android:minWidth="40dp"
android:text="1"
android:textColor="#ffc33c98"

3
app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml
View File

@@ -108,8 +108,8 @@
android:onClick="@{click}"
app:autoPlay="true"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:layout_constraintWidth_percent="0.53"
app:source="svga/diamond_box_bg.svga" />
@@ -153,6 +153,7 @@
android:layout_height="23dp"
android:background="@color/white_transparent_12"
android:gravity="center"
android:inputType="number"
android:minWidth="40dp"
android:text="1"
android:textColor="#ffc33c98"