|
@@ -4,6 +4,7 @@ import android.content.Context;
|
|
|
import android.graphics.Typeface;
|
|
|
import android.net.Uri;
|
|
|
import android.text.TextUtils;
|
|
|
+import android.util.Log;
|
|
|
import android.view.LayoutInflater;
|
|
|
import android.view.View;
|
|
|
import android.widget.TextView;
|
|
@@ -54,7 +55,6 @@ import io.rong.imlib.model.UserInfo;
|
|
|
public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBinding, MessagePresenter> implements MessageFragmentContract.MessageFragmentView, View.OnClickListener {
|
|
|
public static final String[] titles = new String[]{"聊天", "联系人"};
|
|
|
private ArrayList<Fragment> fragments = new ArrayList<>();
|
|
|
- String localUserid = "";
|
|
|
|
|
|
@Override
|
|
|
protected void initView(View rootView) {
|
|
@@ -65,7 +65,6 @@ public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBindin
|
|
|
mViewBinding.imCreateGroup.setVisibility(View.VISIBLE);
|
|
|
mViewBinding.imCreateGroup.setOnClickListener(this);
|
|
|
}
|
|
|
- localUserid = UserHelper.getImUserId();
|
|
|
TabLayoutMediator tabLayoutMediator = new TabLayoutMediator(mViewBinding.tabLayout, mViewBinding.viewPager, new TabLayoutMediator.TabConfigurationStrategy() {
|
|
|
@Override
|
|
|
public void onConfigureTab(@NonNull TabLayout.Tab tab, int position) {
|
|
@@ -119,7 +118,8 @@ public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBindin
|
|
|
RongIM.setUserInfoProvider(new UserDataProvider.UserInfoProvider() {
|
|
|
@Override
|
|
|
public UserInfo getUserInfo(String userId) {
|
|
|
- if (!TextUtils.isEmpty(localUserid) && localUserid.equals(userId)) {
|
|
|
+ String imUserId = UserHelper.getImUserId();
|
|
|
+ if (!TextUtils.isEmpty(imUserId) && imUserId.equals(userId)) {
|
|
|
return buildCurrentUserInfo(userId);
|
|
|
} else {
|
|
|
if (presenter != null) {
|
|
@@ -167,16 +167,14 @@ public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBindin
|
|
|
presenter.queryGroupDetail(getContext(), conversation.mCore.getTargetId());
|
|
|
} else {
|
|
|
String userId = conversation.mCore.getTargetId();
|
|
|
- if (localUserid.equals(userId)) {
|
|
|
- } else {
|
|
|
- presenter.queryFriendDetail(getContext(), userId);
|
|
|
- }
|
|
|
+ presenter.queryFriendDetail(getContext(), userId);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//此处修复一个历史消息里携带了extra并且extra不对的问题
|
|
|
- if (!TextUtils.isEmpty(localUserid)) {
|
|
|
- UserInfo userInfo = buildCurrentUserInfo(localUserid);
|
|
|
+ String imUserId = UserHelper.getImUserId();
|
|
|
+ if (!TextUtils.isEmpty(imUserId)) {
|
|
|
+ UserInfo userInfo = buildCurrentUserInfo(imUserId);
|
|
|
RongUserInfoManager.getInstance().refreshUserInfoCache(userInfo);
|
|
|
}
|
|
|
return false;
|
|
@@ -252,6 +250,7 @@ public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBindin
|
|
|
private UserInfo buildCurrentUserInfo(String userId) {
|
|
|
Uri avatarUri = Uri.parse(UserHelper.getUserAvatar());
|
|
|
UserInfo userInfo = new UserInfo(userId, UserHelper.getUserName(), avatarUri);
|
|
|
+ Log.i("pq", "build owner extra" + GroupUtils.getCurrentUserInfoRoleTypeExtra());
|
|
|
userInfo.setExtra(GroupUtils.getCurrentUserInfoRoleTypeExtra());
|
|
|
return userInfo;
|
|
|
}
|