yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增航海/糖果树折叠功能

Browse Source
This commit is contained in:
huangjian
2022-10-08 15:50:46 +08:00
parent 5dc32249a3
commit 1d184b4bee
6 changed files with 113 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt
View File

@@ -109,11 +109,13 @@ import com.mango.core.user.UserModel
import com.mango.core.user.bean.BaseInfo import com.mango.core.user.bean.BaseInfo
import com.mango.core.user.bean.UserInfo import com.mango.core.user.bean.UserInfo
import com.mango.core.utils.CurrentTimeUtils import com.mango.core.utils.CurrentTimeUtils
import com.mango.core.utils.LogUtils
import com.mango.core.utils.net.VipLevelNotEnoughException import com.mango.core.utils.net.VipLevelNotEnoughException
import com.mango.xchat_android_library.net.rxnet.utils.RxNetWorkUtils import com.mango.xchat_android_library.net.rxnet.utils.RxNetWorkUtils
import com.mango.xchat_android_library.rxbus.RxBus import com.mango.xchat_android_library.rxbus.RxBus
import com.mango.xchat_android_library.utils.* import com.mango.xchat_android_library.utils.*
import com.mango.xchat_android_library.utils.config.BasicConfig 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.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
@@ -144,6 +146,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
private var mDisposable: Disposable? = null private var mDisposable: Disposable? = null
private var isCloseScreen = false private var isCloseScreen = false
private var isOpenRedPackage = false private var isOpenRedPackage = false
private val llBox: View by lazy { mView.findViewById(R.id.ll_box) }
@JvmField @JvmField
protected var isDatingMode = false protected var isDatingMode = false
@@ -638,9 +641,15 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
mvpPresenter?.loadRoomRank() mvpPresenter?.loadRoomRank()
} }
R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext) R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext)
R.id.iv_treasure_box, R.id.iv_treasure_box -> GoldBoxHelper.handleBoxClick(mContext)
R.id.iv_treasure_box_cp -> GoldBoxHelper.handleBoxClick(mContext)
R.id.iv_radish_entrance -> PullRadishActivity.start(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()
}
} }
} }

5
app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -812,10 +812,8 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
hide -> { hide -> {
if (hide != null && !hide) { if (hide != null && !hide) {
if (AvRoomDataManager.get().isCpRoom()) { if (AvRoomDataManager.get().isCpRoom()) {
gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE);
gameBinding.ivTreasureBox.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.GONE);
} else { } else {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.VISIBLE); gameBinding.ivTreasureBox.setVisibility(View.VISIBLE);
GlideApp.with(BasicConfig.INSTANCE.getAppContext()) GlideApp.with(BasicConfig.INSTANCE.getAppContext())
@@ -824,16 +822,13 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
.into(gameBinding.ivTreasureBox); .into(gameBinding.ivTreasureBox);
} }
} else { } else {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.GONE);
} }
}, },
throwable -> { throwable -> {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.GONE);
}); });
} else { } else {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.GONE); gameBinding.ivTreasureBox.setVisibility(View.GONE);
} }

15
app/src/main/res/drawable/shape_room_box_more.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:endColor="#6E36FF"
android:startColor="#31EBF7"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="8dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="8dp"
android:topRightRadius="0dp" />
</shape>

80
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -233,24 +233,11 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:rollviewpager_hint_gravity="center" /> app:rollviewpager_hint_gravity="center" />
<ImageView
android:id="@+id/iv_treasure_box_cp"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_below="@id/activity_img"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_10"
android:onClick="@{click}"
android:src="@drawable/icon_room_treasure_box"
android:visibility="gone"
tools:contentDescription="开宝箱" />
<ImageView <ImageView
android:id="@+id/iv_first_charge_enter" android:id="@+id/iv_first_charge_enter"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_above="@id/iv_radish_entrance" android:layout_above="@id/fl_speedy_message"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
@@ -259,31 +246,50 @@
android:visibility="gone" android:visibility="gone"
tools:contentDescription="首充红包" /> tools:contentDescription="首充红包" />
<ImageView <LinearLayout
android:id="@+id/iv_radish_entrance" android:id="@+id/ll_box"
android:layout_width="65dp" android:layout_width="wrap_content"
android:layout_height="65dp" android:layout_height="wrap_content"
android:layout_above="@id/iv_treasure_box" android:layout_below="@id/activity_img"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp" android:gravity="center"
android:layout_marginBottom="6dp" android:translationX="71dp">
android:onClick="@{click}"
android:src="@drawable/ic_radish_entrance"
android:visibility="gone"
tools:contentDescription="航海冒险" />
<ImageView <TextView
android:id="@+id/iv_treasure_box" android:id="@+id/tv_box_more"
android:layout_width="65dp" android:layout_width="18dp"
android:layout_height="65dp" android:layout_height="wrap_content"
android:layout_above="@id/iv_queuing_micro" android:background="@drawable/shape_room_box_more"
android:layout_alignParentEnd="true" android:gravity="center"
android:layout_marginEnd="15dp" android:includeFontPadding="false"
android:layout_marginBottom="6dp" android:lineSpacingExtra="1dp"
android:onClick="@{click}" android:onClick="@{click}"
android:src="@drawable/icon_room_treasure_box" android:paddingTop="3dp"
android:visibility="gone" android:paddingBottom="3dp"
tools:contentDescription="许愿池" /> android:text="更多玩法"
android:textColor="@color/white"
android:textSize="10sp" />
<ImageView
android:id="@+id/iv_radish_entrance"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginStart="1dp"
android:onClick="@{click}"
android:src="@drawable/ic_radish_entrance"
android:visibility="gone"
tools:contentDescription="航海冒险" />
<ImageView
android:id="@+id/iv_treasure_box"
android:layout_width="45dp"
android:layout_height="45dp"
android:onClick="@{click}"
android:src="@drawable/icon_room_treasure_box"
android:visibility="gone"
tools:contentDescription="许愿池" />
</LinearLayout>
<ImageView <ImageView
android:id="@+id/iv_queuing_micro" android:id="@+id/iv_queuing_micro"

66
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -204,35 +204,53 @@
android:onClick="@{click}" android:onClick="@{click}"
android:src="@drawable/ic_first_charge_enter" android:src="@drawable/ic_first_charge_enter"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/iv_radish_entrance" app:layout_constraintBottom_toTopOf="@id/ll_box"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:contentDescription="首充红包" /> tools:contentDescription="首充红包" />
<ImageView <LinearLayout
android:id="@+id/iv_radish_entrance" android:id="@+id/ll_box"
android:layout_width="65dp" android:layout_width="wrap_content"
android:layout_height="65dp" android:layout_height="wrap_content"
android:layout_marginEnd="15dp" android:gravity="center"
android:layout_marginBottom="6dp" android:translationX="71dp"
android:onClick="@{click}"
android:src="@drawable/ic_radish_entrance"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/iv_treasure_box"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:contentDescription="航海冒险" /> app:layout_constraintTop_toBottomOf="@id/activity_img">
<ImageView <TextView
android:id="@+id/iv_treasure_box" android:id="@+id/tv_box_more"
android:layout_width="65dp" android:layout_width="18dp"
android:layout_height="65dp" android:layout_height="wrap_content"
android:layout_marginEnd="15dp" android:background="@drawable/shape_room_box_more"
android:layout_marginBottom="6dp" android:gravity="center"
android:onClick="@{click}" android:lineSpacingExtra="0dp"
android:src="@drawable/icon_room_treasure_box" android:onClick="@{click}"
android:visibility="gone" android:paddingTop="3dp"
app:layout_constraintBottom_toTopOf="@id/fl_speedy_message" android:paddingBottom="3dp"
app:layout_constraintEnd_toEndOf="parent" android:text="更多玩法"
tools:contentDescription="许愿池" /> android:textColor="@color/white"
android:textSize="10sp" />
<ImageView
android:id="@+id/iv_radish_entrance"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginStart="1dp"
android:onClick="@{click}"
android:src="@drawable/ic_radish_entrance"
android:visibility="gone"
tools:contentDescription="航海冒险" />
<ImageView
android:id="@+id/iv_treasure_box"
android:layout_width="45dp"
android:layout_height="45dp"
android:onClick="@{click}"
android:src="@drawable/icon_room_treasure_box"
android:visibility="gone"
tools:contentDescription="许愿池" />
</LinearLayout>
<com.mango.moshen.avroom.widget.MessageView <com.mango.moshen.avroom.widget.MessageView
android:id="@+id/message_view" android:id="@+id/message_view"

4
app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/GoldBoxHelper.java
View File

@@ -97,13 +97,13 @@ public class GoldBoxHelper {
} }
/** /**
* 屏幕宽高比小于2的机型房间活动入口和开箱入口整合,个播房不需要整合 * 房间改版之后不再需要整合
* *
* @return * @return
*/ */
public static boolean needIntegrateBoxEntrance() { public static boolean needIntegrateBoxEntrance() {
return !AvRoomDataManager.get().isSingleRoom() && ScreenUtil.screenHeight / ScreenUtil.screenWidth < 2; return false;
} }
} }