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

1.小游戏展示队长和踢人标识 2.登录页UI修改

Browse Source
This commit is contained in:
huangjian
2021-12-16 16:30:37 +08:00
parent a0e514945d
commit 64e485094e
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -225,7 +225,9 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
AvRoomDataManager.get().mIsNeedGiftEffect = AvRoomDataManager.get().mCurrentRoomInfo.isHasAnimationEffect();
}
if (AvRoomDataManager.get().isRoomOwner() && roomInfo.getIsPermitRoom() != 1) {
if (AvRoomDataManager.get().isRoomOwner() &&
roomInfo.getIsPermitRoom() != 1 &&
roomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE) {
gameMainBinding.llChangeGame.setVisibility(View.VISIBLE);
gameMainBinding.rvGame.setLayoutManager(new LinearLayoutManager(mContext));
gameMainBinding.rvGame.setAdapter(gameAdapter = new SelectGameAdapter());
@@ -251,6 +253,12 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
if (AvRoomDataManager.get().isGamePlaying()) {
SingleToastUtil.showToast("游戏中不可以切换游戏或玩法!");
}
if (roomInfo.getRoomModeType() != RoomModeType.NORMAL_MODE) {
SingleToastUtil.showToast("请关闭其他模式再切换游戏!");
return;
}
GameInfo gameInfo = gameAdapter.getItem(position);
if (gameInfo != null) {
int type;
@@ -396,7 +404,9 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
.replace(R.id.container, roomFragment)
.commitAllowingStateLoss();
if (AvRoomDataManager.get().isRoomOwner() && currentRoomInfo.getIsPermitRoom() != 1) {
if (AvRoomDataManager.get().isRoomOwner() &&
currentRoomInfo.getIsPermitRoom() != 1
&& currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE) {
gameMainBinding.llChangeGame.setVisibility(View.VISIBLE);
} else {
gameMainBinding.llChangeGame.setVisibility(View.GONE);

4
app/src/main/java/com/yizhuan/erban/avroom/game/GameCfg.kt
View File

@@ -69,11 +69,11 @@ data class GameCfg(
)
data class LobbyPlayerCaptainIcon(
val hide: Boolean = true
val hide: Boolean = false
)
data class LobbyPlayerKickoutIcon(
val hide: Boolean = true
val hide: Boolean = false
)
data class LobbyPlayers(

4
app/src/main/res/drawable/bg_common_confirm_press.xml
View File

@@ -4,8 +4,8 @@
<gradient
android:angle="180"
android:endColor="#1873D3"
android:startColor="#5F17C1"
android:endColor="#ED992A"
android:startColor="#F9C237"
android:type="linear"
android:useLevel="true" />
<corners android:radius="100dp" />

1
app/src/main/res/drawable/bg_common_disable_border.xml
View File

@@ -4,7 +4,6 @@
<solid android:color="@color/bg_disable_303043" />
<stroke android:color="#434368" android:width="1dp"/>
<corners android:radius="100dp" />

4
app/src/main/res/layout/activity_login_phone.xml
View File

@@ -24,7 +24,7 @@
android:layout_marginTop="75dp"
android:layout_marginEnd="@dimen/dp_15"
android:text="密码登录"
android:textColor="@color/white"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="未注册手机号自动登录"
android:textColor="@color/white"
android:textColor="@color/text_secondary_4f516a"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

8
app/src/module_quick_pass/res/layout/act_quick_pass.xml
View File

@@ -8,10 +8,10 @@
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="105dp"
android:src="@drawable/ic_login_logo"
android:src="@mipmap/app_logo"
app:layout_constraintEnd_toStartOf="@id/tv_slogan"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="10dp"
android:text="来大鹅开黑打游戏，争夺更多赏金！"
android:text="来大鹅，快乐不止游戏"
android:textColor="@color/text_title_white"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/iv_logo"