diff --git a/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt b/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt index 110deb6ae..9ee118b17 100644 --- a/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt @@ -148,6 +148,7 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity() typeArr.filterIndexed { index, micType -> typeData.add(RoomMicDress().apply { @@ -382,7 +390,6 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity> - } diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt index bc8758a8f..9b3b35659 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt @@ -18,6 +18,7 @@ import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.chwl.app.utils.HomeUIManager import com.chwl.core.DemoCache +import com.chwl.core.auth.AuthModel import com.netease.nim.uikit.impl.cache.NimUserInfoCache import com.netease.nimlib.sdk.RequestCallbackWrapper import com.netease.nimlib.sdk.uinfo.model.NimUserInfo @@ -48,7 +49,9 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic //自动登录 // AuthModel.get().autoLogin() -// .doOnError { throwable: Throwable? -> } +// .doOnError { throwable: Throwable? -> +// +// } // .subscribe() // NimUserInfoCache.getInstance().getUserInfoFromRemote( diff --git a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java index ba3942799..f3a4ca862 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java @@ -1097,12 +1097,13 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe dialog.setMActionCallBack(new BaseDialogFragment.Action() { @Override public void onAction(int type, @Nullable Object data) { - dismiss(); +// dismiss(); } }); dialog.setTargetUser(userInfo); dialog.setHomePartyModel(homePartyModel); dialog.show(context); + dismiss(); }); } diff --git a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml index 237235582..a6e1653c1 100644 --- a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml +++ b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml @@ -26,7 +26,7 @@ - - + @@ -153,7 +153,7 @@ android:textColor="#7b7b7d" android:textSize="13sp" tools:ignore="SpUsage" - tools:text="@string/layout_nim_recent_contact_list_item_new_03" /> + tools:text="123" /> diff --git a/core/src/main/java/com/chwl/core/auth/AuthModel.java b/core/src/main/java/com/chwl/core/auth/AuthModel.java index 4bf6cdb0c..f27e9689d 100644 --- a/core/src/main/java/com/chwl/core/auth/AuthModel.java +++ b/core/src/main/java/com/chwl/core/auth/AuthModel.java @@ -4,29 +4,8 @@ import android.app.Activity; import android.text.TextUtils; import android.util.Log; - import androidx.annotation.NonNull; -import com.chwl.library.utils.constant.PackageNameConstants; -import com.example.module_base.support.google.IGoogleService; -import com.example.module_base.support.login.ILoginService; -import com.example.module_base.support.login.LoginSDKException; -import com.example.module_base.support.login.PlatformInfo; -import com.netease.nim.uikit.api.NimUIKit; -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.DataCacheManager; -import com.netease.nimlib.sdk.NIMClient; -import com.netease.nimlib.sdk.Observer; -import com.netease.nimlib.sdk.RequestCallback; -import com.netease.nimlib.sdk.RequestCallbackWrapper; -import com.netease.nimlib.sdk.StatusCode; -import com.netease.nimlib.sdk.auth.AuthService; -import com.netease.nimlib.sdk.auth.AuthServiceObserver; -import com.netease.nimlib.sdk.auth.LoginInfo; -import com.netease.nimlib.sdk.mixpush.MixPushService; -import com.netease.nimlib.sdk.msg.MsgService; -import com.orhanobut.logger.Logger; import com.chwl.core.DemoCache; import com.chwl.core.R; import com.chwl.core.auth.entity.AccountInfo; @@ -53,6 +32,7 @@ import com.chwl.core.utils.CheckUtils; import com.chwl.core.utils.LogUtils; import com.chwl.core.utils.OldHttpErrorHandleUtil; import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.common.util.OtherExtKt; import com.chwl.library.net.rxnet.RxNet; import com.chwl.library.utils.DeviceUtils; import com.chwl.library.utils.ResUtil; @@ -60,7 +40,27 @@ import com.chwl.library.utils.SingleToastUtil; import com.chwl.library.utils.VersionUtil; import com.chwl.library.utils.codec.DESUtils; import com.chwl.library.utils.config.BasicConfig; +import com.chwl.library.utils.constant.PackageNameConstants; import com.chwl.library.utils.json.JsonUtils; +import com.example.module_base.support.google.IGoogleService; +import com.example.module_base.support.login.ILoginService; +import com.example.module_base.support.login.LoginSDKException; +import com.example.module_base.support.login.PlatformInfo; +import com.netease.nim.uikit.api.NimUIKit; +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.DataCacheManager; +import com.netease.nimlib.sdk.NIMClient; +import com.netease.nimlib.sdk.Observer; +import com.netease.nimlib.sdk.RequestCallback; +import com.netease.nimlib.sdk.RequestCallbackWrapper; +import com.netease.nimlib.sdk.StatusCode; +import com.netease.nimlib.sdk.auth.AuthService; +import com.netease.nimlib.sdk.auth.AuthServiceObserver; +import com.netease.nimlib.sdk.auth.LoginInfo; +import com.netease.nimlib.sdk.mixpush.MixPushService; +import com.netease.nimlib.sdk.msg.MsgService; +import com.orhanobut.logger.Logger; import org.greenrobot.eventbus.EventBus; @@ -806,6 +806,7 @@ public class AuthModel extends BaseModel implements IAuthModel { @Override public void onSuccess(LoginInfo loginInfo) { if (loginInfo == null) { + OtherExtKt.doLog("网易云信 登录 -> 失败 code = 登录信息为空"); onException(new Throwable(ResUtil.getString(R.string.xchat_android_core_auth_authmodel_031))); return; } @@ -827,16 +828,19 @@ public class AuthModel extends BaseModel implements IAuthModel { Log.i("IMLogin", ResUtil.getString(R.string.xchat_android_core_auth_authmodel_032)); emitter.onSuccess(ResUtil.getString(R.string.xchat_android_core_auth_authmodel_033)); + OtherExtKt.doLog("网易云信 登录 -> 成功"); } @Override public void onFailed(int code) { + OtherExtKt.doLog("网易云信 登录 -> 失败 code = "+code); LogUtil.e(TAG, ResUtil.getString(R.string.xchat_android_core_auth_authmodel_034) + code); emitter.onError(new Throwable(ResUtil.getString(R.string.xchat_android_core_auth_authmodel_035) + code)); } @Override public void onException(Throwable exception) { + OtherExtKt.doLog("网易云信 登录 -> 错误 msg = "+exception.getMessage()); //如果云信登录出现异常，将info打印到埋点 String infoJson = JsonUtils.toJson(info); String error = ResUtil.getString(R.string.xchat_android_core_auth_authmodel_036) + exception.toString() diff --git a/core/src/main/java/com/chwl/core/gift/bean/RoomLevelInfo.java b/core/src/main/java/com/chwl/core/gift/bean/RoomLevelInfo.java index 099020871..cb7663804 100644 --- a/core/src/main/java/com/chwl/core/gift/bean/RoomLevelInfo.java +++ b/core/src/main/java/com/chwl/core/gift/bean/RoomLevelInfo.java @@ -23,5 +23,7 @@ public class RoomLevelInfo { public int managerLimitNum; //管理员上限 public int currentManagerNum; //当前管理员数量 + public boolean hasUnique = false; //是否能切换 + } diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/HeadImageView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/HeadImageView.java index aeb9f4749..6232c641b 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/HeadImageView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/HeadImageView.java @@ -1,10 +1,8 @@ package com.netease.nim.uikit.common.ui.imageview; -import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; -import android.widget.ImageView; import androidx.annotation.Nullable; @@ -22,7 +20,6 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.robot.model.RobotAttachment; import com.netease.nimlib.sdk.team.model.Team; -import com.netease.nimlib.sdk.uinfo.model.UserInfo; /** * Created by huangjun on 2015/11/13. @@ -128,7 +125,7 @@ public class HeadImageView extends androidx.appcompat.widget.AppCompatImageView }) .into(this); } else { - Glide.with(getContext().getApplicationContext()).asBitmap() + Glide.with(getContext().getApplicationContext()) .load(thumbUrl) .apply(requestOptions) .into(this);