diff --git a/config.gradle b/config.gradle index 4aab71a23..f3ad9d81e 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", 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 d52287c96..067ad135d 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -71,11 +71,11 @@ import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.LevelBean; import com.yunbao.common.bean.LinkMicUserBean; import com.yunbao.common.bean.LiveAnchorCallMeModel; -import com.yunbao.common.bean.LiveRoomVoteModel; import com.yunbao.common.bean.LiveAnchorSayModel; import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveGiftBean; import com.yunbao.common.bean.LiveRoomActivityBanner; +import com.yunbao.common.bean.LiveRoomVoteModel; import com.yunbao.common.bean.LiveUserGiftBean; import com.yunbao.common.bean.LiveUserMailBoxModel; import com.yunbao.common.bean.MsgModel; @@ -4394,6 +4394,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis // mLiveChatAdapter.insertItem(bean); if (mTopBannerList.size() == 0) { topBanner1.setVisibility(View.GONE); + topBanner2.setVisibility(View.GONE); } else { topBanner1.update(mTopBannerList); topBanner2.update(mTopBannerList); @@ -4895,7 +4896,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis .setOnBannerClickListener(new OnBannerClickListener() { @Override public void onBannerClick(List datas, int position) { - if (datas.size() > 0) { + if (datas.size() > 0 && mTopBannerList != null && mTopBannerList.size() > 0) { if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) { Dialog loading = DialogUitl.loadingDialog(mContext); loading.show();