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

1：修改K歌房

Browse Source 
2：修改房间展示每日任务
3：修改页面跳转
4：遗留问题在进入首页的时候出现首页刷新
This commit is contained in:
梁小江
2025-10-27 20:09:12 +08:00
parent 8631fdbdbf
commit a4032c76ad
106 changed files with 6593 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modulemain/src/main/AndroidManifest.xml
View File

@@ -9,7 +9,6 @@
<activity
android:name=".activity.MainActivity"
android:configChanges="fontScale"
android:launchMode="singleTask"
android:screenOrientation="portrait">
</activity>
</application>

19
modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
View File

@@ -379,9 +379,10 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
CommonAppContext.getInstance().isRoomJoininj = false;
EventBus.getDefault().post(new RoomOutEvent());
} else if (id == R.id.riv) {
mBinding.coolWaitView.setVisibility(View.VISIBLE);
String roomId = CommonAppContext.getInstance().playId;
if (!TextUtils.isEmpty(roomId)) {
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "");
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "",null);
// MvpPre.getRoomOnline(roomId, "1", "100");
// AppStateManager stateManager = AppStateManager.getInstance();
@@ -441,6 +442,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// }
}
@Override
public void quitSuccess(String roomId) {
// RtcManager.getInstance().leaveChannel(roomId);
@@ -790,12 +792,12 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
}
if (!isPlaying) {
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "");
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "",null);
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
} else {
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "");
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "",null);
}
}
@@ -1065,11 +1067,12 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
}
// @Override
// protected void onPause() {
// super.onPause();
// moveTaskToBack(true);
// }
@Override
protected void onPause() {
super.onPause();
mBinding.coolWaitView.setVisibility(View.GONE);
}
private SystemLocationProvider locationProvider;
private void initLocation() {

9
modulemain/src/main/res/layout/activity_main.xml
View File

@@ -250,6 +250,15 @@
android:clickable="true"
android:focusable="true"
/>
<app.dinus.com.loadingdrawable.LoadingView
android:id="@+id/cool_wait_view"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:layout_centerInParent="true"
android:visibility="gone"
android:background="@drawable/ps_ic_shadow_bg"
app:loading_renderer="CoolWaitLoadingRenderer"/>
</RelativeLayout>
</layout>