diff --git a/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt index d4f239cef..67670a00b 100644 --- a/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt @@ -109,11 +109,13 @@ import com.mango.core.user.UserModel import com.mango.core.user.bean.BaseInfo import com.mango.core.user.bean.UserInfo import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.LogUtils import com.mango.core.utils.net.VipLevelNotEnoughException import com.mango.xchat_android_library.net.rxnet.utils.RxNetWorkUtils import com.mango.xchat_android_library.rxbus.RxBus import com.mango.xchat_android_library.utils.* import com.mango.xchat_android_library.utils.config.BasicConfig +import com.netease.nim.uikit.common.util.sys.ScreenUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.EventBus @@ -144,6 +146,7 @@ open class BaseRoomFragment?> : private var mDisposable: Disposable? = null private var isCloseScreen = false private var isOpenRedPackage = false + private val llBox: View by lazy { mView.findViewById(R.id.ll_box) } @JvmField protected var isDatingMode = false @@ -638,9 +641,15 @@ open class BaseRoomFragment?> : mvpPresenter?.loadRoomRank() } R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext) - R.id.iv_treasure_box, - R.id.iv_treasure_box_cp -> GoldBoxHelper.handleBoxClick(mContext) + R.id.iv_treasure_box -> GoldBoxHelper.handleBoxClick(mContext) R.id.iv_radish_entrance -> PullRadishActivity.start(mContext) + R.id.tv_box_more -> { + val translationX = llBox.width - ScreenUtil.dip2px(33f).toFloat() + llBox.animate() + .translationX(if (llBox.translationX == 0f) translationX else 0f) + .setDuration(300) + .start() + } } } diff --git a/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java index 341696690..887ad680e 100644 --- a/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java @@ -812,10 +812,8 @@ public class HomePartyRoomFragment extends BaseRoomFragment { if (hide != null && !hide) { if (AvRoomDataManager.get().isCpRoom()) { - gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE); gameBinding.ivTreasureBox.setVisibility(View.GONE); } else { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.VISIBLE); GlideApp.with(BasicConfig.INSTANCE.getAppContext()) @@ -824,16 +822,13 @@ public class HomePartyRoomFragment extends BaseRoomFragment { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.GONE); }); } else { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.GONE); } diff --git a/app/src/main/res/drawable/shape_room_box_more.xml b/app/src/main/res/drawable/shape_room_box_more.xml new file mode 100644 index 000000000..e6ea2bc14 --- /dev/null +++ b/app/src/main/res/drawable/shape_room_box_more.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index 8d27458fa..383518693 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -233,24 +233,11 @@ android:layout_marginEnd="16dp" app:rollviewpager_hint_gravity="center" /> - - - + android:gravity="center" + android:translationX="71dp"> - + + + + + + + - + app:layout_constraintTop_toBottomOf="@id/activity_img"> - + + + + + + +