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

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693 2023-08-22 10:13:57 +08:00
parent 2332255b37
commit 3b351ffad8
46 changed files with 115 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

@ -248,7 +248,10 @@ public class WebViewActivity extends AbsActivity {
mValueCallback2 = null; mValueCallback2 = null;
} }
public static void forward(Context context, String url, boolean addArgs) { private static boolean mIsLive = false;
public static void forward(Context context, String url, boolean addArgs, boolean isLive) {
mIsLive = isLive;
if (Constants.LoginKefu) { if (Constants.LoginKefu) {
if (addArgs) { if (addArgs) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
@ -259,8 +262,8 @@ public class WebViewActivity extends AbsActivity {
context.startActivity(intent); context.startActivity(intent);
} }
public static void forward(Context context, String url) { public static void forward(Context context, String url,boolean isLive) {
forward(context, url, true); forward(context, url, true, isLive);
} }
@ -405,9 +408,9 @@ public class WebViewActivity extends AbsActivity {
MicStatusManager.getInstance().showDownMicDialog(mContext); MicStatusManager.getInstance().showDownMicDialog(mContext);
return; return;
} }
if (!"".endsWith(Constants.mStream)) { if (mIsLive) {
finish(); finish();
if(MicStatusManager.getInstance().isMic(liveUid)){ if (MicStatusManager.getInstance().isMic(liveUid)) {
MicStatusManager.getInstance().showDownMicDialog(mContext); MicStatusManager.getInstance().showDownMicDialog(mContext);
return; return;
} }

10
common/src/main/java/com/yunbao/common/event/GiftWallItemEvent.java
View File

@ -7,6 +7,16 @@ public class GiftWallItemEvent extends BaseModel {
private GiftWallModel giftWallModel; private GiftWallModel giftWallModel;
private boolean unlit; private boolean unlit;
private boolean csb;
public boolean isCsb() {
return csb;
}
public GiftWallItemEvent setCsb(boolean csb) {
this.csb = csb;
return this;
}
public GiftWallModel getGiftWallModel() { public GiftWallModel getGiftWallModel() {
return giftWallModel; return giftWallModel;

3
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -889,7 +889,8 @@ public interface PDLiveApi {
@GET("/api/public/?service=Gift.giftDetail") @GET("/api/public/?service=Gift.giftDetail")
Observable<ResponseModel<GiftWallGiftDetail>> giftDetail( Observable<ResponseModel<GiftWallGiftDetail>> giftDetail(
@Query("liveuid") String liveUid, @Query("liveuid") String liveUid,
@Query("gift_id") String giftId @Query("gift_id") String giftId,
@Query("to_uid") String toUid
); );
/** /**

4
common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
View File

@ -1929,9 +1929,9 @@ public class LiveNetManager {
}).isDisposed(); }).isDisposed();
} }
public void giftDetail(String liveUid, String giftId, HttpCallback<GiftWallGiftDetail> callback) { public void giftDetail(String liveUid, String giftId, String toUid, HttpCallback<GiftWallGiftDetail> callback) {
API.get().pdLiveApi(mContext) API.get().pdLiveApi(mContext)
.giftDetail(liveUid, giftId) .giftDetail(liveUid, giftId,toUid)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<GiftWallGiftDetail>>() { .subscribe(new Consumer<ResponseModel<GiftWallGiftDetail>>() {

2
common/src/main/java/com/yunbao/common/pay/PayPresenter.java
View File

@ -239,7 +239,7 @@ public class PayPresenter {
public void open(String url){ public void open(String url){
//支付时内部跳转 false要添加 //支付时内部跳转 false要添加
WebViewActivity.forward(mActivity,url,false); WebViewActivity.forward(mActivity,url,false,false);
} }

4
common/src/main/java/com/yunbao/common/views/GiftAlreadyWallViewHolder.java
View File

@ -25,14 +25,14 @@ public class GiftAlreadyWallViewHolder extends RecyclerView.ViewHolder {
giftNumber = itemView.findViewById(R.id.gift_number); giftNumber = itemView.findViewById(R.id.gift_number);
} }
public void showData(GiftWallModel giftWallModel,boolean sbWy) { public void showData(GiftWallModel giftWallModel, boolean sbWy) {
giftTitle.setText(giftWallModel.getGiftname()); giftTitle.setText(giftWallModel.getGiftname());
giftNumber.setText("*" + giftWallModel.getGiftCountNumber()); giftNumber.setText("*" + giftWallModel.getGiftCountNumber());
ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg); ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
Bus.get().post(new GiftWallItemEvent().setGiftWallModel(giftWallModel).setUnlit(true)); Bus.get().post(new GiftWallItemEvent().setGiftWallModel(giftWallModel).setUnlit(true).setCsb(true));
} }
}); });
} }

2
common/src/main/java/com/yunbao/common/views/GiftWithoutWallViewHolder.java
View File

@ -30,7 +30,7 @@ public class GiftWithoutWallViewHolder extends RecyclerView.ViewHolder {
ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
Bus.get().post(new GiftWallItemEvent().setGiftWallModel(giftWallModel).setUnlit(false)); Bus.get().post(new GiftWallItemEvent().setGiftWallModel(giftWallModel).setUnlit(false).setCsb(false));
} }
}); });
} }

2
common/src/main/res/layout/item_gift_already_wall.xml
View File

@ -19,12 +19,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="9dp" android:layout_marginTop="9dp"
android:gravity="center"
android:text="@string/instant_light" android:text="@string/instant_light"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/gift_number" android:id="@+id/gift_number"
android:gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"

1
common/src/main/res/layout/item_gift_without_wall.xml
View File

@ -25,6 +25,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="9dp" android:layout_marginTop="9dp"
android:text="@string/instant_light" android:text="@string/instant_light"
android:gravity="center"
android:textColor="#54618F" android:textColor="#54618F"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>

4
config.gradle
View File

@ -9,9 +9,9 @@ ext {
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
serverHost : "https://napi.yaoulive.com", // serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
// serverHost : " https://ceshi.yaoulive.com", serverHost : " https://ceshi.yaoulive.com",

2
live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java
View File

@ -198,7 +198,7 @@ public class GiftWallActivity extends AbsActivity {
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onGiftWallItemEvent(GiftWallItemEvent event) { public void onGiftWallItemEvent(GiftWallItemEvent event) {
new XPopup.Builder(this) new XPopup.Builder(this)
.asCustom(new GiftWallItemPopup(this, event.getGiftWallModel(), event.isUnlit(), mLiveUid, mLiveUid, mStream, false)) .asCustom(new GiftWallItemPopup(this, event.getGiftWallModel(), event.isUnlit(), mLiveUid, mLiveUid, mStream, false,event.isCsb()))
.show(); .show();
} }

2
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -898,7 +898,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
@Override @Override
public void onClick(View v) { public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url,true);
dialog.dismiss(); dialog.dismiss();
} }
}); });

2
live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java
View File

@ -282,7 +282,7 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
+ CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid
+ "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"); + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false,0);
break; break;
case Constants.LIVE_FUNC_LINK_MIC://连麦 case Constants.LIVE_FUNC_LINK_MIC://连麦
openLinkMicAnchorWindow(); openLinkMicAnchorWindow();

8
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -888,7 +888,7 @@ public class LiveAudienceActivity extends LiveActivity {
RouteUtil.forwardEditProfileActivity(); RouteUtil.forwardEditProfileActivity();
} else { } else {
if (!screen) { if (!screen) {
ZhuangBanActivity.forward(mContext, htmlUrl, false); ZhuangBanActivity.forward(mContext, htmlUrl, false,1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl); bundle.putString("url", htmlUrl);
@ -1095,7 +1095,7 @@ public class LiveAudienceActivity extends LiveActivity {
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+ userInfo.getId() + + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false,1);
break; break;
case NOBLE: case NOBLE:
Constants.isTitle = true; Constants.isTitle = true;
@ -1105,7 +1105,7 @@ public class LiveAudienceActivity extends LiveActivity {
+ "&anchorUid=" + mLiveBean.getUid() + "&anchorUid=" + mLiveBean.getUid()
+ "&ancherName=" + mLiveBean.getUserNiceName() + "&ancherName=" + mLiveBean.getUserNiceName()
+ "&uid=" + userInfo.getId(); + "&uid=" + userInfo.getId();
ZhuangBanActivity.forward(mContext, nobleUrl, false); ZhuangBanActivity.forward(mContext, nobleUrl, false,1);
break; break;
case LIAN_MAI: case LIAN_MAI:
if (event.getMicIng() == 1) { if (event.getMicIng() == 1) {
@ -1503,7 +1503,7 @@ public class LiveAudienceActivity extends LiveActivity {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null); FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service"); AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
if (bean.getLink() != null && !"".equals(bean.getLink())) { if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(mContext, bean.getLink()); WebViewActivity.forward(mContext, bean.getLink(), true);
} else { } else {
startActivity(new Intent(mContext, SystemMessageActivity.class) startActivity(new Intent(mContext, SystemMessageActivity.class)
.putExtra("type", bean.getType()) .putExtra("type", bean.getType())

4
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@ -488,7 +488,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
break; break;
case Constants.LIVE_FUNC_WKS: case Constants.LIVE_FUNC_WKS:
String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false,0);
break; break;
case Constants.LIVE_FUNC_LINK_MIC://连麦 case Constants.LIVE_FUNC_LINK_MIC://连麦
if (isDRPK != 1) { if (isDRPK != 1) {
@ -1539,7 +1539,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+ userInfo.getId() + + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false,0);
break; break;
case WISH_LIST: case WISH_LIST:
LiveWishListDialogFragment4Audience fragment4Audience = new LiveWishListDialogFragment4Audience(); LiveWishListDialogFragment4Audience fragment4Audience = new LiveWishListDialogFragment4Audience();

2
live/src/main/java/com/yunbao/live/activity/MyTUIConversationFragment.java
View File

@ -172,7 +172,7 @@ public class MyTUIConversationFragment extends Fragment {
systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), ""); systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), "");
} else if ("3".equals(bean.getType())) { } else if ("3".equals(bean.getType())) {
if (bean.getLink() != null && !"".equals(bean.getLink())) { if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(getActivity(), bean.getLink()); WebViewActivity.forward(getActivity(), bean.getLink(),false);
} else { } else {
systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), ""); systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), "");
} }

19
live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
View File

@ -31,21 +31,19 @@ import com.yunbao.common.R;
import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils; import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.dialog.LiveUserDialogFragment; import com.yunbao.live.dialog.LiveUserDialogFragment;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode; import org.greenrobot.eventbus.ThreadMode;
@ -182,16 +180,7 @@ public class WebViewActivityMedal extends AbsActivity {
MicStatusManager.getInstance().showDownMicDialog(mContext); MicStatusManager.getInstance().showDownMicDialog(mContext);
return; return;
} }
if (!"".endsWith(Constants.mStream)) { RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
finish();
if(MicStatusManager.getInstance().isMic(liveUid)){
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
} else {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
finish(); finish();
} }
@ -313,7 +302,7 @@ public class WebViewActivityMedal extends AbsActivity {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} }
Intent intent = new Intent(context, WebViewActivityMedal.class); Intent intent = new Intent(context, WebViewActivityMedal.class);
intent.putExtra(Constants.URL, url+ "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
context.startActivity(intent); context.startActivity(intent);
} }

26
live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
View File

@ -39,19 +39,19 @@ import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils; import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.share.ui.InvitePopDialog; import com.yunbao.share.ui.InvitePopDialog;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
@ -76,6 +76,7 @@ public class ZhuangBanActivity extends AbsActivity {
private FrameLayout title; private FrameLayout title;
private TextView titleView, htmlError; private TextView titleView, htmlError;
private RelativeLayout rootView; private RelativeLayout rootView;
private boolean mIsLive = false;
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {
@ -87,6 +88,7 @@ public class ZhuangBanActivity extends AbsActivity {
Bus.getOn(this); Bus.getOn(this);
String url = getIntent().getStringExtra(Constants.URL); String url = getIntent().getStringExtra(Constants.URL);
String titleString = getIntent().getStringExtra("title"); String titleString = getIntent().getStringExtra("title");
mIsLive = getIntent().getIntExtra("isLive", 0) == 1;
L.e("H5---2s>" + url); L.e("H5---2s>" + url);
LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView); LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView);
mProgressBar = (ProgressBar) findViewById(R.id.progressbar); mProgressBar = (ProgressBar) findViewById(R.id.progressbar);
@ -275,11 +277,7 @@ public class ZhuangBanActivity extends AbsActivity {
if (isNeedExitActivity()) { if (isNeedExitActivity()) {
finish(); finish();
} else { } else {
// if (canGoBack()) {
// mWebView.goBack();
// } else {
finish(); finish();
// }
} }
} }
@ -296,7 +294,8 @@ public class ZhuangBanActivity extends AbsActivity {
return false; return false;
} }
public static void forward(Context context, String url, boolean addArgs) {
public static void forward(Context context, String url, boolean addArgs, int isLive) {
if (addArgs) { if (addArgs) {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} }
@ -306,11 +305,12 @@ public class ZhuangBanActivity extends AbsActivity {
if (url.contains("Noble/index.html") || url.contains("RongYuQiang")) { if (url.contains("Noble/index.html") || url.contains("RongYuQiang")) {
intent.putExtra("title", ""); intent.putExtra("title", "");
} }
intent.putExtra("isLive", isLive);
context.startActivity(intent); context.startActivity(intent);
} }
public static void forward(Context context, String url) { public static void forward(Context context, String url, int isLive) {
forward(context, url, true); forward(context, url, true, isLive);
} }
@Override @Override
@ -407,13 +407,13 @@ public class ZhuangBanActivity extends AbsActivity {
return; return;
} }
if (!"".endsWith(Constants.mStream)) { if (mIsLive) {
finish(); if (MicStatusManager.getInstance().isMic(liveUid)) {
if(MicStatusManager.getInstance().isMic(liveUid)){
MicStatusManager.getInstance().showDownMicDialog(mContext); MicStatusManager.getInstance().showDownMicDialog(mContext);
return; return;
} }
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal))); EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
finish();
} else { } else {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk)); RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
} }

2
live/src/main/java/com/yunbao/live/adapter/SystemChatMessageAdapter.java
View File

@ -98,7 +98,7 @@ public class SystemChatMessageAdapter extends RecyclerView.Adapter {
forward(mContext, model1.getType(), "", model1.getTitle(), ""); forward(mContext, model1.getType(), "", model1.getTitle(), "");
} else if ("3".equals(model1.getType())) { } else if ("3".equals(model1.getType())) {
if (model1.getLink() != null && !"".equals(model1.getLink())) { if (model1.getLink() != null && !"".equals(model1.getLink())) {
WebViewActivity.forward(mContext, model1.getLink()); WebViewActivity.forward(mContext, model1.getLink(),false);
} else { } else {
forward(mContext, model1.getType(), "", model1.getTitle(), ""); forward(mContext, model1.getType(), "", model1.getTitle(), "");
} }

3
live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java
View File

@ -232,7 +232,8 @@ public class GiftWallDialog extends AbsDialogFragment {
mLiveUid, mLiveUid,
toUid, toUid,
mStream, mStream,
sbWy)) sbWy,
event.isCsb()))
.show(); .show();
} }

12
live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
View File

@ -31,10 +31,10 @@ public class GiftWallItemPopup extends CenterPopupView {
private GiftWallModel giftWallModel; private GiftWallModel giftWallModel;
private boolean unlit; private boolean unlit;
private String mLiveUid, mStream, toUid; private String mLiveUid, mStream, toUid;
private boolean isAnchor = false, sbWy; private boolean isAnchor = false, sbWy, csb;
public GiftWallItemPopup(@NonNull Context context, GiftWallModel giftWallModel, public GiftWallItemPopup(@NonNull Context context, GiftWallModel giftWallModel,
boolean unlit, String mLiveUid, String toUid, String mStream, boolean sbWy) { boolean unlit, String mLiveUid, String toUid, String mStream, boolean sbWy, boolean csb) {
super(context); super(context);
this.giftWallModel = giftWallModel; this.giftWallModel = giftWallModel;
this.unlit = unlit; this.unlit = unlit;
@ -42,6 +42,7 @@ public class GiftWallItemPopup extends CenterPopupView {
this.toUid = toUid; this.toUid = toUid;
this.mStream = mStream; this.mStream = mStream;
this.sbWy = sbWy; this.sbWy = sbWy;
this.csb = csb;
if (this.mLiveUid.equals(CommonAppConfig.getInstance().getUid())) { if (this.mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
isAnchor = true; isAnchor = true;
} }
@ -100,10 +101,10 @@ public class GiftWallItemPopup extends CenterPopupView {
public void loadData() { public void loadData() {
LiveNetManager.get(getContext()). LiveNetManager.get(getContext()).
giftDetail(mLiveUid, String.valueOf(giftWallModel.getId()), new HttpCallback<GiftWallGiftDetail>() { giftDetail(mLiveUid, String.valueOf(giftWallModel.getId()), toUid, new HttpCallback<GiftWallGiftDetail>() {
@Override @Override
public void onSuccess(GiftWallGiftDetail data) { public void onSuccess(GiftWallGiftDetail data) {
if (data.getUid() == 0) { if (data.getUid() == 0 || !csb) {
ImgLoader.display(getContext(), R.mipmap.icon_vacant_position_awaits, avatar); ImgLoader.display(getContext(), R.mipmap.icon_vacant_position_awaits, avatar);
vacantPositionAwaits.setText(getContext().getText(R.string.vacant_position_awaits)); vacantPositionAwaits.setText(getContext().getText(R.string.vacant_position_awaits));
vacantPosition.setText("?"); vacantPosition.setText("?");
@ -123,6 +124,9 @@ public class GiftWallItemPopup extends CenterPopupView {
@Override @Override
public void onError(String error) { public void onError(String error) {
ToastUtil.show(error); ToastUtil.show(error);
ImgLoader.display(getContext(), R.mipmap.icon_vacant_position_awaits, avatar);
vacantPositionAwaits.setText(getContext().getText(R.string.vacant_position_awaits));
vacantPosition.setText("?");
} }
}); });
} }

2
live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java
View File

@ -55,7 +55,7 @@ public class HighNobilityDialog extends AbsDialogFragment {
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname="
+ u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid="
+ CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false,0);
}); });

2
live/src/main/java/com/yunbao/live/dialog/LiveChatListDialogFragment.java
View File

@ -186,7 +186,7 @@ public class LiveChatListDialogFragment extends AbsDialogFragment {
systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), ""); systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), "");
} else if ("3".equals(bean.getType())) { } else if ("3".equals(bean.getType())) {
if (bean.getLink() != null && !"".equals(bean.getLink())) { if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(getActivity(), bean.getLink()); WebViewActivity.forward(getActivity(), bean.getLink(),false);
} else { } else {
systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), ""); systemMessageActivity.forward(getContext(), bean.getType(), "", bean.getTitle(), "");
} }

2
live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
View File

@ -371,7 +371,7 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname="
+ u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid="
+ CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&active=" + event.getData() + "&anchorUid=" + mLiveUid; + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&active=" + event.getData() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false,0);
} }
} }

2
live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java
View File

@ -111,7 +111,7 @@ public class MedalAchievementPopup extends BottomPopupView {
.append(userInfo.getToken()) .append(userInfo.getToken())
.append("&uid=") .append("&uid=")
.append(userInfo.getId()); .append(userInfo.getId());
ZhuangBanActivity.forward(getContext(), htmlUrl.toString(), false); ZhuangBanActivity.forward(getContext(), htmlUrl.toString(), false,0);
} }
}); });
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.close_btn), new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.close_btn), new ViewClicksAntiShake.ViewClicksCallBack() {

4
live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
View File

@ -373,7 +373,7 @@ public class LiveGiftAnimPresenter {
mGifGiftTipGroupBuyZuoji.setOnClickListener(new View.OnClickListener() { mGifGiftTipGroupBuyZuoji.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
WebViewActivity.forward(mContext, HtmlConfig.SHOP + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); WebViewActivity.forward(mContext, HtmlConfig.SHOP + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),true);
} }
}); });
} }
@ -382,7 +382,7 @@ public class LiveGiftAnimPresenter {
mGifGiftTipGroupBuyLiangName.setOnClickListener(new View.OnClickListener() { mGifGiftTipGroupBuyLiangName.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
WebViewActivity.forward(mContext, HtmlConfig.SHOP + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); WebViewActivity.forward(mContext, HtmlConfig.SHOP + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),true);
} }
}); });
} }

12
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1797,7 +1797,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -1863,7 +1863,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -2017,10 +2017,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else { } else {
url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} }
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false,1);
} else if (link.equals("zxb")) { } else if (link.equals("zxb")) {
String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false,1);
} else if (link.equals("xyd")) { } else if (link.equals("xyd")) {
openWishListWindow(); openWishListWindow();
} }
@ -5272,7 +5272,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append("&isZh=") .append("&isZh=")
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -5352,7 +5352,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append("&isZh=") .append("&isZh=")
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());

4
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -490,7 +490,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append(System.currentTimeMillis()); .append(System.currentTimeMillis());
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -549,7 +549,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append("&g=Appapi&m=Wish&a=index"); .append("&g=Appapi&m=Wish&a=index");
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());

2
live/src/main/java/com/yunbao/live/views/SidebarViewHoler.java
View File

@ -73,7 +73,7 @@ public class SidebarViewHoler extends RecyclerView.ViewHolder {
showLoadingDialog(); showLoadingDialog();
String link = bean.getSlideUrl(); String link = bean.getSlideUrl();
if (link.contains("http")) { if (link.contains("http")) {
WebViewActivity.forward(itemView.getContext(), link, true); WebViewActivity.forward(itemView.getContext(), link, true,false);
if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing())
mShowLoadingDialog.dismiss(); mShowLoadingDialog.dismiss();
} else { } else {

2
live/src/main/java/com/yunbao/live/views/TurnTableWebViewHolder.java
View File

@ -128,7 +128,7 @@ public class TurnTableWebViewHolder extends AbsLivePageViewHolder implements Vie
if (!TextUtils.isEmpty(event.getMethod())) { if (!TextUtils.isEmpty(event.getMethod())) {
if (TextUtils.equals(event.getMethod(), "androidMethod")) { if (TextUtils.equals(event.getMethod(), "androidMethod")) {
if (event.getData() != null && !event.getData().isEmpty()) { if (event.getData() != null && !event.getData().isEmpty()) {
WebViewActivity.forward(mContext, HtmlConfig.SHOP + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); WebViewActivity.forward(mContext, HtmlConfig.SHOP + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
EventBus.getDefault().post(new JsTurnTableBean(event.getData())); EventBus.getDefault().post(new JsTurnTableBean(event.getData()));
} }
} }

4
main/src/main/java/com/yunbao/main/activity/BindUserActivity.java
View File

@ -272,9 +272,9 @@ public class BindUserActivity extends AbsActivity {
} else if (i == R.id.btn_register) { } else if (i == R.id.btn_register) {
register(); register();
} else if (i == R.id.btn_tip2) { } else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
} else if (i == R.id.btn_tip3) { } else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
} else if (i == R.id.btn_goto_updata) { } else if (i == R.id.btn_goto_updata) {
lt_now_bind.setVisibility(View.GONE); lt_now_bind.setVisibility(View.GONE);
lt_first_bind.setVisibility(View.VISIBLE); lt_first_bind.setVisibility(View.VISIBLE);

2
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@ -411,7 +411,7 @@ public class EditProfileActivity extends AbsActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url,false);
dialog.dismiss(); dialog.dismiss();
} }
}); });

8
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -208,14 +208,14 @@ public class EntryActivity extends AppCompatActivity {
btn_tip1.setOnClickListener(new View.OnClickListener() { btn_tip1.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY); WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY,false);
} }
}); });
btn_tip.setOnClickListener(new View.OnClickListener() { btn_tip.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1); WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1,false);
} }
}); });
@ -268,7 +268,7 @@ public class EntryActivity extends AppCompatActivity {
if (data.getType().equals("0")) { if (data.getType().equals("0")) {
LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile")); LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
} else { } else {
WebViewActivity.forward(EntryActivity.this, data.getLink() + "?"); WebViewActivity.forward(EntryActivity.this, data.getLink() + "?",false);
} }
} }
@ -387,7 +387,7 @@ public class EntryActivity extends AppCompatActivity {
public void onClick(View v) { public void onClick(View v) {
if (!"".equals(kefuUrl)) { if (!"".equals(kefuUrl)) {
Constants.LoginKefu = true; Constants.LoginKefu = true;
WebViewActivity.forward(EntryActivity.this, kefuUrl); WebViewActivity.forward(EntryActivity.this, kefuUrl,false);
} }
} }
}); });

2
main/src/main/java/com/yunbao/main/activity/LoginActivity.java
View File

@ -239,7 +239,7 @@ public class LoginActivity extends AbsActivity {
//登录即代表同意服务和隐私条款 //登录即代表同意服务和隐私条款
private void forwardTip() { private void forwardTip() {
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY); WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY,false);
} }

2
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -279,7 +279,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} }
} else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("8")) { } else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("8")) {
WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true); WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true,false);
} }
FirebaseMessaging.getInstance().getToken() FirebaseMessaging.getInstance().getToken()
.addOnCompleteListener(new OnCompleteListener<String>() { .addOnCompleteListener(new OnCompleteListener<String>() {

4
main/src/main/java/com/yunbao/main/activity/MyCoinActivity.java
View File

@ -297,10 +297,10 @@ public class MyCoinActivity extends AbsActivity implements OnItemClickListener<C
int i = v.getId(); int i = v.getId();
if (i == R.id.btn_tip) { if (i == R.id.btn_tip) {
//充值协议 //充值协议
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_PRIVCAY + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); WebViewActivity.forward(mContext, HtmlConfig.CHARGE_PRIVCAY + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
}else if (i == R.id.btn_charge_explain) { }else if (i == R.id.btn_charge_explain) {
//充值说明 //充值说明
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_EXPLAIN + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); WebViewActivity.forward(mContext, HtmlConfig.CHARGE_EXPLAIN + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
} }
} }

2
main/src/main/java/com/yunbao/main/activity/MyProfitActivity.java
View File

@ -159,7 +159,7 @@ public class MyProfitActivity extends AbsActivity implements View.OnClickListene
* 提现记录 * 提现记录
*/ */
private void cashRecord() { private void cashRecord() {
WebViewActivity.forward(mContext, HtmlConfig.CASH_RECORD + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); WebViewActivity.forward(mContext, HtmlConfig.CASH_RECORD + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
} }

2
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@ -324,7 +324,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null); FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service"); AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
if (userBean.getLink() != null && !"".equals(userBean.getLink())) { if (userBean.getLink() != null && !"".equals(userBean.getLink())) {
WebViewActivity.forward(mContext, userBean.getLink()); WebViewActivity.forward(mContext, userBean.getLink(),false);
} else { } else {
startActivity(new Intent(mContext, SystemMessageActivity.class) startActivity(new Intent(mContext, SystemMessageActivity.class)
.putExtra("type", userBean.getType()) .putExtra("type", userBean.getType())

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

@ -281,9 +281,9 @@ public class RegisterActivity extends AbsActivity {
} else if (i == R.id.btn_register) { } else if (i == R.id.btn_register) {
register(); register();
} else if (i == R.id.btn_tip2) { } else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
} else if (i == R.id.btn_tip3) { } else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
} }
} }

2
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@ -321,7 +321,7 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
if (bean.getId() == 17) {//意见反馈要在url上加版本号和设备号 if (bean.getId() == 17) {//意见反馈要在url上加版本号和设备号
href += "&version=" + android.os.Build.VERSION.RELEASE + "&model=" + android.os.Build.MODEL; href += "&version=" + android.os.Build.VERSION.RELEASE + "&model=" + android.os.Build.MODEL;
} }
WebViewActivity.forward(mContext, href); WebViewActivity.forward(mContext, href,false);
} }
} }

15
main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
View File

@ -37,7 +37,6 @@ import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
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;
@ -53,7 +52,6 @@ import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode; import org.greenrobot.eventbus.ThreadMode;
@ -400,16 +398,9 @@ public class ZhuangBanActivity extends AbsActivity {
MicStatusManager.getInstance().showDownMicDialog(mContext); MicStatusManager.getInstance().showDownMicDialog(mContext);
return; return;
} }
if (!"".endsWith(Constants.mStream)) {
finish(); RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
if(MicStatusManager.getInstance().isMic(liveUid)){
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
} else {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
finish(); finish();
} }

2
main/src/main/java/com/yunbao/main/adapter/SystemMessageAdapter.java
View File

@ -95,7 +95,7 @@ public class SystemMessageAdapter extends RecyclerView.Adapter {
forward(mContext, model1.getType(), "", model1.getTitle(), ""); forward(mContext, model1.getType(), "", model1.getTitle(), "");
} else if ("3".equals(model1.getType())) { } else if ("3".equals(model1.getType())) {
if (model1.getLink() != null && !"".equals(model1.getLink())) { if (model1.getLink() != null && !"".equals(model1.getLink())) {
WebViewActivity.forward(mContext, model1.getLink()); WebViewActivity.forward(mContext, model1.getLink(),false);
} else { } else {
forward(mContext, model1.getType(), "", model1.getTitle(), ""); forward(mContext, model1.getType(), "", model1.getTitle(), "");
} }

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

@ -78,7 +78,7 @@ public class ReturnUserDialog extends AbsDialogFragment {
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken());
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
} }
}); });

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

@ -426,7 +426,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
} }
showLoadingDialog(); showLoadingDialog();
if (link.contains("http")) { if (link.contains("http")) {
WebViewActivity.forward(mContext, link, true); WebViewActivity.forward(mContext, link, true,false);
} else { } else {
gotoLive(link); gotoLive(link);
} }

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

@ -463,13 +463,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
RewardActivity.forward(mContext, url); RewardActivity.forward(mContext, url);
} else if (bean.getId() == 4) { } else if (bean.getId() == 4) {
url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"); url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url, false);
} else if (bean.getId() == 3) {//我的等级 } else if (bean.getId() == 3) {//我的等级
Constants.myIntoIndex = 2; Constants.myIntoIndex = 2;
Constants.isTitle = false; Constants.isTitle = false;
ZhuangBanActivity.forward(mContext, url); ZhuangBanActivity.forward(mContext, url);
} else { } else {
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url, false);
} }
} }
@ -494,7 +494,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index"; String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
RewardActivity.forward(mContext, url); RewardActivity.forward(mContext, url);
} else if (i == R.id.rt_kefu) { } else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref()); WebViewActivity.forward(mContext, beanKefu.getHref(), false);
} else if (i == R.id.rt_setting) { } else if (i == R.id.rt_setting) {
forwardSetting(); forwardSetting();
} else if (i == R.id.lt_noble) { } else if (i == R.id.lt_noble) {
@ -594,7 +594,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
if (!bean.getSlide_url().equals("")) { if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true; Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
WebViewActivity.forward(mContext, url, false); WebViewActivity.forward(mContext, url, false, false);
} }
} }
} }

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

@ -148,7 +148,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
@Override @Override
public void onClick(View view) { public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for"; String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url,false);
} }
}); });
//用户等级 //用户等级
@ -156,7 +156,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
@Override @Override
public void onClick(View view) { public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid(); String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url,false);
} }
}); });
@ -372,7 +372,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
Log.i("tsa", url); Log.i("tsa", url);
RewardActivity.forward(mContext, url); RewardActivity.forward(mContext, url);
} else { } else {
WebViewActivity.forward(mContext, url); WebViewActivity.forward(mContext, url,false);
} }
} }
@ -400,7 +400,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
} else if (i == R.id.btn_gold) { } else if (i == R.id.btn_gold) {
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0)); mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
} else if (i == R.id.rt_kefu) { } else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref()); WebViewActivity.forward(mContext, beanKefu.getHref(),false);
} else if (i == R.id.rt_setting) { } else if (i == R.id.rt_setting) {
forwardSetting(); forwardSetting();
} else if (i == R.id.v_noble) { } else if (i == R.id.v_noble) {