From a6798cf35dfe627dcf0677cb4960a83029d57413 Mon Sep 17 00:00:00 2001 From: max Date: Tue, 11 Jun 2024 10:26:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=9C=80=E5=B0=8F=E5=8C=96=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88=E5=8E=BB=E6=8E=89=E5=86=8D=E6=AC=A1=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=B9=E7=94=A8=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E4=BF=A1=E6=81=AF=E9=87=8C=E9=9D=A2=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E5=AD=97=E6=AE=B5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/chwl/app/MainActivity.java | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index 81e39ad5a..2230e1141 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -30,29 +30,22 @@ import com.chwl.app.game.data.GameModel2; import com.chwl.app.game.ui.game.GameActivity; import com.chwl.app.game.ui.game.GameIntent; import com.chwl.app.game.ui.home.GameHomeFragment; -import com.chwl.app.game.ui.home.GameHomeViewModel; import com.chwl.app.star.StarFragment; import com.chwl.app.support.PreloadResourceViewModel; import com.chwl.app.ui.login.LoginPasswordActivity; -import com.chwl.core.bean.game.GameRoomInfo; import com.chwl.core.home.bean.MainTabInfo; import com.chwl.core.settings.SettingsModel; import com.chwl.library.utils.JavaUtil; -import com.chwl.library.utils.StringUtils; -import com.example.lib_utils.StringUtils2; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.netease.nim.uikit.impl.cache.NimUserInfoCache; import com.netease.nimlib.sdk.NIMClient; -import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; -import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.orhanobut.logger.Logger; import com.trello.rxlifecycle3.android.ActivityEvent; import com.chwl.app.application.IReportConstants; @@ -137,7 +130,6 @@ import java.util.concurrent.TimeUnit; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; /** * @author Administrator @@ -592,27 +584,7 @@ public class MainActivity extends BaseMvpActivity private void updateRoomState() { RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; if (roomInfo != null) { - UserModel.get().getUserInfo(roomInfo.getUid()) - .subscribe(userInfo -> { - if (userInfo != null) { - displayAvatarLayout(userInfo.getAvatar(), roomInfo.getTitle(), userInfo.getErbanNo()); - } else { - NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + ""); - if (nimUserInfo == null) { - NimUserInfoCache.getInstance().getUserInfoFromRemote(roomInfo.getUid() + "", new RequestCallbackWrapper() { - @Override - public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) { - if (nimUserInfo != null) { - displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid()); - } - } - }); - } else { - displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid()); - } - } - }); - + displayAvatarLayout(roomInfo.getAvatar(), roomInfo.getTitle(), roomInfo.getUid()); } }