diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/nnbc123/app/avroom/fragment/GameRoomFragment.kt index a36f44750..d0b9d50fb 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/GameRoomFragment.kt @@ -6,6 +6,7 @@ import android.view.View import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil +import com.gyf.immersionbar.ImmersionBar import com.nnbc123.app.R import com.nnbc123.app.avroom.adapter.GameMicroViewAdapter import com.nnbc123.app.avroom.adapter.GameMiniMicroViewAdapter @@ -58,6 +59,7 @@ class GameRoomFragment : BaseRoomFragment(), override fun onFindViews() { super.onFindViews() gameBinding = DataBindingUtil.bind(mView)!! + ImmersionBar.with(this).titleBarMarginTop(gameBinding.spaceTitleBar).init() gameBinding.lifecycleOwner = this gameBinding.click = this gameBinding.ktvModel = false diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt index a3366790a..d6f56b27a 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt @@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import cn.sharesdk.framework.Platform import com.chad.library.adapter.base.BaseQuickAdapter +import com.gyf.immersionbar.ImmersionBar import com.netease.nim.uikit.common.util.string.StringUtil import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage @@ -123,6 +124,7 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte override fun onFindViews() { _binding = DataBindingUtil.bind(mView) + ImmersionBar.with(this).titleBarMarginTop(binding.layoutTitleBar).init() setupRoomTitleMarquee() } diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyRoomFragment.java index 30edc402c..c396506d9 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyRoomFragment.java @@ -8,6 +8,7 @@ import android.widget.ImageView; import androidx.databinding.DataBindingUtil; +import com.gyf.immersionbar.ImmersionBar; import com.netease.nim.uikit.common.util.log.LogUtil; import com.nnbc123.app.R; import com.nnbc123.app.avroom.activity.AVRoomActivity; @@ -133,6 +134,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment { - topMargin = ScreenUtil.dip2px(140f) + topMargin = ScreenUtil.dip2px(50f) } } else if (!AvRoomDataManager.get().isOpenAnotherPKMode && gameBinding.microView.adapter !is SingleAnchorMicroViewAdapter) { gameBinding.microView.bindAdapter(SingleAnchorMicroViewAdapter(context)) gameBinding.viewPkBoard.isVisible = false gameBinding.microView.updateLayoutParams { - topMargin = ScreenUtil.dip2px(110f) + topMargin = ScreenUtil.dip2px(10f) } } else { gameBinding.microView.adapter?.notifyDataSetChanged() diff --git a/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt b/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt index d8f121032..8576af441 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt @@ -321,9 +321,9 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: //游戏安全操作区域 val viewGameRect = JSONObject() viewGameRect.put("left", 0) - viewGameRect.put("top", ScreenUtil.dip2px(200f)) + viewGameRect.put("top", ScreenUtil.dip2px(180f)) viewGameRect.put("right", 0) - viewGameRect.put("bottom", ScreenUtil.dip2px(200f)) + viewGameRect.put("bottom", ScreenUtil.dip2px(150f)) jsonObject.put("view_game_rect", viewGameRect) //通知游戏 diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index 49cece625..071020195 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -35,10 +35,11 @@ android:layout_height="match_parent" /> + android:orientation="horizontal" + android:paddingTop="@dimen/dp_5"> + android:clipChildren="false" + android:paddingTop="@dimen/dp_44"> - + + + android:layout_marginTop="6dp" + android:gravity="center_vertical"> - + + + + + - diff --git a/app/src/module_mini_world/res/layout/fragment_game_room.xml b/app/src/module_mini_world/res/layout/fragment_game_room.xml index 213853250..2b7970e61 100644 --- a/app/src/module_mini_world/res/layout/fragment_game_room.xml +++ b/app/src/module_mini_world/res/layout/fragment_game_room.xml @@ -30,11 +30,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + + - - + + + app:layout_constraintTop_toBottomOf="@id/space_title_bar" /> + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/fl_fans_team"> + android:layout_marginTop="10dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/space_title_bar"/> + app:layout_constraintTop_toBottomOf="@id/hourRankWidget" />