diff --git a/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java b/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java index 4c9f024bb..5cd4d58da 100644 --- a/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java +++ b/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java @@ -111,6 +111,15 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen mFooter.setTextSizeTitle(14); } + /** + * 设置头部字体颜色 + * + * @param textColor + */ + public void setHeaderTextColor(int textColor) { + mHeader.setAccentColor(textColor); + } + private HttpCallback mRefreshCallback = new HttpCallback() { private int mDataCount; @@ -295,7 +304,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen * 手动设置没有更多数据 * 因为日榜/周榜接口没有分页参数，会导致一直读取重复数据 */ - public void setNotLoadMore(){ + public void setNotLoadMore() { mSmartRefreshLayout.finishLoadMoreWithNoMoreData(); } diff --git a/common/src/main/res/layout/item_sidebar_lives.xml b/common/src/main/res/layout/item_sidebar_lives.xml index 2d6a3bc40..582388b5e 100644 --- a/common/src/main/res/layout/item_sidebar_lives.xml +++ b/common/src/main/res/layout/item_sidebar_lives.xml @@ -21,10 +21,9 @@ completing mission - ApplyMic Cancel Mic Quit Mic @@ -862,4 +861,12 @@ Limited ride And limited avatar frame More Wonderful live recommended for you + fun games + value added benefits + fan club + activity center + basic tools + effects settings + shield gift effect + shield mount effect diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 475578cd1..2eaaa3ab5 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -880,6 +880,6 @@ 活動中心 基础工具 特效設置 - 屏蔽礼物特效 - 屏蔽坐骑特效 + 屏蔽禮物特效 + 屏蔽坐騎特效 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 21090fdc9..58d878b32 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -257,6 +257,7 @@ public class LiveAudienceActivity extends LiveActivity { } } + //获取直播间状态 private Runnable liveRunnable = new Runnable() { @Override @@ -618,8 +619,6 @@ public class LiveAudienceActivity extends LiveActivity { bundle.putInt("LiveBg", liveBg); sidebarLiveAudience.setArguments(bundle); sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience"); -// manager.openDrawer(); - break; case BOTTOM_COLLECTION: LiveTotalDialog liveTotalDialog = new LiveTotalDialog(); @@ -742,6 +741,10 @@ public class LiveAudienceActivity extends LiveActivity { mLiveGuardInfo : event.getParametersModel().getmLiveGuardInfo(); liveBg = TextUtils.equals(String.valueOf(liveBg), String.valueOf(event.getParametersModel().getLiveBg())) ? liveBg : event.getParametersModel().getLiveBg(); + is_fans = TextUtils.equals(String.valueOf(is_fans), String.valueOf(event.getParametersModel().getIs_fans())) ? + is_fans : event.getParametersModel().getIs_fans(); + fansNum = TextUtils.equals(String.valueOf(fansNum), String.valueOf(event.getParametersModel().getFansNum())) ? + fansNum : event.getParametersModel().getFansNum(); break; case ACTIVITY_CENTER://活动中心 String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky"; diff --git a/live/src/main/java/com/yunbao/live/bean/OpenParametersModel.java b/live/src/main/java/com/yunbao/live/bean/OpenParametersModel.java index c2f2c738b..6bb497239 100644 --- a/live/src/main/java/com/yunbao/live/bean/OpenParametersModel.java +++ b/live/src/main/java/com/yunbao/live/bean/OpenParametersModel.java @@ -16,6 +16,26 @@ public class OpenParametersModel extends BaseModel { private int mLiveTypeVal = 0; private LiveGuardInfo mLiveGuardInfo = null; private int liveBg = 0; + private int fansNum; + private String is_fans; + + public int getFansNum() { + return fansNum; + } + + public OpenParametersModel setFansNum(int fansNum) { + this.fansNum = fansNum; + return this; + } + + public String getIs_fans() { + return is_fans; + } + + public OpenParametersModel setIs_fans(String is_fans) { + this.is_fans = is_fans; + return this; + } public int getLiveBg() { return liveBg; diff --git a/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java b/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java index bd87ea77c..bc0fa38ac 100644 --- a/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java +++ b/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java @@ -1,6 +1,7 @@ package com.yunbao.live.dialog; import android.content.DialogInterface; +import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; import android.view.Display; @@ -94,6 +95,7 @@ public class SidebarLiveAudience extends AbsDialogFragment { } sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList); +// sidebarList.setHeaderTextColor(Color.parseColor("#50ffffff")); GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false); gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { @Override 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 9ea9e868c..5ec552693 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1180,7 +1180,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } Bus.get().post(new LiveAudienceEvent() .setType(LiveAudienceEvent.LiveAudienceType.OPEN_PARAMETERS) - .setParametersModel(new OpenParametersModel().setmLiveGuardInfo(mLiveGuardInfo))); + .setParametersModel(new OpenParametersModel().setmLiveGuardInfo(mLiveGuardInfo) + .setFansNum(fansNum) + .setIs_fans(is_fans))); if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.setGuardNum(guardNum); mLiveRoomViewHolder.setFansNum(fansNum); diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 4025e3d09..9aa526484 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -232,6 +232,7 @@ android:layout_height="30dp" android:layout_marginStart="6dp" android:layout_marginTop="4dp" + android:layout_marginEnd="10dp" android:src="@mipmap/icon_live_close_3" />