yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-11-28 14:55:55 +08:00
commit ecbfa57276
9 changed files with 17 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@ -50,7 +50,6 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.event.RegSuccessEvent; import com.yunbao.main.event.RegSuccessEvent;
import com.yunbao.main.http.MainHttpConsts; import com.yunbao.main.http.MainHttpConsts;
@ -503,13 +502,9 @@ public class RegisterActivity extends AbsActivity {
if (liveBean == null) { if (liveBean == null) {
return; return;
} }
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
NoviceInstructorManager.get(mContext).setFrist(false); NoviceInstructorManager.get(mContext).setFrist(false);
}
});
} else { } else {
MainActivity.forward(RegisterActivity.this, false); MainActivity.forward(RegisterActivity.this, false);
} }

13
main/src/main/java/com/yunbao/main/activity/SearchActivity.java
View File

@ -18,20 +18,18 @@ import androidx.fragment.app.FragmentTransaction;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.CloseEvent; import com.yunbao.common.event.CloseEvent;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.SearchHistoryRecordManager; import com.yunbao.common.manager.SearchHistoryRecordManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.event.JumpUserHomeEvent; import com.yunbao.main.event.JumpUserHomeEvent;
import com.yunbao.main.fragment.SearchRecommendFragment; import com.yunbao.main.fragment.SearchRecommendFragment;
import com.yunbao.main.fragment.SearchResultsFragment; import com.yunbao.main.fragment.SearchResultsFragment;
import com.yunbao.common.utils.WordsTypeUtil;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode; import org.greenrobot.eventbus.ThreadMode;
@ -174,13 +172,8 @@ public class SearchActivity extends AbsActivity {
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
//跳转到个人资料 //跳转到个人资料
if (imm != null && mEditText != null) { if (imm != null && mEditText != null) {

7
main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java
View File

@ -152,12 +152,7 @@ public class WeekWebViewActivity extends AbsActivity {
if (liveBean == null) { if (liveBean == null) {
return; return;
} }
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
RouteUtil.forwardUserHome(mContext, live_id, 0); RouteUtil.forwardUserHome(mContext, live_id, 0);
} }

7
main/src/main/java/com/yunbao/main/adapter/SearchAdapter.java
View File

@ -199,12 +199,7 @@ public class SearchAdapter extends RefreshAdapter<SearchUserBean> {
return; return;
} }
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
RouteUtil.forwardUserHome(mContext, live_id, 0); RouteUtil.forwardUserHome(mContext, live_id, 0);
} }

8
main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
View File

@ -148,13 +148,9 @@ public class OneLoginDialog extends AbsDialogFragment {
if (liveBean == null) { if (liveBean == null) {
return; return;
} }
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
NoviceInstructorManager.get(mContext).setFrist(false); NoviceInstructorManager.get(mContext).setFrist(false);
}
});
} else { } else {
MainActivity.forward(mContext, false); MainActivity.forward(mContext, false);
} }

14
main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
View File

@ -148,12 +148,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
MainActivity.forward(mContext, false); MainActivity.forward(mContext, false);
} }
@ -364,12 +359,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
MainActivity.forward(mContext, false); MainActivity.forward(mContext, false);
} }

7
main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
View File

@ -235,12 +235,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
RouteUtil.forwardUserHome(mContext, String.valueOf(live_id), 0); RouteUtil.forwardUserHome(mContext, String.valueOf(live_id), 0);

7
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@ -326,12 +326,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
if (gotoRoomKey != null && gotoRoomKey.isEmpty()) { if (gotoRoomKey != null && gotoRoomKey.isEmpty()) {
gotoRoomKey = null; gotoRoomKey = null;
} }
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
intoIndex = 1; intoIndex = 1;

8
main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
View File

@ -416,12 +416,8 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { RouteUtil.forwardLiveAudienceActivity(liveBean, 0, 0, 0);
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
});
} else { } else {
RouteUtil.forwardUserHome(mContext, event.getLiveuid(), 0); RouteUtil.forwardUserHome(mContext, event.getLiveuid(), 0);
} }