Skip to content

android / dayu

Go to a project
Commit ad5c83b8 by mReturn
Options

fix bug

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