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-08-04 16:59:23 +08:00
parent 6294e20caf
commit 3d4e42213e
14 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,6 +124,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.LogUtils;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.UIUtils;
@@ -632,6 +633,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
}
getMvpPresenter().judgeIsLimitEnter();
}
if (giftId != 0) {
RxBus.get().post(new ShowGiftDialogEvent().setGiftId(giftId));
giftId = 0;
}
}
private void showLiveFinishView(long uid) {
@@ -1024,10 +1029,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
DemoCache.saveNewUserChargeGift(1);
}
dismissLoadingDialog();
if (giftId != 0) {
EventBus.getDefault().post(new ShowGiftDialogEvent().setGiftId(giftId));
giftId = 0;
}
}
@Override
@@ -1062,16 +1063,11 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
@Override
public void dismissLoadingDialog() {
if (mLoadingDialog != null && mLoadingDialog.isShowing()) {
mLoadingDialog.dismiss();
}
getDialogManager().dismissDialog();
}
public void showLoadingDialog() {
if (mLoadingDialog == null) {
mLoadingDialog = new LoadingDialog(AVRoomActivity.this);
}
mLoadingDialog.show();
getDialogManager().showProgressDialog(this, false);
}
private void dismissDialog() {

8
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -272,6 +272,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
public void setRoomBg(RoomInfo roomInfo) {
if (svgaRoomBg == null) return;
updateView(roomInfo);
AVRoomActivity.setBackBg(mContext, roomInfo, svgaRoomBg, bgPicture);
}
@@ -280,7 +281,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
@Override
public void onResume() {
super.onResume();
updateView();
updateView(AvRoomDataManager.get().mCurrentRoomInfo);
IMNetEaseManager.get().getChatRoomEventObservable()
.compose(bindToLifecycle())
.subscribe(roomEvent -> {
@@ -293,7 +294,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
}
addTipMsg();
case RoomEvent.ROOM_INFO_UPDATE:
updateView();
updateView(AvRoomDataManager.get().mCurrentRoomInfo);
setRoomBg(AvRoomDataManager.get().mCurrentRoomInfo);
break;
case RoomEvent.RECEIVE_NORMALE_GIFT:
@@ -381,8 +382,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
}
@SuppressLint("CheckResult")
public void updateView() {
RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
public void updateView(RoomInfo currentRoomInfo) {
if (currentRoomInfo != null) {
Fragment tempFragment = roomFragment;

1
app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
View File

@@ -153,6 +153,7 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
, fromUid)
.subscribe((stringServiceResult) -> EventBus.getDefault().post(new AudioPartyOpenEvent()));
mAvRoomModel.loadMessageHistory(AvRoomDataManager.get().clearScreenTime);
IMNetEaseManager.get().joinAvRoom();
}, this::dealEnterRoomError);
}

2
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -122,7 +122,7 @@
android:gravity="center"
android:textColor="@color/color_FFFFFF"
android:textSize="9dp"
android:visibility="visible"
android:visibility="gone"
tools:text="红队" />
<LinearLayout

4
app/src/main/res/layout/item_micro_dating.xml
View File

@@ -143,7 +143,7 @@
android:layout_marginBottom="10dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_room_mute_micro"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="visible" />
@@ -156,7 +156,7 @@
android:layout_marginBottom="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_kick_guard"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />

4
app/src/main/res/layout/item_micro_dating_boss.xml
View File

@@ -172,7 +172,7 @@
android:layout_marginBottom="15dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_room_mute_micro"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="visible" />
@@ -185,7 +185,7 @@
android:layout_marginBottom="13dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_kick_guard"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />

4
app/src/main/res/layout/item_micro_game.xml
View File

@@ -110,7 +110,7 @@
android:layout_marginBottom="8dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_room_mute_micro"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="visible" />
@@ -123,7 +123,7 @@
android:layout_marginBottom="6dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_kick_guard"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />

2
app/src/main/res/layout/item_micro_game_mini.xml
View File

@@ -59,7 +59,7 @@
android:layout_gravity="bottom|end"
android:scaleType="fitCenter"
android:src="@drawable/icon_room_mute_micro"
android:visibility="visible"
android:visibility="gone"
tools:visibility="visible" />
<ImageView

4
app/src/main/res/layout/item_micro_single_anchor.xml
View File

@@ -61,7 +61,7 @@
android:layout_marginBottom="@dimen/dp_4"
android:scaleType="fitCenter"
android:src="@drawable/icon_room_mute_micro"
android:visibility="visible"
android:visibility="gone"
tools:visibility="visible" />
<ImageView
@@ -72,7 +72,7 @@
android:layout_marginBottom="3dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_kick_guard"
android:visibility="visible"
android:visibility="gone"
android:layout_gravity="start|bottom"
tools:visibility="visible" />

4
app/src/main/res/layout/item_micro_single_room_pk_boss.xml
View File

@@ -102,10 +102,12 @@
android:layout_width="66dp"
android:layout_height="48dp"
android:layout_marginBottom="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/svga_head_wear"
app:layout_constraintEnd_toEndOf="@id/avatar"
app:layout_constraintStart_toStartOf="@id/avatar"
tools:src="@drawable/single_room_pk_ic_result_win" />
tools:src="@drawable/single_room_pk_ic_result_win"
tools:visibility="visible" />
<ImageView
android:id="@+id/mute_image"

1
app/src/main/res/layout/list_item_micro.xml
View File

@@ -62,7 +62,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:src="@drawable/ic_charm_level_max"
android:textSize="9dp" />
<RelativeLayout

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java
View File

@@ -39,7 +39,7 @@ public class RtcEngineHandler extends Handler {
if (rtcEngineManager == null) return;
if (msg.what == notifyJoinAvRoom) {
if (!rtcEngineManager.inRoom) {
IMNetEaseManager.get().joinAvRoom();
//IMNetEaseManager.get().joinAvRoom();
}
rtcEngineManager.inRoom = true;
if (rtcEngineManager.needRecord && rtcEngineManager.mRtcEngine != null) {

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java
View File

@@ -40,7 +40,7 @@ public class TRtcEngineHandler extends Handler {
if (rtcEngineManager == null) return;
if (msg.what == notifyJoinAvRoom) {
if (!rtcEngineManager.inRoom) {
IMNetEaseManager.get().joinAvRoom();
//IMNetEaseManager.get().joinAvRoom();
}
rtcEngineManager.inRoom = true;
if (rtcEngineManager.needRecord && rtcEngineManager.mRtcEngine != null) {

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java
View File

@@ -83,7 +83,7 @@ public class ZegoEngineManager extends BaseEngine {
if (isMusicPlaying) {
startAudioMixing(PlayerModel.get().getCurrent().getLocalUri(), false, 1);
}
IMNetEaseManager.get().joinAvRoom();
//IMNetEaseManager.get().joinAvRoom();
} else {
// 登录失败
LogUtils.e("Zego onLoginCompletion: code: " + code);