修复部分问题

rong_im/kit/src/main/java/io/rong/imkit/userinfo/RongUserInfoManager.java

@@ -320,11 +320,7 @@ public class RongUserInfoManager {
     }
 
     public UserInfo getCurrentUserInfo() {
-        if (mCurrentUserInfo != null) {
-            return mCurrentUserInfo;
-        } else {
-            return getUserInfo(RongIMClient.getInstance().getCurrentUserId());
-        }
+        return mCurrentUserInfo;
     }
 
     /**
@@ -403,7 +399,7 @@ public class RongUserInfoManager {
         }
     }
 
-    public UserDataDelegate getUserInfoProvider(){
+    public UserDataDelegate getUserInfoProvider() {
         return mUserDataDelegate;
     }
 

rong_im/kit/src/main/java/io/rong/imkit/utils/GroupUtils.java

@@ -79,12 +79,6 @@ public class GroupUtils {
             GroupUserInfo groupUserInfo = RongUserInfoManager.getInstance().getGroupUserInfo(groupId,targetId);
             if (groupUserInfo != null) {
                 String roleType = getRoleType(groupUserInfo.getExtra());
-                if (TextUtils.isEmpty(roleType)) {
-                    UserDataDelegate userInfoProvider = RongUserInfoManager.getInstance().getUserInfoProvider();
-                    if (userInfoProvider != null) {
-                        userInfoProvider.getGroupUserInfo(targetId, targetId);
-                    }
-                }
                 return roleType;
             }
         }
@@ -93,12 +87,6 @@ public class GroupUtils {
             UserInfo stuUserInfo = RongUserInfoManager.getInstance().getUserInfo(targetId);
             if (stuUserInfo != null) {
                 String roleType = GroupUtils.getRoleType(stuUserInfo.getExtra());
-                if (TextUtils.isEmpty(roleType)) {
-                    UserDataDelegate userInfoProvider = RongUserInfoManager.getInstance().getUserInfoProvider();
-                    if (userInfoProvider != null) {
-                        userInfoProvider.getUserInfo(targetId);
-                    }
-                }
                 return roleType;
             }
         }

rong_im/kit/src/main/java/io/rong/imkit/utils/helper/ChatClickHelper.java

@@ -37,6 +37,11 @@ public class ChatClickHelper {
         if (conversationType == Conversation.ConversationType.GROUP) {
             String roleTypeFromCache = GroupUtils.getRoleTypeFromCache(Conversation.ConversationType.GROUP, targetId, userInfo.getUserId());
             if (TextUtils.isEmpty(roleTypeFromCache)) {
+                //如果身份信息为空,触发一次主动获取
+                UserDataDelegate userInfoProvider = RongUserInfoManager.getInstance().getUserInfoProvider();
+                if (userInfoProvider != null) {
+                    userInfoProvider.getGroupUserInfo(targetId, targetId);
+                }
                 return;
             }
             boolean isTeacher = GroupUtils.isTeacher(roleTypeFromCache);
@@ -59,6 +64,11 @@ public class ChatClickHelper {
             if (stuUserInfo != null) {
                 String roleTypeFromCache = GroupUtils.getRoleTypeFromCache(Conversation.ConversationType.PRIVATE, "", userInfo.getUserId());
                 if (TextUtils.isEmpty(roleTypeFromCache)) {
+                    //如果身份信息为空,触发一次主动获取
+                    UserDataDelegate userInfoProvider = RongUserInfoManager.getInstance().getUserInfoProvider();
+                    if (userInfoProvider != null) {
+                        userInfoProvider.getUserInfo(targetId);
+                    }
                     return;
                 }
                 boolean isTeacher = GroupUtils.isTeacher(roleTypeFromCache);