11111

main/src/main/AndroidManifest.xml

@@ -133,6 +133,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/noAnimationStyle"
             android:windowSoftInputMode="stateHidden|adjustResize" />
+
     </application>
 
 </manifest>

main/src/main/java/com/yunbao/main/activity/LoginInvalidActivity.java

@@ -8,6 +8,7 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.event.LoginInvalidEvent;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.main.R;
 
@@ -37,11 +38,7 @@ public class LoginInvalidActivity extends AbsActivity implements View.OnClickLis
     public void onClick(View v) {
         EventBus.getDefault().post(new LoginInvalidEvent());
         CommonAppConfig.getInstance().clearLoginInfo();
-        //退出极光
-//        ImMessageUtil.getInstance().logoutImClient();
-//        ImPushUtil.getInstance().logout();
-        //友盟统计登出
-//        MobclickAgent.onProfileSignOff();
+        IMLoginManager.get(this).logout();
         LoginActivity.forward();
         finish();
     }

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -52,6 +52,7 @@ import com.yunbao.common.event.UpdateTablePointMe;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.CommonCallback;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.GifCacheUtil;
@@ -340,7 +341,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         initTXIM();
         mViewPager.setCurrentItem(0);
         mTabButtonGroup.setCurPosition(0);
-        isInstructor();
 
     }
 
@@ -382,6 +382,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             @Override
             public void onKickedOffline() {
                 super.onKickedOffline();
+                IMLoginManager.get(mContext).logout();
                 CommonAppConfig.getInstance().clearLoginInfo();
                 LoginActivity.forward();
 

main/src/main/java/com/yunbao/main/activity/SettingActivity.java

@@ -18,6 +18,7 @@ import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.GlideCatchUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -127,14 +128,8 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
      * 退出登录
      */
     private void logout() {
+        IMLoginManager.get(this).logout();
         CommonAppConfig.getInstance().clearLoginInfo();
-        //退出极光
-//        ImMessageUtil.getInstance().logoutImClient();
-//        ImPushUtil.getInstance().logout();
-        //友盟统计登出
-//        MobclickAgent.onProfileSignOff();
-
-//        SettingActivity.this.startActivity(new Intent(SettingActivity.this,EntryActivity.class));
         RCRTCEngine.getInstance().unInit();
         RongIMClient.getInstance().logout();
         Intent intent = new Intent(SettingActivity.this, EntryActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java

@@ -5,12 +5,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.blankj.utilcode.util.GsonUtils;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.manager.InstructorRemarkManager;
 import com.yunbao.live.activity.PDLIiveChatActivity;
 import com.yunbao.live.activity.PDLiveConversationActivity;
 import com.yunbao.live.bean.SearchUserBean;
@@ -76,6 +78,7 @@ public class ConversationIMListManager {
         intent.putExtras(extras);
         mContext.startActivity(intent);
     }
+
     /**
      * 跳转消息列表
      *
@@ -87,12 +90,14 @@ public class ConversationIMListManager {
         intent.putExtras(extras);
         mContext.startActivity(intent);
     }
+
     /**
      * 跳转会话页面
-     * @param context 上下文
+     *
+     * @param context  上下文
      * @param targetId 用户id
      */
-    public void jumpConversation(Activity context,String targetId) {
+    public void jumpConversation(Activity context, String targetId) {
 
         Intent intent = new Intent(context, PDLiveConversationActivity.class);
         intent.putExtra(RouteUtils.TARGET_ID, targetId);
@@ -111,7 +116,14 @@ public class ConversationIMListManager {
                     if (code == 0 && info.length > 0) {
                         JSONObject obj = JSON.parseObject(info[0]);
                         SearchUserBean userBean = JSON.toJavaObject(obj, SearchUserBean.class);
-                        UserInfo userInfo = new UserInfo(userId, userBean.getUserNiceName(), Uri.parse(userBean.getAvatar()));
+                        String userNiceName = "";
+                        String remark = InstructorRemarkManager.get(mContext).getInstructorRemark().get(userId);
+                        if (!TextUtils.isEmpty(remark)) {
+                            userNiceName = userBean.getUserNiceName() + "(" + remark + ")";
+                        } else {
+                            userNiceName = userBean.getUserNiceName();
+                        }
+                        UserInfo userInfo = new UserInfo(userId, userNiceName, Uri.parse(userBean.getAvatar()));
                         //使用空白字段存储自己服务器用户的所有的信息
                         userInfo.setExtra(GsonUtils.toJson(userBean));
                         RongUserInfoManager.getInstance().refreshUserInfoCache(userInfo);