diff --git a/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt index 75f7006f3..ca50da5ea 100644 --- a/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt @@ -13,8 +13,25 @@ import androidx.fragment.app.viewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.PagerAdapter -import com.netease.nim.uikit.common.util.sys.TimeUtil -import com.trello.rxlifecycle3.android.FragmentEvent +import com.mango.core.auth.AuthModel +import com.mango.core.home.event.VisitorUnreadCountEvent +import com.mango.core.level.UserLevelVo +import com.mango.core.manager.IMNetEaseManager +import com.mango.core.manager.RelationShipEvent +import com.mango.core.noble.NobleUtil +import com.mango.core.pay.PayModel +import com.mango.core.pay.event.GetWalletInfoEvent +import com.mango.core.pay.event.UpdateWalletInfoEvent +import com.mango.core.room.bean.MeCenterInfo +import com.mango.core.room.bean.RoomInfo +import com.mango.core.room.game.GameInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserInfo +import com.mango.core.user.event.LoginUserInfoUpdateEvent +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.StarUtils import com.mango.moshen.R import com.mango.moshen.UIHelper import com.mango.moshen.avroom.activity.AVRoomActivity @@ -33,35 +50,19 @@ import com.mango.moshen.home.helper.BannerHelper import com.mango.moshen.home.helper.OpenRoomHelper import com.mango.moshen.skill.activity.SkillHomeActivity import com.mango.moshen.skill.activity.SkillHomeActivity.Companion.start +import com.mango.moshen.ui.patriarch.PatriarchModeActivity import com.mango.moshen.ui.pay.ChargeActivity import com.mango.moshen.ui.relation.AttentionListActivity import com.mango.moshen.ui.relation.FansListActivity import com.mango.moshen.ui.utils.ImageLoadUtils import com.mango.moshen.ui.utils.load import com.mango.moshen.ui.widget.OnPageSelectedListener +import com.mango.moshen.utils.UserUtils import com.mango.moshen.vip.VipMainActivity import com.mango.moshen.vip.VipMainViewModel -import com.mango.core.auth.AuthModel -import com.mango.core.home.event.VisitorUnreadCountEvent -import com.mango.core.level.UserLevelVo -import com.mango.core.manager.IMNetEaseManager -import com.mango.core.manager.RelationShipEvent -import com.mango.core.pay.PayModel -import com.mango.core.pay.event.GetWalletInfoEvent -import com.mango.core.pay.event.UpdateWalletInfoEvent -import com.mango.core.room.bean.MeCenterInfo -import com.mango.core.room.bean.RoomInfo -import com.mango.core.room.game.GameInfo -import com.mango.core.statistic.StatisticManager -import com.mango.core.statistic.protocol.StatisticsProtocol -import com.mango.core.user.UserModel -import com.mango.core.user.bean.UserInfo -import com.mango.core.user.event.LoginUserInfoUpdateEvent -import com.mango.core.utils.CurrentTimeUtils -import com.mango.core.utils.StarUtils -import com.mango.moshen.ui.patriarch.PatriarchModeActivity -import com.mango.moshen.utils.UserUtils import com.mango.xchat_android_library.utils.FormatUtils +import com.netease.nim.uikit.common.util.sys.TimeUtil +import com.trello.rxlifecycle3.android.FragmentEvent import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -333,6 +334,13 @@ class MeFragment : BaseFragment(), View.OnClickListener { setWalletInfo() mBinding.flPmMode.isVisible = it.isParentMode mBinding.meItemSkill.isVisible = !it.isParentMode + it.userHeadwear?.effect?.let { effect -> + if (mBinding.ivHeadWear.tag != effect){ + NobleUtil.loadHeadWear(effect, mBinding.ivHeadWear) + mBinding.ivHeadWear.tag = effect + } + + } } } diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 2cf4ca879..013166af2 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -76,13 +76,23 @@ avatarUrl="@{TextUtils.isEmptyText(userInfo.newAvatar)?userInfo.avatar:userInfo.newAvatar}" android:layout_width="68dp" android:layout_height="68dp" - android:layout_marginStart="20dp" + android:layout_marginStart="25dp" android:layout_marginTop="@dimen/dp_10" android:onClick="@{click}" android:src="@drawable/default_avatar" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintStart_toEndOf="@id/iv_head_wear" + app:layout_constraintTop_toTopOf="@id/iv_head_wear"> + +