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
Download Patch File Download Diff File Expand all files Collapse all files

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)
public void onGiftWallItemEvent(GiftWallItemEvent event) {
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();
}

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
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";
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url,true);
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().getToken() + "&anchorUid=" + mLiveUid
+ "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
ZhuangBanActivity.forward(mContext, url, false);
ZhuangBanActivity.forward(mContext, url, false,0);
break;
case Constants.LIVE_FUNC_LINK_MIC://连麦
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();
} else {
if (!screen) {
ZhuangBanActivity.forward(mContext, htmlUrl, false);
ZhuangBanActivity.forward(mContext, htmlUrl, false,1);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl);
@@ -1095,7 +1095,7 @@ public class LiveAudienceActivity extends LiveActivity {
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+ userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false);
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false,1);
break;
case NOBLE:
Constants.isTitle = true;
@@ -1105,7 +1105,7 @@ public class LiveAudienceActivity extends LiveActivity {
+ "&anchorUid=" + mLiveBean.getUid()
+ "&ancherName=" + mLiveBean.getUserNiceName()
+ "&uid=" + userInfo.getId();
ZhuangBanActivity.forward(mContext, nobleUrl, false);
ZhuangBanActivity.forward(mContext, nobleUrl, false,1);
break;
case LIAN_MAI:
if (event.getMicIng() == 1) {
@@ -1503,7 +1503,7 @@ public class LiveAudienceActivity extends LiveActivity {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(mContext, bean.getLink());
WebViewActivity.forward(mContext, bean.getLink(), true);
} else {
startActivity(new Intent(mContext, SystemMessageActivity.class)
.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;
case Constants.LIVE_FUNC_WKS:
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;
case Constants.LIVE_FUNC_LINK_MIC://连麦
if (isDRPK != 1) {
@@ -1539,7 +1539,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+ userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false);
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false,0);
break;
case WISH_LIST:
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(), "");
} else if ("3".equals(bean.getType())) {
if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(getActivity(), bean.getLink());
WebViewActivity.forward(getActivity(), bean.getLink(),false);
} else {
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.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
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.ThreadMode;
@@ -182,16 +180,7 @@ public class WebViewActivityMedal extends AbsActivity {
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
if (!"".endsWith(Constants.mStream)) {
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));
}
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
finish();
}
@@ -313,7 +302,7 @@ public class WebViewActivityMedal extends AbsActivity {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
}
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);
}

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.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
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 org.greenrobot.eventbus.EventBus;
@@ -76,6 +76,7 @@ public class ZhuangBanActivity extends AbsActivity {
private FrameLayout title;
private TextView titleView, htmlError;
private RelativeLayout rootView;
private boolean mIsLive = false;
@Override
protected int getLayoutId() {
@@ -87,6 +88,7 @@ public class ZhuangBanActivity extends AbsActivity {
Bus.getOn(this);
String url = getIntent().getStringExtra(Constants.URL);
String titleString = getIntent().getStringExtra("title");
mIsLive = getIntent().getIntExtra("isLive", 0) == 1;
L.e("H5---2s>" + url);
LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView);
mProgressBar = (ProgressBar) findViewById(R.id.progressbar);
@@ -275,11 +277,7 @@ public class ZhuangBanActivity extends AbsActivity {
if (isNeedExitActivity()) {
finish();
} else {
// if (canGoBack()) {
// mWebView.goBack();
// } else {
finish();
// }
}
}
@@ -296,7 +294,8 @@ public class ZhuangBanActivity extends AbsActivity {
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) {
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")) {
intent.putExtra("title", "");
}
intent.putExtra("isLive", isLive);
context.startActivity(intent);
}
public static void forward(Context context, String url) {
forward(context, url, true);
public static void forward(Context context, String url, int isLive) {
forward(context, url, true, isLive);
}
@Override
@@ -407,13 +407,13 @@ public class ZhuangBanActivity extends AbsActivity {
return;
}
if (!"".endsWith(Constants.mStream)) {
finish();
if(MicStatusManager.getInstance().isMic(liveUid)){
if (mIsLive) {
if (MicStatusManager.getInstance().isMic(liveUid)) {
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
finish();
} else {
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(), "");
} else if ("3".equals(model1.getType())) {
if (model1.getLink() != null && !"".equals(model1.getLink())) {
WebViewActivity.forward(mContext, model1.getLink());
WebViewActivity.forward(mContext, model1.getLink(),false);
} else {
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,
toUid,
mStream,
sbWy))
sbWy,
event.isCsb()))
.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 boolean unlit;
private String mLiveUid, mStream, toUid;
private boolean isAnchor = false, sbWy;
private boolean isAnchor = false, sbWy, csb;
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);
this.giftWallModel = giftWallModel;
this.unlit = unlit;
@@ -42,6 +42,7 @@ public class GiftWallItemPopup extends CenterPopupView {
this.toUid = toUid;
this.mStream = mStream;
this.sbWy = sbWy;
this.csb = csb;
if (this.mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
isAnchor = true;
}
@@ -100,10 +101,10 @@ public class GiftWallItemPopup extends CenterPopupView {
public void loadData() {
LiveNetManager.get(getContext()).
giftDetail(mLiveUid, String.valueOf(giftWallModel.getId()), new HttpCallback<GiftWallGiftDetail>() {
giftDetail(mLiveUid, String.valueOf(giftWallModel.getId()), toUid, new HttpCallback<GiftWallGiftDetail>() {
@Override
public void onSuccess(GiftWallGiftDetail data) {
if (data.getUid() == 0) {
if (data.getUid() == 0 || !csb) {
ImgLoader.display(getContext(), R.mipmap.icon_vacant_position_awaits, avatar);
vacantPositionAwaits.setText(getContext().getText(R.string.vacant_position_awaits));
vacantPosition.setText("?");
@@ -123,6 +124,9 @@ public class GiftWallItemPopup extends CenterPopupView {
@Override
public void onError(String 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="
+ u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid="
+ 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(), "");
} else if ("3".equals(bean.getType())) {
if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(getActivity(), bean.getLink());
WebViewActivity.forward(getActivity(), bean.getLink(),false);
} else {
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="
+ u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid="
+ 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("&uid=")
.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() {

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() {
@Override
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() {
@Override
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"));
}
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else {
Bundle bundle = new Bundle();
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"));
}
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
@@ -2017,10 +2017,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else {
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")) {
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")) {
openWishListWindow();
}
@@ -5272,7 +5272,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append("&isZh=")
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
@@ -5352,7 +5352,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append("&isZh=")
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
} else {
Bundle bundle = new Bundle();
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());
}
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
@@ -549,7 +549,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append("&g=Appapi&m=Wish&a=index");
}
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
} else {
Bundle bundle = new Bundle();
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();
String link = bean.getSlideUrl();
if (link.contains("http")) {
WebViewActivity.forward(itemView.getContext(), link, true);
WebViewActivity.forward(itemView.getContext(), link, true,false);
if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing())
mShowLoadingDialog.dismiss();
} 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.equals(event.getMethod(), "androidMethod")) {
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()));
}
}