diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java index 3f76cfed8..e51f197e5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java @@ -1,5 +1,9 @@ package com.yizhuan.erban.ui.widget; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; +import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL; + import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; @@ -38,9 +42,6 @@ import com.yizhuan.erban.ui.user.UserInfoActivity; import com.yizhuan.erban.ui.user.adapter.SkillPicsAdapter; import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration; import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.dialog.CommonLoadingDialog; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.SpacingDecoration; import com.yizhuan.erban.utils.RegexUtil; import com.yizhuan.erban.vip.VipHelper; import com.yizhuan.xchat_android_constants.XChatConstants; @@ -59,7 +60,6 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.manager.RoomEvent; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; import com.yizhuan.xchat_android_core.noble.NobleUtil; import com.yizhuan.xchat_android_core.praise.PraiseModel; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; @@ -101,11 +101,6 @@ import io.reactivex.Single; import io.reactivex.SingleObserver; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; - -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL; /** * 替代原来的框架,用来替代UserInfoDialog的 @@ -531,6 +526,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe if (userInfo != null) { ivOfficialView.setVisibility(userInfo.isOfficial() ? View.VISIBLE : View.GONE); ivNewUser.setVisibility(userInfo.isNewUser() ? View.VISIBLE : View.GONE); + ivNewUser.setImageResource(userInfo.isFromSayHelloChannel() ? R.drawable.ic_new_user_hello : R.drawable.ic_new_user); mIvGoodNumber.setVisibility(userInfo.isHasPrettyErbanNo() ? View.VISIBLE : View.GONE); // 这个方法能让图片不失真 @@ -684,8 +680,8 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe private void loadSimpleFamilyInfo(String familyId) { FamilyModel.Instance().loadFamilySimpleInfo( - familyId - ) + familyId + ) .subscribe(new SingleObserver() { @Override public void onSubscribe(Disposable d) {