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

Merge remote-tracking branch 'origin/develop' into yinyou_dating

Browse Source
This commit is contained in:
huangjian
2021-03-03 15:11:46 +08:00
parent aa981c32dc 5509249839
commit fc5eb8c237
4 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1080,6 +1080,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
R.drawable.ic_dating_queuing_micro : R.drawable.ic_pk_queuing_micro);
} else {
gameBinding.ivQueuingMicro.setVisibility(View.GONE);
gameBinding.bottomView.updateQueuingMicButton();
}
if (microView.getAdapter() != null) {
String microType = microView.getAdapter().microType();
@@ -1304,32 +1305,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);
}

3
app/src/main/java/com/yizhuan/erban/avroom/helper/AnimHelper.java
View File

@@ -12,6 +12,7 @@ import android.graphics.Point;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RelativeLayout;
@@ -38,7 +39,7 @@ public class AnimHelper {
final int width = ScreenUtil.dip2px(80);
final int height = ScreenUtil.dip2px(80);
final ImageView imageView = new ImageView(context);
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(width, height);
layoutParams.leftMargin = senderPoint.x;
layoutParams.topMargin = senderPoint.y;
imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);

4
app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java
View File

@@ -207,7 +207,7 @@ public class RoomEffectView extends FrameLayout {
messagesDatingAll.add(chatRoomMessage);
if (disposableDatingAll == null || messagesDatingAll.size() == 1) {
isCreateDatingAll = true;
disposableDatingAll = Observable.interval(0, PERIOD, TimeUnit.MILLISECONDS)
disposableDatingAll = Observable.interval(0, 3, TimeUnit.SECONDS)
.observeOn(AndroidSchedulers.mainThread())
.doOnNext(aLong -> {
if (messagesDatingAll.size() > 0 && !isCreateDatingAll)
@@ -224,6 +224,8 @@ public class RoomEffectView extends FrameLayout {
if (attachment == null) return;
DatingAllNotifyInfo notifyInfo = attachment.getDatingAllNotifyInfo();
if (notifyInfo == null) return;
//自己房间不需要飘
if (AvRoomDataManager.get().getRoomUid() == notifyInfo.getRoomUid()) return;
TextView textView = (TextView) LayoutInflater.from(mContext).inflate(R.layout.layout_room_dating_all_notify, null);
textView.setOnClickListener(v -> AVRoomActivity.start(mContext, notifyInfo.getRoomUid()));
int defaultBg = R.drawable.bg_dating_hand_1;

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"