From a25ce2034f85d9b2742b0c5f240a36ef5d139633 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 10 Oct 2023 17:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/CommonAppConfig.java | 39 ++++++++++++------- .../common/dialog/SudGameListPopup.java | 2 +- .../fragment/LiveNewWishListFragment.java | 2 +- .../yunbao/common/http/CommonHttpUtil.java | 2 +- .../com/yunbao/common/http/PDLiveApi.java | 3 ++ .../common/http/live/LiveNetManager.java | 4 +- .../yunbao/common/manager/IMLoginManager.java | 3 ++ .../com/yunbao/common/utils/ToastUtil.java | 2 +- .../src/main/res/layout/hint_custom_popup.xml | 18 +++++---- config.gradle | 2 +- .../live/activity/LiveAudienceActivity.java | 19 +++++---- .../live/activity/LiveRyAnchorActivity.java | 8 ++-- .../live/adapter/LiveRoomTypeAdapter.java | 34 ++++++++-------- .../dialog/LiveNewRoomTypeDialogFragment.java | 15 +++---- .../yunbao/live/event/LiveAudienceEvent.java | 11 +++--- .../yunbao/live/socket/SocketRyClient.java | 5 +++ .../live/views/LiveNewReadyRyViewHolder.java | 14 +++---- .../yunbao/live/views/LiveRoomViewHolder.java | 1 + .../live/views/LiveRyAnchorViewHolder.java | 2 +- .../live/views/PortraitLiveManager.java | 6 +++ .../main/res/layout/item_random_pk_info.xml | 10 +++-- live/src/main/res/layout/view_live_room.xml | 1 + .../main/res/layout/view_new_live_ready.xml | 2 +- .../main/views/MainHomeGameViewHolder.java | 2 +- 24 files changed, 122 insertions(+), 85 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/CommonAppConfig.java b/common/src/main/java/com/yunbao/common/CommonAppConfig.java index ee5be1227..465b8606d 100644 --- a/common/src/main/java/com/yunbao/common/CommonAppConfig.java +++ b/common/src/main/java/com/yunbao/common/CommonAppConfig.java @@ -7,6 +7,7 @@ import android.os.Environment; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; + import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.yunbao.common.bean.ConfigBean; @@ -19,6 +20,7 @@ import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.utils.L; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.WordUtil; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -78,8 +80,6 @@ public class CommonAppConfig { public static int alert_end_time = 1; - - private CommonAppConfig() { } @@ -148,6 +148,7 @@ public class CommonAppConfig { } return Constants.DIAMONDS; } + public String getGoldCoinName() { ConfigBean configBean = getConfig(); if (configBean != null) { @@ -183,12 +184,19 @@ public class CommonAppConfig { if (configBean != null) { callback.callback(configBean); } else { - CommonHttpUtil.getConfig(null,callback); + CommonHttpUtil.getConfig(null, callback); } } + private String[][] liveType = null; + + public String[][] getLiveType() { + return liveType; + } + public void setConfig(ConfigBean config) { mConfig = config; + liveType = config.getLiveType(); } /** @@ -385,13 +393,12 @@ public class CommonAppConfig { public String getAppName() { if (TextUtils.isEmpty(mAppName)) { int res = CommonAppContext.sInstance.getResources().getIdentifier("app_name", "string", "myname.pdlive.shayu"); - mAppName =WordUtil.getString(res); + mAppName = WordUtil.getString(res); } return mAppName; } - /** * 获取App图标的资源id */ @@ -447,9 +454,10 @@ public class CommonAppConfig { } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } - Log.i("tag","url:"+res); + Log.i("tag", "url:" + res); return res; } + private static boolean getMetaDataBoolean(String key) { boolean res = false; try { @@ -670,40 +678,45 @@ public class CommonAppConfig { public void setBeautySdkType(String sproutType) { SpUtil.getInstance().setStringValue(SpUtil.BEAUTY_SDK_TYPE, sproutType); } + public String getBeautySdkType() { - return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_SDK_TYPE); + return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_SDK_TYPE); } //设置是否显示转盘功能 public void setTurnTableEnable(String enable) { SpUtil.getInstance().setStringValue(SpUtil.TURNTABLE_ENABLE, enable); } + public String getTurnTableEnable() { - return SpUtil.getInstance().getStringValue(SpUtil.TURNTABLE_ENABLE); + return SpUtil.getInstance().getStringValue(SpUtil.TURNTABLE_ENABLE); } //设置360美颜贴纸下载地址 public void setBeauty360TieZhiUrl(String tieZhiUrl) { SpUtil.getInstance().setStringValue(SpUtil.BEAUTY_360_TIEZHI_URL, tieZhiUrl); } + public String getBeauty360TieZhiUrl() { - return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_360_TIEZHI_URL); + return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_360_TIEZHI_URL); } //360贴纸已经下载过 public void setBeauty360TieZhiExist(boolean isExist) { SpUtil.getInstance().setBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST, isExist); } + public boolean getBeauty360TieZhiExist() { - return SpUtil.getInstance().getBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST); + return SpUtil.getInstance().getBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST); } //设置主播pk时间 - public void setAnchorPkTime(String pkTime){ + public void setAnchorPkTime(String pkTime) { SpUtil.getInstance().setStringValue(SpUtil.ANCHOR_PK_TIME, pkTime); } - public String getAnchorPkTime(){ - return SpUtil.getInstance().getStringValue(SpUtil.ANCHOR_PK_TIME); + + public String getAnchorPkTime() { + return SpUtil.getInstance().getStringValue(SpUtil.ANCHOR_PK_TIME); } } diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java index d1c98c264..0d6b68779 100644 --- a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java @@ -157,7 +157,7 @@ public class SudGameListPopup extends BottomPopupView { @Override public void onViewClicks() { LiveNetManager.get(getContext()) - .randomRoom(new com.yunbao.common.http.base.HttpCallback() { + .randomRoom(id, mSill, roomHolderType,new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(CreateSudRoomModel data) { if (data != null) { diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java index 590a95912..dd101d26d 100644 --- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java +++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java @@ -83,7 +83,7 @@ public class LiveNewWishListFragment extends BaseFragment { @Override public void onError(String error) { - ToastUtil.show(R.string.net_error); + ToastUtil.show(getActivity().getString(R.string.net_error)); } }); } diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java index 66ac11f22..f573f278c 100644 --- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java +++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java @@ -163,7 +163,7 @@ public class CommonHttpUtil { } else { locale = IMLoginManager.get(context).getLocaleLanguage(); } - if (locale.getLanguage().equals("zh")) { + if (WordUtil.isNewZh()) { lang = "chinese"; } else { diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index 94a9d834b..3becaf66b 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -1027,6 +1027,9 @@ public interface PDLiveApi { @GET("/api/public/?service=Sudgameserver.randomRoom") Observable> randomRoom( + @Query("sud_game_id") String sudGameId, + @Query("threshold") String threshold, + @Query("room_holder_type") String roomHolderType ); @GET("/api/public/?service=Sudgameserver.checkRoomStatus") diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index 83cff19e3..37c58fd8e 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -2270,9 +2270,9 @@ public class LiveNetManager { }).isDisposed(); } - public void randomRoom(HttpCallback callback) { + public void randomRoom(String sudGameId, String threshold, String roomHolderType, HttpCallback callback) { API.get().pdLiveApi(mContext) - .randomRoom() + .randomRoom(sudGameId, threshold, roomHolderType) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Consumer>() { diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index 405ee28e2..a1918f71a 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import com.lzf.easyfloat.EasyFloat; import com.umeng.analytics.MobclickAgent; @@ -57,6 +58,8 @@ public class IMLoginManager extends BaseCacheManager { put(KEY_GAME, sudGameJson); } + + public String getSudGame() { return getString(KEY_GAME); } diff --git a/common/src/main/java/com/yunbao/common/utils/ToastUtil.java b/common/src/main/java/com/yunbao/common/utils/ToastUtil.java index 35ada5438..bf4431ce1 100644 --- a/common/src/main/java/com/yunbao/common/utils/ToastUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/ToastUtil.java @@ -43,7 +43,7 @@ public class ToastUtil { public static void show(int res) { - show(WordUtil.getNewString(res)); + show(CommonAppContext.sInstance.getString(res)); } /** diff --git a/common/src/main/res/layout/hint_custom_popup.xml b/common/src/main/res/layout/hint_custom_popup.xml index fae545ee5..e3d018354 100644 --- a/common/src/main/res/layout/hint_custom_popup.xml +++ b/common/src/main/res/layout/hint_custom_popup.xml @@ -35,16 +35,18 @@ + android:layout_height="wrap_content" + android:gravity="center_vertical"> @@ -56,9 +58,9 @@ (); - ConfigBean configBean = CommonAppConfig.getInstance().getConfig(); - Log.i("tag",configBean.toString()); - if (configBean != null) { - String[][] liveType = configBean.getLiveType(); - if (liveType != null) { - Log.i("tag", Arrays.toString(liveType)); - List list = LiveRoomTypeBean.getLiveTypeList(liveType); - mList.addAll(list); - for (LiveRoomTypeBean bean : mList) { - if (bean.getId() == checkedId) { - bean.setChecked(true); - break; - } + + String[][] liveType = CommonAppConfig.getInstance().getLiveType(); + if (liveType != null) { + Log.i("tag", Arrays.toString(liveType)); + List list = LiveRoomTypeBean.getLiveTypeList(liveType); + mList.addAll(list); + for (LiveRoomTypeBean bean : mList) { + if (bean.getId() == checkedId) { + bean.setChecked(true); + break; } } + } mInflater = LayoutInflater.from(context); mOnClickListener = new View.OnClickListener() { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java index db5fe016a..6491dfef7 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java @@ -12,14 +12,12 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; -import com.yunbao.common.bean.ConfigBean; +import com.yunbao.common.bean.LiveRoomTypeBean; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.DpUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; -import com.yunbao.common.bean.LiveRoomTypeBean; import java.util.ArrayList; import java.util.Arrays; @@ -81,15 +79,15 @@ public class LiveNewRoomTypeDialogFragment extends AbsDialogFragment implements pwd.setOnClickListener(view -> select(false)); submit.setOnClickListener(view -> { if (isSelectPublic) { - LiveRoomTypeBean bean = new LiveRoomTypeBean(0,mContext.getString(R.string.live_room_public)); - if(mCallback!=null) { + LiveRoomTypeBean bean = new LiveRoomTypeBean(0, mContext.getString(R.string.live_room_public)); + if (mCallback != null) { mCallback.callback(bean); } } else { for (LiveRoomTypeBean bean : mList) { if (bean.getId() == Constants.LIVE_TYPE_PWD) { bean.setChecked(true); - if(mCallback!=null) { + if (mCallback != null) { mCallback.callback(bean); } break; @@ -103,9 +101,8 @@ public class LiveNewRoomTypeDialogFragment extends AbsDialogFragment implements private void initData() { mList = new ArrayList<>(); - ConfigBean configBean = CommonAppConfig.getInstance().getConfig(); - Log.i("tag", configBean.toString()); - String[][] liveType = configBean.getLiveType(); + + String[][] liveType = CommonAppConfig.getInstance().getLiveType(); if (liveType != null) { Log.i("tag", Arrays.toString(liveType)); List list = LiveRoomTypeBean.getLiveTypeList(liveType); diff --git a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java index bbe5da6a8..653cf3dd2 100644 --- a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java +++ b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java @@ -54,8 +54,8 @@ public class LiveAudienceEvent extends BaseModel { private String mWishGiftId; private boolean isContactGift; private boolean isPk; - public String mStream; - public String mLiveUid,giftId; + public String mStream; + public String mLiveUid, giftId; public String getGiftId() { return giftId; @@ -463,9 +463,10 @@ public class LiveAudienceEvent extends BaseModel { RED_PACKET(69, "RedPacket"), RED_PACKET_SUPER_JACKPOT(70, "超级红包"), INPUT_DIALOG(71, "输入框"), - IS_ATTENTION(72,"是否关注主播"), - GIFT_WALL(73,"礼物墙"), - UPDATE_FANS_TASK_STATUS(74,"更新粉丝任务状态"); + IS_ATTENTION(72, "是否关注主播"), + GIFT_WALL(73, "礼物墙"), + UPDATE_FANS_TASK_STATUS(74, "更新粉丝任务状态"), + SUD_GAME_CREATE_ROOM(75, "主播创建sud游戏"); private int type; private String name; diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 5adf63ddc..af7389bb1 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -741,6 +741,11 @@ public class SocketRyClient { case SOCKET_LIVE_MSG_TO_USER: sendToUserMsg(map); break; + case "SudGameCreateRoom": + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.SUD_GAME_CREATE_ROOM) + .setAvatar(map.getString("room_name"))); + break; } } diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java index 6275453cf..eae351171 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java @@ -35,6 +35,8 @@ import com.yunbao.common.bean.UserBean; import com.yunbao.common.event.LivePushRyEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.http.LiveHttpConsts; +import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.ImageResultCallback; import com.yunbao.common.interfaces.OnItemClickListener; @@ -64,8 +66,6 @@ import com.yunbao.live.dialog.LiveNewRoomClassDialogFragment; import com.yunbao.live.dialog.LiveNewRoomTypeDialogFragment; import com.yunbao.live.dialog.LiveTimeDialogFragment; import com.yunbao.live.event.LiveAudienceEvent; -import com.yunbao.common.http.LiveHttpConsts; -import com.yunbao.common.http.LiveHttpUtil; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -583,7 +583,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl url.append("&uid=") .append(model.getId()) .append("&token=") - .append(model.getToken()) .append("&isZh=") + .append(model.getToken()).append("&isZh=") .append(WordUtil.isNewZh() ? "1" : 0); RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false); } else if (i == R.id.btn_live_anchor_say) { @@ -762,7 +762,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl /** * 选择直播类型 */ - private LiveRoomTypeBean liveRoomTypeBean = new LiveRoomTypeBean(0,mContext.getString(R.string.live_room_public)); + private LiveRoomTypeBean liveRoomTypeBean = new LiveRoomTypeBean(0, mContext.getString(R.string.live_room_public)); private void chooseLiveType() { Bundle bundle = new Bundle(); @@ -809,14 +809,14 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl * 密码房间 */ private void onLiveTypePwd(final LiveRoomTypeBean bean) { - DialogUitl.showSimpleInputDialog(mContext,mContext.getString(R.string.live_set_pwd), DialogUitl.INPUT_TYPE_NUMBER_PASSWORD, 8, new DialogUitl.SimpleCallback() { + DialogUitl.showSimpleInputDialog(mContext, mContext.getString(R.string.live_set_pwd), DialogUitl.INPUT_TYPE_NUMBER_PASSWORD, 8, new DialogUitl.SimpleCallback() { @Override public void onConfirmClick(Dialog dialog, String content) { if (TextUtils.isEmpty(content)) { ToastUtil.show(R.string.live_set_pwd_empty); } else { mLiveType = bean.getId(); - mLiveTypeTextView.setText(bean.getName()); + mLiveTypeTextView.setText(WordUtil.isNewZh() ? "密碼房" : "password room"); if (StringUtil.isInt(content)) { mLiveTypeVal = Integer.parseInt(content); } @@ -831,7 +831,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl * 付费房间 */ private void onLiveTypePay(final LiveRoomTypeBean bean) { - DialogUitl.showSimpleInputDialog(mContext,mContext.getString(R.string.live_set_fee), DialogUitl.INPUT_TYPE_NUMBER, 8, new DialogUitl.SimpleCallback() { + DialogUitl.showSimpleInputDialog(mContext, mContext.getString(R.string.live_set_fee), DialogUitl.INPUT_TYPE_NUMBER, 8, new DialogUitl.SimpleCallback() { @Override public void onConfirmClick(Dialog dialog, String content) { if (TextUtils.isEmpty(content)) { 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 f8762f151..1cc79f09f 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -650,6 +650,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis 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)); + sud_text_name.setVisibility(View.VISIBLE); ViewClicksAntiShake.clicksAntiShake(sud_text_name, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { diff --git a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java index 4aef82537..87f4f3675 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java @@ -168,7 +168,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { if (PKing == false) { ((LiveRyAnchorActivity) mContext).openLinkMicAnchorWindow(true); } else { - ToastUtil.show("您已在PK中"); + ToastUtil.show(WordUtil.isNewZh()?"您已在PK中":"You are already in the PK"); } } }); 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 d1c073757..f9f93bc68 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1956,6 +1956,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } } + public void setSudName(String sudName) { + if (mLiveRoomViewHolder != null) { + mLiveRoomViewHolder.setSudName(sudName); + } + } + /** * 全服喇叭 * diff --git a/live/src/main/res/layout/item_random_pk_info.xml b/live/src/main/res/layout/item_random_pk_info.xml index a823df8a3..f27c1678d 100644 --- a/live/src/main/res/layout/item_random_pk_info.xml +++ b/live/src/main/res/layout/item_random_pk_info.xml @@ -86,6 +86,7 @@ android:textSize="14sp" /> + + android:textSize="14sp" /> diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 6adc151cb..661e5df6c 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -2453,6 +2453,7 @@ android:id="@+id/sud_text_name" android:layout_width="match_parent" android:layout_height="wrap_content" + android:visibility="gone" android:layout_alignParentBottom="true" android:layout_marginStart="21dp" android:layout_marginEnd="21dp" 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 d9fc52816..ab804a539 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,7 @@ () { + .randomRoom(id, mSill, roomHolderType,new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(CreateSudRoomModel data) { if (data != null) {