diff --git a/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java b/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java index 9e9b84a10..e45947c1d 100644 --- a/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java +++ b/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java @@ -33,6 +33,29 @@ public class EnterRoomNewModel extends BaseModel { @SerializedName("wishListProgress") private WishModel wishListProgress; + @SerializedName("sud_game_room_status") + private String sudGameRoomStatus; + @SerializedName("sud_game_room_name") + private String sudGameRoomName; + + public String getSudGameRoomName() { + return sudGameRoomName; + } + + public EnterRoomNewModel setSudGameRoomName(String sudGameRoomName) { + this.sudGameRoomName = sudGameRoomName; + return this; + } + + public String getSudGameRoomStatus() { + return sudGameRoomStatus; + } + + public EnterRoomNewModel setSudGameRoomStatus(String sudGameRoomStatus) { + this.sudGameRoomStatus = sudGameRoomStatus; + return this; + } + public WishModel getWishListProgress() { return wishListProgress; } diff --git a/common/src/main/java/com/yunbao/common/views/SudHint.java b/common/src/main/java/com/yunbao/common/views/SudHint.java new file mode 100644 index 000000000..4e471849b --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/SudHint.java @@ -0,0 +1,36 @@ +package com.yunbao.common.views; + +import android.content.Context; +import android.widget.TextView; + +import androidx.annotation.NonNull; + +import com.lxj.xpopup.core.BottomPopupView; +import com.yunbao.common.R; +import com.yunbao.common.utils.WordUtil; + +public class SudHint extends BottomPopupView { + private String sudGameRoomName; + private TextView sud_text_name; + + public SudHint(@NonNull Context context, String sudGameRoomName) { + super(context); + this.sudGameRoomName = sudGameRoomName; + } + + // 返回自定义弹窗的布局 + @Override + protected int getImplLayoutId() { + return R.layout.dialog_sud_hint; + } + + // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑 + @Override + protected void onCreate() { + super.onCreate(); + sud_text_name = findViewById(R.id.sud_text_name); + sud_text_name.setText(WordUtil.isNewZh()? + String.format("主播创建了【%s】房间，快来与主播同玩~",sudGameRoomName): + String.format("The anchor has created a 【%s】 room. Come and play with the anchor~",sudGameRoomName)); + } +} diff --git a/common/src/main/res/drawable/bg_live_sud_hint.xml b/common/src/main/res/drawable/bg_live_sud_hint.xml new file mode 100644 index 000000000..29964763f --- /dev/null +++ b/common/src/main/res/drawable/bg_live_sud_hint.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/dialog_sud_hint.xml b/common/src/main/res/layout/dialog_sud_hint.xml new file mode 100644 index 000000000..d1fdcf2f1 --- /dev/null +++ b/common/src/main/res/layout/dialog_sud_hint.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 35623d033..98fe2a90c 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -377,7 +377,7 @@ Focus on the anchor Are you sure to report? Interaction - End Lian Mai + Quit even wheat Allowed even wheat Ban Lian Mai Initiate a link request diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 2bf68cb59..5a177b269 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -377,7 +377,7 @@ Focus on the anchor Are you sure to report? Interaction - End Lian Mai + Quit even wheat Allowed even wheat Ban Lian Mai Initiate a link request diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 268c5234f..f8762f151 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -160,7 +160,6 @@ import com.yunbao.live.dialog.LiveContactDetailsSendGiftDialog; import com.yunbao.live.dialog.LiveFaceUnityDialogFragment; import com.yunbao.live.dialog.LiveFansMedalDialogFragment; import com.yunbao.live.dialog.LiveGameDialogFragment; -import com.yunbao.live.dialog.LiveGiftPopup; import com.yunbao.live.dialog.LiveHDDialogFragment; import com.yunbao.live.dialog.LiveUserAnchorMailBoxWebInfoPopDialog; import com.yunbao.live.dialog.LiveUserDialogFragment; @@ -635,6 +634,32 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } } + private TextView sud_text_name; + private Handler sudNameHandler = new Handler(); + private Runnable sudNameRunnable = new Runnable() { + @Override + public void run() { + if (sud_text_name != null) { + sud_text_name.setVisibility(View.GONE); + } + } + }; + + public void setSudName(String sudName) { + sud_text_name = (TextView) findViewById(com.yunbao.common.R.id.sud_text_name); + sud_text_name.setText(WordUtil.isNewZh() ? + String.format("主播创建了【%s】房间，快来与主播同玩~", sudName) : + String.format("The anchor has created a 【%s】 room. Come and play with the anchor~", sudName)); + ViewClicksAntiShake.clicksAntiShake(sud_text_name, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + sud_text_name.setVisibility(View.GONE); + } + }); + sudNameHandler.removeCallbacks(sudNameRunnable); + sudNameHandler.postDelayed(sudNameRunnable, 10000); + } + @Override protected int getLayoutId() { return R.layout.view_live_room; @@ -1166,7 +1191,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } else if (bean.getType() == -5) { String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag", url); Bundle bundle1 = new Bundle(); bundle1.putString("url", url); @@ -2046,13 +2071,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (link.equals("sc")) { String url; if (!"".equals(bean.getmIntoUrl()) && bean.getmIntoUrl() != null) { - url = CommonAppConfig.HOST + bean.getmIntoUrl() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + url = CommonAppConfig.HOST + bean.getmIntoUrl() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } else { - url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } 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+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, url, false, 1); } else if (link.equals("xyd")) { openWishListWindow(); @@ -2317,7 +2342,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis url += "&"; } url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); bundle.putString("url", url); bundle.putInt("height", DpUtil.dp2px(500)); bundle.putInt("show_type", 0); @@ -2341,11 +2366,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } if (Integer.parseInt(bean.getRedVal()) > 2) { mRedVal.setVisibility(View.VISIBLE); - mRedVal.setText(bean.getRedVal() + (WordUtil.isNewZh()?"連勝":"Win")); + mRedVal.setText(bean.getRedVal() + (WordUtil.isNewZh() ? "連勝" : "Win")); } if (Integer.parseInt(bean.getBlueVal()) > 2) { mBlueVal.setVisibility(View.VISIBLE); - mBlueVal.setText(bean.getBlueVal() + (WordUtil.isNewZh()?"連勝":"Win")); + mBlueVal.setText(bean.getBlueVal() + (WordUtil.isNewZh() ? "連勝" : "Win")); } mPkRankTopIcon.setVisibility(View.VISIBLE); ImgLoader.display(mContext, bean.getPkTopImgUrl(), mPkRankTopIcon); diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 2973e84cb..d1c073757 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -692,7 +692,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } } AppManager.runDebugCode(() -> { - // liveHandler.postDelayed(loadTimeoutRunnableGone, 1_000); + // liveHandler.postDelayed(loadTimeoutRunnableGone, 1_000); }); liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000); if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) { @@ -713,6 +713,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } else { mLiveRoomViewHolder.hindeRedPacket(); } + if (TextUtils.equals(data.getSudGameRoomStatus(), "1")) { + mLiveRoomViewHolder.setSudName(data.getSudGameRoomName()); + } } @Override diff --git a/live/src/main/res/layout/activity_live_audience.xml b/live/src/main/res/layout/activity_live_audience.xml index 352e09a8e..22e809116 100644 --- a/live/src/main/res/layout/activity_live_audience.xml +++ b/live/src/main/res/layout/activity_live_audience.xml @@ -50,6 +50,7 @@ android:padding="5dp" android:src="@mipmap/icon_live_close" android:visibility="gone" /> + + - + diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml index 69d760c55..d9fc52816 100644 --- a/live/src/main/res/layout/view_new_live_ready.xml +++ b/live/src/main/res/layout/view_new_live_ready.xml @@ -75,7 +75,9 @@ = Build.VERSION_CODES.LOLLIPOP) { mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); } + if (!urlNow.contains("&isZh")) { + urlNow = urlNow + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + } + Log.e("MyH5", urlNow); mWebView.loadUrl(urlNow); if (Constants.myIntoIndex == 2) { @@ -416,7 +420,7 @@ public class MyWebViewActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); } Intent intent = new Intent(context, MyWebViewActivity.class); intent.putExtra(Constants.URL, url); @@ -594,7 +598,7 @@ public class MyWebViewActivity extends AbsActivity { } else if (TextUtils.equals(event.getMethod(), "androidCancelAnchorAttention")) { if (!StringUtil.isEmpty(LiveAudienceActivity.is_fans)) { LiveAudienceActivity.is_fans = "-2"; - LiveRoomViewHolder.setFansNum( LiveAudienceActivity.fansNum - 1); + LiveRoomViewHolder.setFansNum(LiveAudienceActivity.fansNum - 1); IMLoginManager.get(mContext).upDataUserInfo(); } } diff --git a/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java b/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java index be982713c..689b44020 100644 --- a/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java +++ b/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java @@ -274,12 +274,12 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O if ("2".equals(mBeautySdkType)) { Constants.myIntoIndex = 2; Intent intent = new Intent(mContext, MyWebViewActivity.class); - intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"); + intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0)); CommonAppContext.getTopActivity().startActivity(intent); } else { Constants.myIntoIndex = 2; Intent intent = new Intent(mContext, MyWebViewActivity.class); - intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"); + intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0)); CommonAppContext.getTopActivity().startActivity(intent); } }