diff --git a/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java b/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java index 43d0d5807..127aa2fd0 100644 --- a/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java +++ b/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java @@ -10,6 +10,7 @@ import android.util.Log; import com.blankj.utilcode.util.LogUtils; import com.yunbao.common.event.CheckRemainingBalanceEvent; +import com.yunbao.common.sud.decorator.game.JumpEvent; import com.yunbao.common.sud.state.SudMGPMGState; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ISudFSMStateHandleUtils; @@ -372,6 +373,8 @@ public class SudFSMMGDecorator implements ISudFSMMG { } else { listener.onGameMGCommonGameCreateOrder(handle, mgCommonGameCreateOrder); } + // 调用创建订单接口 + JumpEvent.hit(mgCommonGameCreateOrder); break; case SudMGPMGState.MG_COMMON_PLAYER_ROLE_ID: // 26. 游戏通知app玩家角色(仅对狼人杀有效) SudMGPMGState.MGCommonPlayerRoleId mgCommonPlayerRoleId = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonPlayerRoleId.class); diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 27744c551..c895d2f18 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2485,6 +2485,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }); new_task_send_gift_details = findViewById(R.id.new_task_send_gift_details); close_task_send_gift_close = findViewById(R.id.close_task_send_gift_close); + + // setDragonTime(false); } /** @@ -2821,9 +2823,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis isDragonTime = isTime; if (isTime) { newDragonTv.setTextColor(ContextCompat.getColor(mContext, R.color.white)); + // newDragonTv.clearFocus(); } else { newDragonTv.setTextColor(Color.parseColor("#F9BA03")); newDragonTv.setText(R.string.dragon_immediate_participation); + // newDragonTv.requestFocus(); } } @@ -4432,6 +4436,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void onSendMoneyLongEndEvent(SendMoneyLongEndEvent moneyLongEndEvent) { newDragonGroup.setVisibility(View.GONE); + //newDragonTv newDragonTv + // if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) { // dragonImmediateParticipationTime.setVisibility(View.GONE); // if (redPacket.getVisibility() == View.VISIBLE) { @@ -5662,8 +5668,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis live_bottom_layout = findViewById(R.id.live_bottom_layout); RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) live_bottom_layout.getLayoutParams(); if (greetings.size() > 0) { - params1.bottomMargin = DpUtil.dp2px(38); - params2.bottomMargin = DpUtil.dp2px(38); + params1.bottomMargin = DpUtil.dp2px(40); + params2.bottomMargin = DpUtil.dp2px(40); } else if (isAnchorLive()) { params1.bottomMargin = 0; params2.bottomMargin = 0; diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 4f85cdae5..a63dc084b 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -2536,6 +2536,7 @@ android:id="@+id/room_fast_msg" android:layout_width="match_parent" android:layout_height="30dp" + android:layout_marginBottom="5dp" android:layout_alignParentBottom="true" android:layout_marginStart="10dp" android:visibility="gone" diff --git a/live/src/main/res/layout/view_live_room_part2.xml b/live/src/main/res/layout/view_live_room_part2.xml index 60f3bab4a..3e59b9cf1 100644 --- a/live/src/main/res/layout/view_live_room_part2.xml +++ b/live/src/main/res/layout/view_live_room_part2.xml @@ -108,6 +108,11 @@ android:textSize="7sp" android:paddingStart="1dp" android:paddingEnd="1dp" + android:focusable="true" + android:focusableInTouchMode="true" + android:marqueeRepeatLimit="marquee_forever" + android:scrollHorizontally="true" + android:singleLine="true" android:layout_marginStart="1dp" android:textColor="@color/white" android:visibility="visible"