|
@@ -60,7 +60,16 @@ public class RongConversationActivity extends RongBaseActivity {
|
|
|
private void setTitle() {
|
|
|
if (!TextUtils.isEmpty(mTargetId) && mConversationType.equals(Conversation.ConversationType.GROUP)) {
|
|
|
Group group = RongUserInfoManager.getInstance().getGroupInfo(mTargetId);
|
|
|
- mTitleBar.setTitle(group == null ? mTargetId : group.getName());
|
|
|
+ String title = mTargetId;
|
|
|
+ if (group != null) {
|
|
|
+ title = group.getName();
|
|
|
+ } else {
|
|
|
+ Bundle extras = getIntent().getExtras();
|
|
|
+ if (extras != null) {
|
|
|
+ title = (String) extras.get(RouteUtils.TITLE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ mTitleBar.setTitle(title);
|
|
|
mTitleBar.getRightImageView().setVisibility(View.VISIBLE);
|
|
|
mTitleBar.getRightImageView().setImageResource(com.cooleshow.base.R.drawable.icon_group_setting);
|
|
|
mTitleBar.getRightImageView().setOnClickListener(new View.OnClickListener() {
|
|
@@ -77,7 +86,16 @@ public class RongConversationActivity extends RongBaseActivity {
|
|
|
});
|
|
|
} else {
|
|
|
UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(mTargetId);
|
|
|
- mTitleBar.setTitle(userInfo == null ? mTargetId : userInfo.getName());
|
|
|
+ String title = mTargetId;
|
|
|
+ if (userInfo != null) {
|
|
|
+ title = userInfo.getName();
|
|
|
+ } else {
|
|
|
+ Bundle extras = getIntent().getExtras();
|
|
|
+ if (extras != null) {
|
|
|
+ title = (String) extras.get(RouteUtils.TITLE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ mTitleBar.setTitle(title);
|
|
|
mTitleBar.getRightImageView().setVisibility(View.GONE);
|
|
|
}
|
|
|
if (mConversationType.equals(Conversation.ConversationType.CUSTOMER_SERVICE)
|