moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.相亲模式坑位UI适配 2.修复相亲阶段非主持文案不改变的问题

Browse Source
This commit is contained in:
huangjian
2021-03-02 14:32:03 +08:00
parent f4ecda99c0
commit 58de773287
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -1304,32 +1304,32 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
private synchronized void refreshDatingNextStatus() {
RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (currentRoomInfo == null) return;
if (AvRoomDataManager.get().isPreside(UserUtils.getUserUid())) {
gameBinding.tvDatingNext.setVisibility(View.VISIBLE);
String hintText = "进入下一环节?";
if (!TextUtils.isEmpty(currentRoomInfo.getBlindDateState())) {
switch (currentRoomInfo.getBlindDateState()) {
case RoomInfo.DATING_STATE_FLOW:
gameBinding.tvDatingNext.setText("开始选择>");
gameBinding.tvDatingStep.setText("自由交流");
hintText = "进入心动选人环节?";
break;
case RoomInfo.DATING_STATE_SELECT:
gameBinding.tvDatingNext.setText("公布心动>");
gameBinding.tvDatingStep.setText("心动选人");
hintText = "进入公布心动环节?";
break;
case RoomInfo.DATING_STATE_PUBLISH:
gameBinding.tvDatingNext.setText("结束本轮>");
gameBinding.tvDatingStep.setText("公布心动");
hintText = "结束本轮,同时邀请新一轮嘉宾?";
break;
}
String hintText = "进入下一环节?";
if (!TextUtils.isEmpty(currentRoomInfo.getBlindDateState())) {
switch (currentRoomInfo.getBlindDateState()) {
case RoomInfo.DATING_STATE_FLOW:
gameBinding.tvDatingNext.setText("开始选择>");
gameBinding.tvDatingStep.setText("自由交流");
hintText = "进入心动选人环节?";
break;
case RoomInfo.DATING_STATE_SELECT:
gameBinding.tvDatingNext.setText("公布心动>");
gameBinding.tvDatingStep.setText("心动选人");
hintText = "进入公布心动环节?";
break;
case RoomInfo.DATING_STATE_PUBLISH:
gameBinding.tvDatingNext.setText("结束本轮>");
gameBinding.tvDatingStep.setText("公布心动");
hintText = "结束本轮,同时邀请新一轮嘉宾?";
break;
}
//只有主持自己能改变这个状态,所以理论上来说只有再次调用refreshDatingNextStatus()文案才可能会改变了,就不再写次switch了
String finalHintText = hintText;
gameBinding.tvDatingNext.setOnClickListener(v ->
getDialogManager().showOkCancelDialog(finalHintText, true, () -> getMvpPresenter().datingNext()));
}
if (AvRoomDataManager.get().isPreside(UserUtils.getUserUid())) {
gameBinding.tvDatingNext.setVisibility(View.VISIBLE);
} else {
gameBinding.tvDatingNext.setVisibility(View.GONE);
}

29
app/src/main/res/layout/item_micro_dating.xml
View File

@@ -5,13 +5,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:background="@color/color_activity_blue_bg"
tools:layout_width="70dp">
tools:layout_width="100dp">
<FrameLayout
android:id="@+id/micro_layout"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:minWidth="65dp"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -25,16 +24,18 @@
<ImageView
android:id="@+id/up_image"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_10"
android:layout_gravity="center"
android:scaleType="fitXY"
android:src="@drawable/icon_room_up_micro" />
<ImageView
android:id="@+id/lock_image"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_10"
android:layout_gravity="center"
android:scaleType="fitXY"
android:src="@drawable/icon_room_lock_micro"
@@ -43,15 +44,17 @@
<View
android:id="@+id/view_gender_bg"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_10"
android:layout_gravity="center"
android:background="@drawable/shape_circle_micro_man_bg" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_10"
android:layout_gravity="center"
android:src="@drawable/default_avatar"
android:visibility="gone"
@@ -62,8 +65,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="1.5dp"
tools:visibility="gone" />
android:layout_margin="2dp"
/>
<ImageView
android:id="@+id/iv_cap"