moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]标签功能开发

Browse Source
This commit is contained in:
wushaocheng
2023-02-16 21:07:06 +08:00
parent 77bd3cc4fe
commit a7487ea785
78 changed files with 748 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/AndroidManifest.xml
View File

@@ -262,15 +262,15 @@
android:label="@string/main_androidmanifest_013"
android:screenOrientation="portrait" />
<activity
android:name=".ui.user.UserInfoModifyActivity"
android:name=".ui.user.activity.UserInfoModifyActivity"
android:label="@string/main_androidmanifest_014"
android:screenOrientation="portrait" />
<activity
android:name=".ui.user.UserModifyPhotosActivity"
android:name=".ui.user.activity.UserModifyPhotosActivity"
android:label="@string/main_androidmanifest_015"
android:screenOrientation="portrait" />
<activity
android:name=".ui.user.UserInfoActivity"
android:name=".ui.user.activity.UserInfoActivity"
android:label="@string/main_androidmanifest_016"
android:screenOrientation="portrait" />
<activity
@@ -311,10 +311,10 @@
android:name=".ui.withdraw.BinderAlipayActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.user.AboutActivity"
android:name=".ui.user.activity.AboutActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.user.ShowPhotoActivity"
android:name=".ui.user.activity.ShowPhotoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".bills.activities.TotalBillsActivity"
@@ -391,7 +391,7 @@
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".ui.user.UserGiftActivity"
android:name=".ui.user.activity.UserGiftActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
@@ -963,6 +963,11 @@
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.user.activity.EditUserTagActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
<meta-data
android:name="notch.config"

9
app/src/main/java/com/yizhuan/erban/UIHelper.java
View File

@@ -7,18 +7,15 @@ import android.content.Intent;
import android.net.Uri;
import android.provider.Settings;
import androidx.fragment.app.Fragment;
import com.yizhuan.erban.audio.AudioRecordActivity;
import com.yizhuan.erban.audio.MyVoiceActivity;
import com.yizhuan.erban.audio.RecordingVoiceActivity;
import com.yizhuan.erban.audio.SoundSignatureActivity;
import com.yizhuan.erban.ui.login.AddUserInfoActivity;
import com.yizhuan.erban.ui.login.ModifyInfoActivity;
import com.yizhuan.erban.ui.setting.SettingActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.UserInfoModifyActivity;
import com.yizhuan.erban.ui.user.UserModifyPhotosActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoModifyActivity;
import com.yizhuan.erban.ui.user.activity.UserModifyPhotosActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;

1
app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
View File

@@ -23,7 +23,6 @@ import com.yizhuan.erban.audio.viewmodel.SoundViewModel
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivitySoundSignatureBinding
import com.yizhuan.erban.ui.widget.dialog.CommonDialog
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.file.FileModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.statistic.StatisticManager

2
app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
View File

@@ -67,7 +67,7 @@ import com.yizhuan.erban.common.widget.CustomImageSpan;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.home.dialog.HelloMessageDialog;
import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.widget.NobleOpenNoticeView;

2
app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchActivity.kt
View File

@@ -11,7 +11,7 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.ActivityRoomPkSearchBinding
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel

6
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -36,13 +36,8 @@ import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.databinding.FragmentChatroomGameMainBinding;
import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.home.helper.OpenRoomHelper;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.widget.ShareDialog;
import com.yizhuan.erban.utils.ClipboardUtils;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts;
@@ -79,7 +74,6 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.util.Objects;
import cn.sharesdk.framework.Platform;

2
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt
View File

@@ -13,7 +13,7 @@ import com.netease.nim.uikit.common.util.sys.TimeUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.erban.databinding.LayoutSingleRoomPkBoardViewBinding
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager

2
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchActivity.kt
View File

@@ -10,7 +10,7 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.ActivitySingleRoomPkSearchBinding
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo

2
app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java
View File

@@ -39,7 +39,7 @@ import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.home.view.IFamilyHomeActivityView;
import com.yizhuan.erban.team.view.CreateTeamMessageActivity;
import com.yizhuan.erban.team.view.NimTeamMessageActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.widget.ShareDialog;
import com.yizhuan.erban.common.util.Utils;

2
app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java
View File

@@ -21,7 +21,7 @@ import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberListView;
import com.yizhuan.erban.family.presenter.FamilyMemberListPresenter;
import com.yizhuan.erban.family.view.adapter.FamilyMemberListAdapter;
import com.yizhuan.erban.family.view.dialog.FamilyTransferDialog;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;

2
app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java
View File

@@ -27,7 +27,7 @@ import com.yizhuan.erban.family.presenter.FamilyMemberSearchPresenter;
import com.yizhuan.erban.family.view.adapter.FamilyMemberListAdapter;
import com.yizhuan.erban.family.view.dialog.FamilyRemoveMemberDialog;
import com.yizhuan.erban.family.view.dialog.FamilyTransferDialog;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;

2
app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListAdapter.kt
View File

@@ -3,7 +3,7 @@ package com.yizhuan.erban.fansteam
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo

2
app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java
View File

@@ -18,7 +18,7 @@ import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
import com.yizhuan.erban.home.adapter.CommunityNoticeAdapter;
import com.yizhuan.erban.home.presenter.CommunityNoticePresenter;
import com.yizhuan.erban.home.view.ICommunityNoticeAct;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;

2
app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java
View File

@@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import java.util.List;

2
app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java
View File

@@ -9,7 +9,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;

2
app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java
View File

@@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.home.bean.VisitorInfo;
import com.yizhuan.xchat_android_library.utils.ResUtil;

2
app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java
View File

@@ -21,7 +21,7 @@ import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.ui.relation.adapter.AttentionListAdapter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
View File

@@ -23,7 +23,7 @@ import com.yizhuan.erban.audio.helper.AudioPlayerHelper
import com.yizhuan.erban.audio.helper.OnPlayListener
import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.erban.databinding.LayoutAnchorCardViewBinding
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.erban.ui.utils.loadAvatar

2
app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt
View File

@@ -13,7 +13,7 @@ import com.yizhuan.erban.databinding.ActivityCpHomeBinding
import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel
import com.yizhuan.erban.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP
import com.yizhuan.erban.ui.relation.FansListActivity
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes

4
app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java
View File

@@ -15,7 +15,6 @@ import com.yizhuan.erban.luckymoney.viewholder.LuckyMoneyMsgViewHolder;
import com.yizhuan.erban.luckymoney.viewholder.LuckyMoneyTipsViewHolder;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.im.msgholder.ClanMsgViewHolder;
import com.yizhuan.erban.module_hall.im.msgholder.HallMsgViewHolder;
import com.yizhuan.erban.public_chat_hall.msg.viewholder.MsgViewHolderAitMe;
import com.yizhuan.erban.share.viewholder.InAppSharingMsgViewHolder;
import com.yizhuan.erban.ui.im.actions.GiftAction;
@@ -35,7 +34,7 @@ import com.yizhuan.erban.ui.im.chat.MsgViewHolderText;
import com.yizhuan.erban.ui.im.chat.SignInNoticeMsgViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgV2ViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgViewHolder;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.xchat_android_core.community.attachment.DynamicSysAttachment;
import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment;
@@ -64,7 +63,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment;
import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment;
import com.yizhuan.xchat_android_core.module_hall.im.ClanAttachment;
import com.yizhuan.xchat_android_core.module_hall.im.HallAttachment;
import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment;
import java.util.ArrayList;

4
app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java
View File

@@ -5,7 +5,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.orhanobut.logger.Logger;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
import com.umeng.commonsdk.statistics.common.DeviceConfig;
import com.yizhuan.erban.R;
@@ -40,7 +39,7 @@ import com.yizhuan.erban.ui.login.ShowBindPhoneActivity;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.setting.FeedbackActivity;
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity;
import com.yizhuan.erban.vip.VipMainActivity;
@@ -58,7 +57,6 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_core.withdraw.WithdrawModel;

2
app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java
View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;

2
app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java
View File

@@ -36,7 +36,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.common.widget.CustomImageSpan;
import com.yizhuan.erban.ui.im.audio.ShakeHeartDialogFragment;
import com.yizhuan.erban.ui.im.fragment.MessageFragment;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.tutu.mentoring_relationship.dialog.BuildMentoringRelationshipSuccessDialog;
import com.yizhuan.xchat_android_core.audio.event.VoiceShakeHeartEvent;

2
app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java
View File

@@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.vip.VipHelper;

4
app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.kt
View File

@@ -2,20 +2,16 @@ package com.yizhuan.erban.ui.login
import android.annotation.SuppressLint
import android.content.Context
import android.os.Bundle
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_library.utils.ResUtil
import android.widget.TextView
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.erban.ui.setting.VerifyPhoneActivity
import com.netease.nim.uikit.StatusBarUtil
import android.content.Intent
import android.text.TextUtils
import android.view.View
import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivityShowBindPhoneBinding
import com.yizhuan.erban.ui.login.ShowBindPhoneActivity
/**
* 已綁定手機號頁面

2
app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java
View File

@@ -19,7 +19,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.ui.relation.adapter.AttentionListAdapter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.praise.event.PraiseEvent;

2
app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java
View File

@@ -19,7 +19,7 @@ import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.ui.relation.adapter.FansViewAdapter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java
View File

@@ -12,7 +12,7 @@ import com.coorchice.library.SuperTextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo;

1
app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt
View File

@@ -18,7 +18,6 @@ import com.yizhuan.erban.databinding.ActivityResetLoginPwdBinding
import com.yizhuan.erban.ui.login.AreaCodeActivity
import com.yizhuan.erban.ui.login.BindPhoneActivity
import com.yizhuan.erban.ui.login.helper.LogoutHelper
import com.yizhuan.erban.ui.setting.ResetPasswordActivity
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.code.CodeType
import com.yizhuan.xchat_android_core.user.UserModel

2
app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt
View File

@@ -17,7 +17,7 @@ import com.yizhuan.erban.ui.im.avtivity.BlackListManageActivity
import com.yizhuan.erban.ui.login.BindPhoneActivity
import com.yizhuan.erban.ui.login.ShowBindPhoneActivity
import com.yizhuan.erban.ui.login.helper.LogoutHelper
import com.yizhuan.erban.ui.user.AboutActivity
import com.yizhuan.erban.ui.user.activity.AboutActivity
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel

2
app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java → app/src/main/java/com/yizhuan/erban/ui/user/activity/AboutActivity.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.activity;
import android.os.Bundle;
import android.widget.TextView;

114
app/src/main/java/com/yizhuan/erban/ui/user/activity/EditUserTagActivity.kt Normal file
View File

@@ -0,0 +1,114 @@
package com.yizhuan.erban.ui.user.activity
import android.content.Context
import android.content.Intent
import android.view.Gravity
import android.view.View
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import com.netease.nim.uikit.StatusBarUtil
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.base.TitleBar
import com.yizhuan.erban.databinding.ActivityEditUserTagBinding
import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter
import com.yizhuan.erban.ui.user.fragment.MyTagFragment
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo
import com.yizhuan.xchat_android_library.common.entity.CommonTabEntity
/**
* author: wushaocheng
* time: 2022/2/16
* desc: 编辑用户标签
*/
class EditUserTagActivity : BaseViewBindingActivity<ActivityEditUserTagBinding>(),
CommonWrapIndicatorAdapter.OnItemSelectListener {
private var userLabelInfo : UserLabelInfo ?= null
companion object {
private const val USER_LABEL = "user_label"
@JvmStatic
fun start(context: Context, userLabelInfo: UserLabelInfo) {
val starter = Intent(context, EditUserTagActivity::class.java)
starter.putExtra(USER_LABEL, userLabelInfo)
context.startActivity(starter)
}
}
private val mTitles = ArrayList<CommonTabEntity>()
override fun init() {
initTitleBar(
getString(R.string.my_tag),
object : TitleBar.TextAction(
getString(R.string.done),
ContextCompat.getColor(this, R.color.color_white)
) {
override fun performAction(view: View) {
}
})
userLabelInfo = intent.getSerializableExtra(USER_LABEL) as UserLabelInfo?
initTabTitle()
initViewPager()
}
private fun initTabTitle() {
mTitles.add(CommonTabEntity(MyTagFragment::class.java, "在做"))
mTitles.add(CommonTabEntity(MyTagFragment::class.java, "兴趣"))
mTitles.add(CommonTabEntity(MyTagFragment::class.java, "经历"))
mTitles.add(CommonTabEntity(MyTagFragment::class.java, "性格"))
mTitles.add(CommonTabEntity(MyTagFragment::class.java, "阅读"))
mTitles.add(CommonTabEntity(MyTagFragment::class.java, "音乐"))
}
private fun initViewPager() {
val commonNavigator = CommonNavigator(context)
commonNavigator.setTitleWrapContent(false)
commonNavigator.titleMargin = ScreenUtil.dip2px(2.0F)
commonNavigator.setTitleGravity(Gravity.CENTER_VERTICAL)
val magicIndicatorAdapter = CommonWrapIndicatorAdapter(this, mTitles.map { it.title })
magicIndicatorAdapter.textSize = 14
magicIndicatorAdapter.setOnItemSelectListener(this)
commonNavigator.adapter = magicIndicatorAdapter
binding.magicIndicator.navigator = commonNavigator
binding.mViewPager.adapter =
object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
override fun createFragment(position: Int): Fragment {
val tabEntity = mTitles[position]
return tabEntity.frgClazz.newInstance()
}
override fun getItemCount(): Int {
return mTitles.size
}
}
ViewPagerHelper.bind(binding.magicIndicator, binding.mViewPager)
}
override fun onItemSelect(position: Int, view: TextView?) {
binding.mViewPager.currentItem = position
}
override fun needSteepStateBar(): Boolean {
return true
}
override fun setStatusBar() {
super.setStatusBar()
StatusBarUtil.transparencyBar(this)
StatusBarUtil.StatusBarLightMode(this)
}
}

3
app/src/main/java/com/yizhuan/erban/ui/user/ShowPhotoActivity.java → app/src/main/java/com/yizhuan/erban/ui/user/activity/ShowPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.activity;
import android.os.Bundle;
import android.widget.ImageView;
@@ -9,6 +9,7 @@ import androidx.viewpager.widget.ViewPager;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.user.adapter.PhotoAdapter;
import com.yizhuan.xchat_android_core.user.bean.UserPhoto;
import java.util.ArrayList;

3
app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.kt → app/src/main/java/com/yizhuan/erban/ui/user/activity/UserGiftActivity.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user
package com.yizhuan.erban.ui.user.activity
import android.widget.LinearLayout
import android.widget.TextView
@@ -8,6 +8,7 @@ import com.netease.nim.uikit.StatusBarUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivityUserGiftBinding
import com.yizhuan.erban.ui.user.fragment.UserInfoGiftFragment
import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter
import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator

51
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java → app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.activity;
import static com.yizhuan.erban.ui.user.UserInfoActivity.IdentityState.OWN;
import static com.yizhuan.erban.ui.user.activity.UserInfoActivity.IdentityState.OWN;
import android.annotation.SuppressLint;
import android.content.ClipData;
@@ -21,7 +21,6 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.appbar.AppBarLayout;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -45,12 +44,14 @@ import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity;
import com.yizhuan.erban.family.view.activity.FamilyMemberSearchActivity;
import com.yizhuan.erban.ui.im.avtivity.NimFriendModel;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.adapter.UserPhotoAdapter;
import com.yizhuan.erban.ui.user.adapter.SelfPhotoAdapter;
import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter;
import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter;
import com.yizhuan.erban.ui.user.adapter.UserInfoPhotoAdapter;
import com.yizhuan.erban.ui.user.view.UserInfoGiftWallFragment;
import com.yizhuan.erban.ui.user.view.UserInfoInfoFragment;
import com.yizhuan.erban.ui.user.dialog.UserTagDialog;
import com.yizhuan.erban.ui.user.fragment.UserInfoGiftWallFragment;
import com.yizhuan.erban.ui.user.fragment.UserInfoInfoFragment;
import com.yizhuan.erban.ui.user.viewmodel.UserInfoViewModel;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
@@ -201,6 +202,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
mBinding.ivEdit.setOnClickListener(this);
mBinding.tvEdit.setOnClickListener(this);
mBinding.viewLive.setOnClickListener(this);
mBinding.ivTagArrow.setOnClickListener(this);
}
/**
@@ -414,25 +416,22 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
}
private void initNestScrollView() {
mBinding.appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
LogUtils.d("verticalOffset=" + verticalOffset);
if (flag == 0 && Math.abs(verticalOffset) > SizeUtils.dp2px(context, 200)) {
//展开
flag = 1;
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back_black);
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.white));
setTitleVisible(true);
setEditButton(identityState, true);
} else if (flag == 1 && Math.abs(verticalOffset) <= 200) {
//合起来
flag = 0;
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back);
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.transparent));
setTitleVisible(false);
setEditButton(identityState, false);
}
mBinding.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
LogUtils.d("verticalOffset=" + verticalOffset);
if (flag == 0 && Math.abs(verticalOffset) > SizeUtils.dp2px(context, 200)) {
//展开
flag = 1;
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back_black);
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.white));
setTitleVisible(true);
setEditButton(identityState, true);
} else if (flag == 1 && Math.abs(verticalOffset) <= 200) {
//合起来
flag = 0;
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back);
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.transparent));
setTitleVisible(false);
setEditButton(identityState, false);
}
});
}
@@ -506,6 +505,10 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.ivTagArrow:
UserTagDialog.newInstance().show(this);
break;
case R.id.iv_user_back:
finish();
break;

34
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt → app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoModifyActivity.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user
package com.yizhuan.erban.ui.user.activity
import android.Manifest
import android.annotation.SuppressLint
@@ -27,7 +27,8 @@ import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.common.util.BitmapUtil
import com.yizhuan.erban.databinding.ActivityUserInfoModifyBinding
import com.yizhuan.erban.ui.login.ModifyInfoActivity
import com.yizhuan.erban.ui.user.UserPhotoAdapter.ImageClickListener
import com.yizhuan.erban.ui.user.adapter.UserPhotoAdapter
import com.yizhuan.erban.ui.user.adapter.UserPhotoAdapter.ImageClickListener
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog
import com.yizhuan.erban.utils.RegexUtil
@@ -35,6 +36,7 @@ import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.file.FileModel
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo
import com.yizhuan.xchat_android_core.user.bean.UserPhoto
import com.yizhuan.xchat_android_core.utils.Logger
import com.yizhuan.xchat_android_library.common.file.FileHelper
@@ -116,7 +118,11 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
binding.tvBirth.text = birth
binding.tvNick.text = RegexUtil.getPrintableString(userInfo.nick)
setTvDesc(userInfo.userDesc)
val adapter = UserPhotoAdapter(userInfo.privatePhoto, 1, userInfo.uid)
val adapter = UserPhotoAdapter(
userInfo.privatePhoto,
1,
userInfo.uid
)
adapter.setSmall(true)
adapter.setImageClickListener(this)
binding.rvPhotos.adapter = adapter
@@ -146,6 +152,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
binding.layoutPhotos.setOnClickListener(this)
binding.llAudioRecord.setOnClickListener(this)
binding.llDesc.setOnClickListener(this)
binding.layoutTag.setOnClickListener(this)
val mLayoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, true)
binding.rvPhotos.layoutManager = mLayoutManager
}
@@ -261,6 +268,27 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
userId,
Method.PHOTO
)
R.id.layout_tag -> {
dialogManager.showProgressDialog(
this@UserInfoModifyActivity,
ResUtil.getString(R.string.ui_user_userinfomodifyactivity_02)
)
UserModel.get().userLabelInfo.subscribe(object : SingleObserver<UserLabelInfo>{
override fun onSubscribe(d: Disposable) {
mCompositeDisposable.add(d)
}
override fun onSuccess(userLabelInfo: UserLabelInfo) {
EditUserTagActivity.start(this@UserInfoModifyActivity, userLabelInfo)
}
override fun onError(e: Throwable) {
dialogManager.dismissDialog()
toast(e.message)
}
})
}
else -> {}
}
}

11
app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.kt → app/src/main/java/com/yizhuan/erban/ui/user/activity/UserModifyPhotosActivity.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user
package com.yizhuan.erban.ui.user.activity
import android.Manifest
import android.annotation.SuppressLint
@@ -22,7 +22,8 @@ import com.yizhuan.erban.application.XChatApplication
import com.yizhuan.erban.base.TitleBar
import com.yizhuan.xchat_android_library.common.file.FileHelper
import com.yizhuan.erban.common.util.BitmapUtil
import com.yizhuan.erban.ui.user.UserModifyPhotosAdapter.PhotoItemClickListener
import com.yizhuan.erban.ui.user.adapter.UserModifyPhotosAdapter
import com.yizhuan.erban.ui.user.adapter.UserModifyPhotosAdapter.PhotoItemClickListener
import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog
import com.yizhuan.xchat_android_core.file.FileModel
import com.yizhuan.xchat_android_core.user.UserModel
@@ -83,7 +84,11 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener,
mActivity = this
userId = intent.getLongExtra("userId", 0)
userInfo = UserModel.get().cacheLoginUserInfo
adapter = UserModifyPhotosAdapter(this, ArrayList(), this)
adapter = UserModifyPhotosAdapter(
this,
ArrayList(),
this
)
photoGridView!!.adapter = adapter
if (userInfo != null) {
updateView()

2
app/src/main/java/com/yizhuan/erban/ui/user/PhotoAdapter.java → app/src/main/java/com/yizhuan/erban/ui/user/adapter/PhotoAdapter.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.adapter;
import android.content.Context;
import android.view.View;

3
app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserDesAdapter.java
View File

@@ -20,8 +20,7 @@ import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.audio.widget.VoiceLine;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.miniworld.activity.TopicMainActivity;
import com.yizhuan.erban.ui.user.ShowPhotoActivity;
import com.yizhuan.erban.ui.user.UserPhotoAdapter;
import com.yizhuan.erban.ui.user.activity.ShowPhotoActivity;
import com.yizhuan.erban.ui.widget.SquareImageView;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPhotoAdapter.java
View File

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.user.ShowPhotoActivity;
import com.yizhuan.erban.ui.user.activity.ShowPhotoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo;

2
app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosAdapter.java → app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserModifyPhotosAdapter.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.adapter;
import android.content.Context;
import android.view.LayoutInflater;

2
app/src/main/java/com/yizhuan/erban/ui/user/UserPhotoAdapter.java → app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserPhotoAdapter.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.adapter;
import android.view.LayoutInflater;
import android.view.View;

18
app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserTagAdapter.kt Normal file
View File

@@ -0,0 +1,18 @@
package com.yizhuan.erban.ui.user.adapter
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
/**
* 用户标签
* Created by wushaocheng on 2023/2/16.
*/
class UserTagAdapter :
BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_user_tag) {
override fun convert(helper: BaseViewHolder, item: String) {
helper.setText(R.id.tv_user_tag, item)
}
}

2
app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansListFragment.java
View File

@@ -11,7 +11,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.praise.event.PraiseEvent;

63
app/src/main/java/com/yizhuan/erban/ui/user/dialog/UserTagDialog.kt Normal file
View File

@@ -0,0 +1,63 @@
package com.yizhuan.erban.ui.user.dialog
import com.hjq.toast.ToastUtils
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogUserTagBinding
import com.yizhuan.erban.ui.user.activity.EditUserTagActivity
import com.yizhuan.erban.ui.user.adapter.UserTagAdapter
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo
import io.reactivex.SingleObserver
import io.reactivex.disposables.Disposable
/**
* 用户标签
* Created by wushaocheng on 2023/2/16.
*/
class UserTagDialog :
BaseDialog<DialogUserTagBinding>() {
companion object {
@JvmStatic
fun newInstance(): UserTagDialog {
return UserTagDialog()
}
}
private val mTagAdapter by lazy { UserTagAdapter() }
override fun init() {
initAdapter()
initListener()
}
private fun initAdapter() {
binding.mRecyclerView.adapter = mTagAdapter
}
private fun initListener() {
binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
binding.tvEdit.setOnClickListener {
UserModel.get().userLabelInfo.subscribe(object : SingleObserver<UserLabelInfo> {
override fun onSubscribe(d: Disposable) {
}
override fun onSuccess(userLabelInfo: UserLabelInfo) {
context?.let { it1 -> EditUserTagActivity.start(it1, userLabelInfo) }
dismissAllowingStateLoss()
}
override fun onError(e: Throwable) {
ToastUtils.show(e.message)
}
})
}
}
}

17
app/src/main/java/com/yizhuan/erban/ui/user/fragment/MyTagFragment.kt Normal file
View File

@@ -0,0 +1,17 @@
package com.yizhuan.erban.ui.user.fragment
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.databinding.FragmentUserinfoDynamicBinding
/**
* author: wushaocheng
* time: 2022/2/16
* desc: 我的标签
*/
class MyTagFragment : BaseViewBindingFragment<FragmentUserinfoDynamicBinding>() {
override fun init() {
}
}

2
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoCarFragment.java → app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoCarFragment.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.fragment;
import android.graphics.Rect;
import android.os.Bundle;

2
app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoDynamicFragment.kt → app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoDynamicFragment.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user.view
package com.yizhuan.erban.ui.user.fragment
import android.view.View
import androidx.fragment.app.activityViewModels

2
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java → app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoGiftFragment.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user;
package com.yizhuan.erban.ui.user.fragment;
import android.os.Bundle;
import android.util.Log;

6
app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt → app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoGiftWallFragment.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user.view
package com.yizhuan.erban.ui.user.fragment
import android.content.Intent
import android.widget.LinearLayout
@@ -8,14 +8,12 @@ import androidx.viewpager.widget.ViewPager
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.databinding.FragmentUserinfoGiftWallBinding
import com.yizhuan.erban.ui.user.UserGiftActivity
import com.yizhuan.erban.ui.user.UserInfoGiftFragment
import com.yizhuan.erban.ui.user.activity.UserGiftActivity
import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter
import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
class UserInfoGiftWallFragment : BaseViewBindingFragment<FragmentUserinfoGiftWallBinding>() {

20
app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt → app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoInfoFragment.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.ui.user.view
package com.yizhuan.erban.ui.user.fragment
import android.view.View
import androidx.fragment.app.activityViewModels
@@ -32,7 +32,6 @@ import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo
import com.yizhuan.xchat_android_core.utils.StarUtils
import com.yizhuan.xchat_android_core.utils.net.BeanObserver
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
@@ -76,6 +75,21 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
val hallInfo: HallInfo? = clanAndHallInfo.hall
val clanInfo: ClanInfo? = clanAndHallInfo.clan
if (AuthModel.get().currentUid == UserInfoUiMgr.get().uid) {
binding.tvMore.visibility = View.GONE
binding.llRoom.visibility = View.VISIBLE
binding.llAssociation.visibility = View.VISIBLE
} else {
binding.tvMore.visibility = View.VISIBLE
binding.llRoom.visibility = View.GONE
binding.llAssociation.visibility = View.GONE
binding.tvMore.setOnClickListener {
binding.tvMore.visibility = View.GONE
binding.llRoom.visibility = View.VISIBLE
binding.llAssociation.visibility = View.VISIBLE
}
}
if (hallInfo != null && hallInfo.hallId > 0) {
binding.tvRoom.visibility = View.VISIBLE
binding.tvJoinRoom.visibility = View.GONE
@@ -85,7 +99,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
binding.tvJoinRoom.visibility = View.VISIBLE
if (AuthModel.get().currentUid == UserInfoUiMgr.get().uid) {
binding.tvJoinRoom.text = getString(R.string.no_room_has_been_added_yet)
}else{
} else {
binding.tvJoinRoom.text = getString(R.string.user_no_room_has_been_added_yet)
}
}

2
app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
View File

@@ -40,7 +40,7 @@ import com.yizhuan.erban.avroom.adapter.UpMicAdapter;
import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper;
import com.yizhuan.erban.avroom.widget.ViewItem;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.user.adapter.SkillPicsAdapter;
import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;

BIN
app/src/main/res/drawable-xhdpi/ic_edit_tag_empty.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_tag_arrow.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 750 B

BIN
app/src/main/res/drawable-xhdpi/ic_tag_close.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 718 B

13
app/src/main/res/drawable/bg_edit_user_tag.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#B0DAFF"
android:centerColor="#B0DAFF"
android:startColor="#F4DBFF"
android:type="linear"
android:useLevel="true" />
</shape>

9
app/src/main/res/drawable/bg_ffffff_12.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_12"/>
<solid android:color="@color/color_FFFFFF"/>
</shape>

62
app/src/main/res/layout/activity_edit_user_tag.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_white"
tools:context=".ui.user.activity.EditUserTagActivity">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_edit_user_tag"
app:layout_constraintDimensionRatio="1.24:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_44"
android:background="@color/transparent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_tag_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_18"
android:src="@drawable/ic_edit_tag_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_bar" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/edit_your_tags_tip"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_tag_empty" />
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="match_parent"
android:layout_height="48dp"
app:layout_constraintTop_toBottomOf="@+id/view_bg"/>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/mViewPager"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0"
app:layout_constraintTop_toBottomOf="@+id/magic_indicator"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/activity_show_photo.xml
View File

@@ -6,7 +6,7 @@
android:background="@color/black"
android:fitsSystemWindows="true"
android:clipToPadding="false"
tools:context="com.yizhuan.erban.ui.user.ShowPhotoActivity">
tools:context="com.yizhuan.erban.ui.user.activity.ShowPhotoActivity">
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"

29
app/src/main/res/layout/activity_user_info.xml
View File

@@ -385,16 +385,41 @@
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mTagRecyclerView"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_12"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/ll_level"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivTagArrow"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivTagArrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_tag_arrow"
android:layout_marginTop="@dimen/dp_12"
app:layout_constraintTop_toBottomOf="@id/ll_level"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="mTagRecyclerView,ivTagArrow"/>
<TextView
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_12"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toBottomOf="@id/ll_level"
app:layout_constraintTop_toBottomOf="@id/mTagRecyclerView"
tools:text="@string/layout_activity_user_info_04" />
</androidx.constraintlayout.widget.ConstraintLayout>

86
app/src/main/res/layout/activity_user_info_modify.xml
View File

@@ -139,7 +139,7 @@
<TextView
android:id="@+id/tv_birth"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|end"
@@ -200,6 +200,90 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@color/line_353548" />
<LinearLayout
android:id="@+id/layout_area"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="15dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/user_area"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_area"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|end"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/font_normal"
tools:text="馬來西亞"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="15dp"
android:src="@drawable/arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@color/line_353548" />
<LinearLayout
android:id="@+id/layout_tag"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="15dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/layout_item_user_03"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_tag"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|end"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/font_normal"
android:text="@string/setting_personal_tags_will_be_more_popular"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="15dp"
android:src="@drawable/arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"

64
app/src/main/res/layout/dialog_user_tag.xml Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:paddingBottom="@dimen/dp_20"
android:background="@drawable/bg_ffffff_14">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivClose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/ic_tag_close"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_17"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_18"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:text="TA的标签"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerView"
android:layout_marginTop="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/tvTitle"
android:overScrollMode="never"
android:scrollbars="none"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvEdit"
android:text="@string/edit_tag"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_FFFFFF"
android:textStyle="bold"
android:gravity="center"
android:layout_width="130dp"
android:layout_height="34dp"
android:background="@drawable/bg_common_confirm_30"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@+id/mRecyclerView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

16
app/src/main/res/layout/fragment_my_tag.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:scrollbars="none"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

38
app/src/main/res/layout/fragment_userinfo_userinfo.xml
View File

@@ -83,6 +83,42 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/user_area"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvArea"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="馬來西亞" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvMore"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:drawableEnd="@drawable/ic_room_yellow_arrow"
android:gravity="center"
android:visibility="gone"
android:text="@string/home_more"
android:textColor="@color/color_ffbc51"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
android:id="@+id/llRoom"
android:layout_width="wrap_content"
@@ -156,9 +192,9 @@
android:layout_marginTop="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_60"
android:background="@drawable/bg_ffffff_8"
android:nestedScrollingEnabled="false"
android:overScrollMode="never"
android:scrollbars="none"
android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</LinearLayout>

16
app/src/main/res/layout/item_user_tag.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<com.coorchice.library.SuperTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tv_user_tag"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_6"
android:paddingTop="@dimen/dp_2"
android:paddingEnd="@dimen/dp_6"
android:paddingBottom="@dimen/dp_2"
app:corner="@dimen/dp_9"
app:solid="@color/color_F3F5F9"
tools:text="上班族" />

1
app/src/main/res/values/colors.xml
View File

@@ -645,5 +645,6 @@
<color name="color_5E4D98">#5E4D98</color>
<color name="color_ECE4FF">#ECE4FF</color>
<color name="color_D8D8D8">#D8D8D8</color>
<color name="color_F3F5F9">#F3F5F9</color>
</resources>

5
app/src/main/res/values/strings.xml
View File

@@ -5044,6 +5044,7 @@
<string name="personal_data">個人資料</string>
<string name="user_constellation">星座:</string>
<string name="user_birthday">生日:</string>
<string name="user_area">地區:</string>
<string name="user_room">房間:</string>
<string name="user_association">公會:</string>
<string name="sound_duration">%d"</string>
@@ -5065,5 +5066,9 @@
<string name="gold_coin_balance">金幣餘額:%s</string>
<string name="sure_to_close">確定關閉</string>
<string name="gold_exchange_power">的金幣兌換權限嗎？</string>
<string name="edit_tag">編輯標簽</string>
<string name="edit_your_tags_tip">編輯你的標簽，可以大大提高你的人氣~</string>
<string name="my_tag">我的標簽</string>
<string name="setting_personal_tags_will_be_more_popular">設置個人標簽將更受歡迎~</string>
</resources>

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallMemberListActivity.java
View File

@@ -13,7 +13,7 @@ import com.yizhuan.erban.common.EmptyViewHelper;
import com.yizhuan.erban.databinding.ActivityHallMemberListBinding;
import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter;
import com.yizhuan.erban.module_hall.hall.presenter.AdminListPresenter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.RVDelegate;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo;

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java
View File

@@ -19,7 +19,7 @@ import com.yizhuan.erban.databinding.ActivityModuleClanBinding;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter;
import com.yizhuan.erban.module_hall.hall.adapter.HallListAdapter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.utils.RVDelegate;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
View File

@@ -24,7 +24,7 @@ import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter;
import com.yizhuan.erban.module_hall.hall.presenter.ModuleHallPresenter;
import com.yizhuan.erban.module_hall.hall.view.IModuleHallView;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;

2
app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java
View File

@@ -20,7 +20,7 @@ import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.widget.marqueeview.BetterMarqueeView;

2
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java
View File

@@ -10,7 +10,7 @@ import androidx.appcompat.widget.AppCompatImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo;
import com.yizhuan.xchat_android_library.utils.ResUtil;

2
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java
View File

@@ -14,7 +14,7 @@ import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.treasure_box.adapter.BoxRankingListAdapter;
import com.yizhuan.erban.treasure_box.module.IBoxRankingView;
import com.yizhuan.erban.treasure_box.presenter.BoxRankingPresenter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration;
import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo;