Commit ad5c83b8 by mReturn

fix bug

parent cfe35a11
......@@ -47,14 +47,14 @@ public class UserInfo {
}
private int liveStatus; //1.开启主播权限
private int ianmaiStatus; //1.开启连麦权限
private int LianmaiStatus; //1.开启连麦权限
public int getIanmaiStatus() {
return ianmaiStatus;
public int getLianmaiStatus() {
return LianmaiStatus;
}
public void setIanmaiStatus(int ianmaiStatus) {
this.ianmaiStatus = ianmaiStatus;
public void setLianmaiStatus(int lianmaiStatus) {
this.LianmaiStatus = lianmaiStatus;
}
public int getLiveStatus() {
......
......@@ -76,7 +76,7 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
.subscribe(mPresenter.baseObserver(info->{
if (mUserInfo != null){
mUserInfo.setLiveStatus(info.getLiveStatus());
mUserInfo.setLiveStatus(info.getLianmaiStatus());
mUserInfo.setLianmaiStatus(info.getLianmaiStatus());
UserManager.getInstance().saveUser(mUserInfo);
}
......
......@@ -144,7 +144,7 @@ public class LiveListFragment extends BaseFragment<SImplePresenter, FragmentLive
private void startLivePlay(final TCVideoInfo item) {
initUser();
if (mUserInfo.getLiveStatus() == 1){
if (mUserInfo.getLianmaiStatus() == 1){
TCGlobalConfig.ENABLE_LINKMIC = true;
}else{
TCGlobalConfig.ENABLE_LINKMIC = false;
......
......@@ -228,8 +228,9 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
}
});
tvLikeCount = findViewById(R.id.tv_like_count);
tvLikeCount.setText(mHeartCount+"");
// tvLikeCount = findViewById(R.id.tv_like_count);
tvLikeCount = (TextView) findViewById(R.id.anchor_tv_like_count);
tvLikeCount.setText("点赞:"+mHeartCount+"");
mControlLayer = (RelativeLayout) findViewById(R.id.anchor_rl_controllLayer);
mTCSwipeAnimationController = new TCSwipeAnimationController(this);
......@@ -265,7 +266,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
mMemberCount = (TextView) findViewById(R.id.anchor_tv_member_counts);
mCurrentAudienceCount++;
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mMemberCount.setText("观众:"+String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mChatMsgListAdapter = new TCChatMsgListAdapter(this, mListViewMsg, mArrayListChatEntity);
mListViewMsg.setAdapter(mChatMsgListAdapter);
mChatMsgListAdapter2 = new TCChatMsgListAdapter(this, mListViewMsg2, mArrayListChatEntity2,true);
......@@ -411,7 +412,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
if (mAvatarListAdapter.addItem(userInfo)){
if (addedCount != 0){
mCurrentAudienceCount++;
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mMemberCount.setText("观众:"+String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
}
addedCount+=1;
}
......@@ -775,7 +776,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
return;
mCurrentAudienceCount++;
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mMemberCount.setText("观众:"+String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
//左下角显示用户加入消息
TCChatEntity entity = new TCChatEntity();
......@@ -799,7 +800,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
else
Log.d(TAG, "接受多次退出请求,目前人数为负数");
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mMemberCount.setText("观众:"+String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mAvatarListAdapter.removeItem(userInfo.userid);
......@@ -831,7 +832,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
}
mHeartCount++;
tvLikeCount.setText(mHeartCount+"");
tvLikeCount.setText("点赞:"+mHeartCount+"");
entity.setType(TCConstants.MEMBER_ENTER);
notifyMsg2(entity);
......@@ -972,7 +973,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
mLiveRoom.setCustomInfo(MLVBCommonDef.CustomFieldOp.INC, "praise", 1, null);
//向ChatRoom发送点赞消息
mLiveRoom.sendRoomCustomMsg(String.valueOf(TCConstants.IMCMD_PRAISE), "", null);
tvLikeCount.setText(mHeartCount+"");
tvLikeCount.setText("点赞:"+mHeartCount+"");
}
} else if (i == R.id.btn_message_input) {
......
......@@ -177,7 +177,7 @@
android:id="@+id/layout_live_pusher_info"
layout="@layout/layout_live_pusher_info"
android:layout_width="110dp"
android:layout_height="35dp"
android:layout_height="wrap_content"
android:layout_margin="5dp" />
<android.support.v7.widget.RecyclerView
......@@ -316,6 +316,7 @@
/>
<TextView
android:visibility="gone"
android:id="@+id/tv_like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -72,7 +72,6 @@
android:layout_gravity="center"
android:textSize="10sp"
android:text=""
android:visibility="gone"
android:textColor="@color/colorTextWhite"
android:layout_below="@+id/anchor_tv_member_counts"
android:layout_alignLeft="@+id/anchor_tv_broadcasting_time" />
......
......@@ -211,10 +211,11 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
mPresenter.mUrl.set(info.getAccountUrl());
UserInfo userInfo = UserManager.getInstance().getUser();
if (userInfo != null) {
userInfo.setAccountName(info.getRealName());
userInfo.setHeaderImg(info.getAccountUrl());
userInfo.setNickName(info.getNickName());
userInfo.setLiveStatus(info.getLiveStatus());
userInfo.setLiveStatus(info.getLianmaiStatus());
userInfo.setLianmaiStatus(info.getLianmaiStatus());
UserManager.getInstance().saveUser(userInfo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment