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

bugly bugfix

Browse Source
This commit is contained in:
huangjian
2022-08-05 11:57:09 +08:00
parent 0975c8d82c
commit 977a3869c2
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
View File

@@ -69,7 +69,6 @@ import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.widget.LoadingDialog;
import com.yizhuan.erban.ui.widget.NobleOpenNoticeView;
import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftDialog;
import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelOneDialog;
@@ -190,7 +189,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
private RoomInfo mRoomInfo;
private ImageView ivHeadWear;
private MonsterDialog monsterDialog;
private LoadingDialog mLoadingDialog;
private List<RedPackageOpenDialog> openDialogs;
private ViewPager2 viewpager;
private VerticalViewPagerAdapter mAdapter;

3
app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java
View File

@@ -136,7 +136,8 @@ public class BaseRoomPresenter<V extends IBaseRoomView> extends BaseMvpPresenter
}
return;
}
if (AvRoomDataManager.get().getRoomQueueMemberInfoByMicPosition(micPosition).mRoomMicInfo.isMicLock()) {
RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByMicPosition(micPosition);
if (roomQueueInfo != null && roomQueueInfo.mRoomMicInfo.isMicLock()) {
if (AvRoomDataManager.get().isQueuingMicro()) {
String msg;
if (AvRoomDataManager.get().isOnMic(AuthModel.get().getCurrentUid())) {

2
app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt
View File

@@ -121,7 +121,7 @@ class LiveFragment : BaseViewBindingFragment<FragmentLiveBinding>(),
}
val commonNavigator = CommonNavigator(context)
commonNavigator.setTitleWrapContent(false)
commonNavigator.titleMargin = ScreenUtil.dip2px(5.0F)
commonNavigator.titleMargin = ScreenUtil.dip2px(2.0F)
commonNavigator.setTitleGravity(Gravity.CENTER_VERTICAL)
val magicIndicatorAdapter = PartyMagicIndicatorAdapter(mTabInfoList)
magicIndicatorAdapter.textSize = 14

2
app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt
View File

@@ -112,7 +112,7 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis
}
val commonNavigator = CommonNavigator(context)
commonNavigator.setTitleWrapContent(false)
commonNavigator.titleMargin = ScreenUtil.dip2px(5.0F)
commonNavigator.titleMargin = ScreenUtil.dip2px(2.0F)
commonNavigator.setTitleGravity(Gravity.CENTER_VERTICAL)
val magicIndicatorAdapter = PartyMagicIndicatorAdapter(mTabInfoList)
magicIndicatorAdapter.textSize = 14

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

@@ -243,6 +243,7 @@
android:layout_marginEnd="@dimen/dp_10"
android:onClick="@{click}"
android:src="@drawable/icon_room_treasure_box"
android:visibility="gone"
tools:contentDescription="开宝箱" />
<ImageView
@@ -268,6 +269,7 @@
android:layout_marginBottom="6dp"
android:onClick="@{click}"
android:src="@drawable/icon_room_treasure_box"
android:visibility="gone"
tools:contentDescription="许愿池" />
<ImageView
@@ -298,6 +300,7 @@
android:id="@+id/layout_dragon"
android:layout_width="86dp"
android:layout_height="92dp"
android:visibility="gone"
tools:contentDescription="匹配">
<ImageView

12
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java
View File

@@ -2,6 +2,7 @@ package com.yizhuan.erban.treasure_box.widget;
import android.content.Context;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity;
@@ -16,6 +17,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.TimeUtils;
import io.reactivex.Single;
@@ -43,11 +45,15 @@ public class GoldBoxHelper {
public static void handleBoxClick(Context context) {
String openTime = GoldBoxHelper.getBoxOpenTime();
if (openTime == null || openTime.isEmpty()) {
SingleToastUtil.showToast("数据加载中,请稍后再试!");
return;
}
int startTime = Integer.parseInt(openTime.substring(0, openTime.indexOf("-")).replace(":", ""));
int endTime = Integer.parseInt(openTime.substring(openTime.indexOf("-") + 1).replace(":", ""));
if (startTime != endTime && TimeUtils.getTimeLimit(startTime, endTime)) {
ChooseTreasureBoxDialogFragment chooseTreasureBoxDialogFragment = new ChooseTreasureBoxDialogFragment(GoldBoxHelper.getBoxOpenTime());
ChooseTreasureBoxDialogFragment chooseTreasureBoxDialogFragment = new ChooseTreasureBoxDialogFragment(openTime);
chooseTreasureBoxDialogFragment.setOnTreasureBoxChooseListener(type -> {
if (type == 0) {// 幸运许愿池（默认）
TreasureBoxActivity.start(context);
@@ -69,11 +75,15 @@ public class GoldBoxHelper {
return AvRoomDataManager.get().mBoxSwitchVo.isDiamondBoxSwitch();
}
@Nullable
public static String getBoxIcon() {
if (AvRoomDataManager.get().mBoxSwitchVo == null) return null;
return AvRoomDataManager.get().mBoxSwitchVo.getOpenBoxIcon();
}
@Nullable
public static String getBoxOpenTime() {
if (AvRoomDataManager.get().mBoxSwitchVo == null) return null;
return AvRoomDataManager.get().mBoxSwitchVo.getDiamondBoxOpenTime();
}