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

Merge branch 'dev_改版主分支-升级融云SDK&AGP8' into 新潘多拉

Browse Source
This commit is contained in:
zlzw 2024-05-06 13:44:31 +08:00
commit 0a87f300b4
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
View File

@ -51,6 +51,7 @@ import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.NewLevelModel; import com.yunbao.common.bean.NewLevelModel;
import com.yunbao.common.bean.UserHomeImgBean; import com.yunbao.common.bean.UserHomeImgBean;
import com.yunbao.common.dialog.ImagePreviewDialog; import com.yunbao.common.dialog.ImagePreviewDialog;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.LiveHttpUtil;
@ -61,6 +62,7 @@ import com.yunbao.common.manager.NewLevelManager;
import com.yunbao.common.upload.UploadBean; import com.yunbao.common.upload.UploadBean;
import com.yunbao.common.upload.UploadCallback; import com.yunbao.common.upload.UploadCallback;
import com.yunbao.common.upload.UploadQnImpl; import com.yunbao.common.upload.UploadQnImpl;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.FilesUtils; import com.yunbao.common.utils.FilesUtils;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
@ -627,7 +629,15 @@ public class UserHomeActivity extends AbsActivity {
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override @Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) { public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal)); if (StringUtil.isEmpty(liveUid)) {
return;
}
finish();
if (AppManager.getInstance().getLiveActivity() != null) {
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
} else {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
} }
@Override @Override

2
main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
View File

@ -31,6 +31,7 @@ import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.PluginManager; import com.yunbao.common.utils.PluginManager;
import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.ProcessResultUtil;
@ -305,6 +306,7 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
if (isWifiProxy(mContext) || checkVPN((ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE))) { if (isWifiProxy(mContext) || checkVPN((ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE))) {
ToastUtil.show(WordUtil.isNewZh()?"檢測開啓了VPN或者代理，請先關閉VPN或者代理再開播。": ToastUtil.show(WordUtil.isNewZh()?"檢測開啓了VPN或者代理，請先關閉VPN或者代理再開播。":
"It is detected that VPN or proxy is turned on. Please turn off VPN or proxy before starting the broadcast."); "It is detected that VPN or proxy is turned on. Please turn off VPN or proxy before starting the broadcast.");
AppManager.runDebugCode(() -> mCallback.onLiveClick());
} else { } else {
if (mCallback != null) { if (mCallback != null) {
MobclickAgent.onEvent(mContext, "home_page_broadcast", "点击开播按钮"); MobclickAgent.onEvent(mContext, "home_page_broadcast", "点击开播按钮");