修改热度加成问题
This commit is contained in:
parent
0b7a3cc50e
commit
112bec58df
@ -25,7 +25,7 @@ ext {
|
|||||||
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
|
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
|
||||||
|
|
||||||
// true表示谷歌支付 false
|
// true表示谷歌支付 false
|
||||||
isGooglePlay : false,
|
isGooglePlay : true,
|
||||||
//是否上报异常日志
|
//是否上报异常日志
|
||||||
isUploadLog : false
|
isUploadLog : false
|
||||||
]
|
]
|
||||||
|
@ -679,6 +679,9 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
|
|
||||||
public void setPkStatus(boolean isPk) {
|
public void setPkStatus(boolean isPk) {
|
||||||
this.isPk = isPk;
|
this.isPk = isPk;
|
||||||
|
if (manager != null) {
|
||||||
|
manager.setPkStatus(isPk);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
|
@ -448,7 +448,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
time.setText("PK時間:" + s1);
|
time.setText("PK時間:" + s1);
|
||||||
mHandler.sendEmptyMessageAtTime(WHAT_PK_TIME, getNextSecondTime());
|
mHandler.sendEmptyMessageAtTime(WHAT_PK_TIME, getNextSecondTime());
|
||||||
if (mContext instanceof LiveAudienceActivity) {
|
if (mContext instanceof LiveAudienceActivity) {
|
||||||
((LiveAudienceActivity)mContext).setPkStatus(true);
|
((LiveAudienceActivity) mContext).setPkStatus(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -457,12 +457,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
mHandler.removeCallbacksAndMessages(null);
|
mHandler.removeCallbacksAndMessages(null);
|
||||||
}
|
}
|
||||||
if (mContext instanceof LiveAudienceActivity) {
|
if (mContext instanceof LiveAudienceActivity) {
|
||||||
((LiveAudienceActivity)mContext).setPkStatus(false);
|
((LiveAudienceActivity) mContext).setPkStatus(false);
|
||||||
}
|
}
|
||||||
endDRGif();
|
endDRGif();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void hotAddVisibility(boolean visibility) {
|
||||||
|
ft_hot_add.setVisibility(visibility ? View.GONE : View.VISIBLE);
|
||||||
|
}
|
||||||
|
|
||||||
public void endDRGif() {
|
public void endDRGif() {
|
||||||
if (dr_pk_end_gif.getVisibility() == View.GONE) {
|
if (dr_pk_end_gif.getVisibility() == View.GONE) {
|
||||||
dr_pk_end_gif.setVisibility(View.VISIBLE);
|
dr_pk_end_gif.setVisibility(View.VISIBLE);
|
||||||
|
@ -526,7 +526,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
mLiveRoomViewHolder.pkHandler = true;
|
mLiveRoomViewHolder.pkHandler = true;
|
||||||
mLiveRoomViewHolder.initPkRank(null);
|
mLiveRoomViewHolder.initPkRank(null);
|
||||||
}
|
}
|
||||||
if(mLivePlayViewHolder != null) {
|
if (mLivePlayViewHolder != null) {
|
||||||
mLivePlayViewHolder.setViewUP(3);
|
mLivePlayViewHolder.setViewUP(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -543,7 +543,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
if (mLiveRoomViewHolder != null) {
|
if (mLiveRoomViewHolder != null) {
|
||||||
mLiveRoomViewHolder.initPkRank(null);
|
mLiveRoomViewHolder.initPkRank(null);
|
||||||
}
|
}
|
||||||
if(mLivePlayViewHolder != null) {
|
if (mLivePlayViewHolder != null) {
|
||||||
mLivePlayViewHolder.setViewUP(4);
|
mLivePlayViewHolder.setViewUP(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1278,6 +1278,16 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* pk状态
|
||||||
|
*
|
||||||
|
* @param isPk
|
||||||
|
*/
|
||||||
|
public void setPkStatus(boolean isPk) {
|
||||||
|
if (mLiveRoomViewHolder != null)
|
||||||
|
mLiveRoomViewHolder.hotAddVisibility(isPk);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLinkMicPkClose(int i) {
|
public void onLinkMicPkClose(int i) {
|
||||||
|
|
||||||
|
@ -709,8 +709,8 @@
|
|||||||
android:layout_height="27dp"
|
android:layout_height="27dp"
|
||||||
android:layout_below="@id/live_time"
|
android:layout_below="@id/live_time"
|
||||||
android:layout_marginLeft="12dp"
|
android:layout_marginLeft="12dp"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="-12dp"
|
||||||
android:visibility="gone">
|
android:visibility="visible">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/img_hot_gif"
|
android:id="@+id/img_hot_gif"
|
||||||
|
Loading…
Reference in New Issue
Block a user