feat: 删掉UserInfo，shortId字段

app/src/main/java/com/adealink/weparty/module/account/AccountModule.kt

@@ -19,9 +19,6 @@ object AccountModule : BaseDynamicModule<IAccountService>(IAccountService::class
     override val uid: Long
         get() = getService().uid
 
-    override val sid: Long
-        get() = getService().sid
-
     override val token: String
         get() = getService().token
 
@@ -75,9 +72,6 @@ object AccountModule : BaseDynamicModule<IAccountService>(IAccountService::class
             override val uid: Long
                 get() = 0
 
-            override val sid: Long
-                get() = 0
-
             override val token: String
                 get() = ""
 

app/src/main/java/com/adealink/weparty/module/account/IAccountService.kt

@@ -9,8 +9,6 @@ import com.adealink.frame.base.Rlt
 interface IAccountService : IService<IAccountService> {
     val uid: Long
 
-    val sid: Long
-
     val token: String
 
     fun logout(toLogin: Boolean? = true)

app/src/main/java/com/adealink/weparty/module/profile/IProfileService.kt

@@ -21,8 +21,6 @@ interface IProfileService : IService<IProfileService> {
 
     fun getMyUid(): Long
 
-    fun getMyShortId(): Long
-
     fun getMyUserInfo(): UserInfo?
 
     fun setMyUserInfo(userInfo: UserInfo)

app/src/main/java/com/adealink/weparty/module/profile/ProfileModule.kt

@@ -34,10 +34,6 @@ object ProfileModule : BaseDynamicModule<IProfileService>(IProfileService::class
                 return 0
             }
 
-            override fun getMyShortId(): Long {
-                return 0
-            }
-
             override fun getMyUserInfo(): UserInfo? {
                 return null
             }
@@ -189,10 +185,6 @@ object ProfileModule : BaseDynamicModule<IProfileService>(IProfileService::class
         return getService().getMyUid()
     }
 
-    override fun getMyShortId(): Long {
-        return getService().getMyShortId()
-    }
-
     override fun getMyUserInfo(): UserInfo? {
         return getService().getMyUserInfo()
     }

app/src/main/java/com/adealink/weparty/module/profile/data/ProfileData2.kt

@@ -29,9 +29,11 @@ enum class Gender(val gender: Int) {
                 FEMALE.gender -> {
                     FEMALE
                 }
+
                 MALE.gender -> {
                     MALE
                 }
+
                 else -> {
                     NO_INIT
                 }
@@ -56,7 +58,6 @@ data class GetUserInRoomRes(
 @Parcelize
 data class UserInfo(
     @SerializedName("uid") val uid: Long,
-    @SerializedName("sid") val shortId: Long,
     @SerializedName("name") var name: String,
     @SerializedName("url") var url: String,
     @SerializedName("birthday") var birthday: Long,
@@ -189,7 +190,6 @@ data class UserInfo(
         fun emptyUserInfo(uid: Long, url: String): UserInfo {
             return UserInfo(
                 uid,
-                0,
                 "",
                 url,
                 0,
@@ -208,7 +208,6 @@ data class UserInfo(
         fun officialUserInfo(): UserInfo {
             return UserInfo(
                 uid = 0,
-                shortId = 0,
                 name = "WeParty",
                 url = "",
                 0,
@@ -230,11 +229,11 @@ data class UserInfo(
             }
         }
         goodIdInfo?.let {
-            if (it.goodId!=0) {
+            if (it.goodId != 0) {
                 return it.goodId.toString()
             }
         }
-        return shortId.toString()
+        return uid.toString()
     }
 
     fun hasGoodId(): Boolean {
@@ -250,7 +249,7 @@ data class UserInfo(
      */
     fun containsKeywordBySearch(keyword: String): Boolean {
         return name.contains(keyword, ignoreCase = true)
-                || shortId.toString().contains(keyword)
+                || uid.toString().contains(keyword)
                 || goodIdInfo?.goodId.toString().contains(keyword)
                 || strGoodIdInfo?.strGoodId?.contains(keyword) ?: false
     }
@@ -699,6 +698,7 @@ enum class RelationshipType(val type: Int) {
     NOTE_NAME(2), //备注名
     SPECIAL_FOLLOW(3) //特别关注
 }
+
 @JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchGetUserRelationShipReq(
     @SerializedName("relationshipType") val relationshipType: Int,

app/src/main/java/com/adealink/weparty/module/profile/view/UserIdView.kt

@@ -125,7 +125,7 @@ class UserIdView @JvmOverloads constructor(
                 )
             }
 
-            tvId.text = getCompatString(R.string.profile_short_id, userInfo.shortId)
+            tvId.text = getCompatString(R.string.profile_short_id, userInfo.uid.toString())
         }
 
         binding.root.onClick {
@@ -158,7 +158,7 @@ class UserIdView @JvmOverloads constructor(
         copyClickStat?.invoke()
 
         if (!userInfo.hasGoodId() && !userInfo.hasStrGoodInfo()) {
-            if (copyToClipBoard(userInfo.shortId.toString(), userInfo.shortId.toString())) {
+            if (copyToClipBoard(userInfo.uid.toString(), userInfo.uid.toString())) {
                 showToast(R.string.profile_id_copied, Toast.LENGTH_SHORT)
             }
             return
@@ -167,7 +167,7 @@ class UserIdView @JvmOverloads constructor(
         UserIdCopyDialog.show(
             context = context,
             goodIdInfo = userInfo.goodIdInfo,
-            shortId = userInfo.shortId.toString(),
+            shortId = userInfo.uid.toString(),
             strGoodIdInfo = userInfo.strGoodIdInfo
         )
     }

app/src/main/java/com/adealink/weparty/oss/AliyunOssConfig.kt

@@ -9,6 +9,7 @@ import com.adealink.frame.oss.IOssCompressor
 import com.adealink.frame.oss.constant.TAG_OSS
 import com.adealink.frame.oss.data.OssToken
 import com.adealink.weparty.App
+import com.adealink.weparty.module.account.AccountModule
 import com.adealink.weparty.module.profile.ProfileModule
 
 /**
@@ -22,7 +23,7 @@ class AliyunOssConfig : AbstractOssConfig() {
     override val context: Context = App.instance
     override val endpoint: String = "oss-accelerate.aliyuncs.com"
     override val hashUid: String
-        get() = ProfileModule.getMyShortId().toString()
+        get() = AccountModule.uid.toString()
     override val deviceId: String
         get() = App.instance.deviceIdService.getLocalDeviceId()
 

app/src/main/java/com/adealink/weparty/oss/QCloudOssConfig.kt

@@ -9,7 +9,7 @@ import com.adealink.frame.oss.IOssCompressor
 import com.adealink.frame.oss.constant.TAG_OSS
 import com.adealink.frame.oss.data.OssToken
 import com.adealink.weparty.App
-import com.adealink.weparty.module.profile.ProfileModule
+import com.adealink.weparty.module.account.AccountModule
 
 /**
  * Created by sunxiaodong on 2022/10/13.
@@ -21,7 +21,7 @@ class QCloudOssConfig : AbstractOssConfig() {
     override val context: Context = App.instance
     override val endpoint: String = "cos.eu-frankfurt.myqcloud.com"
     override val hashUid: String
-        get() = ProfileModule.getMyShortId().toString()
+        get() = AccountModule.uid.toString()
     override val deviceId: String
         get() = App.instance.deviceIdService.getLocalDeviceId()
     // TODO: zhangfei 是否需要替换存储地址

app/src/main/java/com/adealink/weparty/stat/StatConfig.kt

@@ -65,7 +65,7 @@ class StatConfig : IStatConfig {
                     deviceId = newDeviceId,
                     module = statClientError.module,
                     errorInfo = statClientError.errorInfo,
-                    sid = ProfileModule.getMyShortId(),
+                    sid = ProfileModule.getMyUid(),
                     region = ProfileModule.getMyUserInfo()?.region,
                     country = ProfileModule.getMyUserInfo()?.country,
                 )

app/src/main/java/com/adealink/weparty/storage/AppPref.kt

@@ -10,7 +10,6 @@ object AppPref: TypeDelegationPrefs(
     }
 ) {
     var uid: Long by PrefKey("key_uid", 0)
-    var sid: Long by PrefKey("key_sid", 0)
     var token: String by PrefKey("key_token", "")
     var refreshToken: String by PrefKey("key_refresh_token", "")
     var isLogin: Boolean by PrefKey("key_is_login", false)

module/account/src/main/java/com/adealink/weparty/account/AccountServiceImpl.kt

@@ -17,9 +17,6 @@ class AccountServiceImpl : IAccountService {
     override val uid: Long
         get() = loginManager.uid
 
-    override val sid: Long
-        get() = loginManager.sid
-
     override val token: String
         get() = loginManager.token
 

module/account/src/main/java/com/adealink/weparty/account/login/adapter/AccountSelectItemViewBinder.kt

@@ -26,7 +26,7 @@ class AccountSelectItemViewBinder(private val listener: IAccountSelectItemClickL
             val userInfo = data.userInfo
             binding.ivAvatar.setImageUrl(userInfo.url)
             binding.tvName.text = userInfo.name
-            binding.tvId.text = getCompatString(APP_R.string.common_short_id, data.userInfo.shortId.toString())
+            binding.tvId.text = getCompatString(APP_R.string.common_short_id, data.userInfo.uid.toString())
             binding.clBg.isEnabled = holder.layoutPosition == listener.getLastSelectedAccount()
             binding.ivLevel.updateLevel(userInfo.level)
             if (data.isLastUsedAccount) {

module/account/src/main/java/com/adealink/weparty/account/login/manager/ILoginManager.kt

@@ -14,7 +14,6 @@ import com.adealink.weparty.setting.data.EmailState
 
 interface ILoginManager : IBaseFrame<ILoginListener> {
     var uid: Long
-    var sid: Long
     var token: String
     var isLogin: Boolean
     suspend fun login(

module/account/src/main/java/com/adealink/weparty/account/login/manager/LoginManager.kt

@@ -108,11 +108,6 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
             field = value
             AppPref.uid = value
         }
-    override var sid: Long = 0
-        set(value) {
-            field = value
-            AppPref.sid = value
-        }
     override var token: String = ""
         set(value) {
             field = value
@@ -128,7 +123,6 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
         isLogin = AppPref.isLogin
         uid = AppPref.uid
         token = AppPref.token
-        sid = AppPref.sid
         App.instance.networkService.subscribeNotify(userLoginKickNotify)
         App.instance.networkService.subscribeNotify(refreshTokenNotify)
         banManager.init()
@@ -276,7 +270,6 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
         isLogin = true
         uid = result.userInfo.uid
         token = result.token
-        sid = result.userInfo.shortId
         AppPref.refreshToken = result.refreshToken
         ProfileModule.setMyUserInfo(result.userInfo)
         AccountLocalService.loginType = loginType.value
@@ -348,7 +341,6 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
     override fun logout(toLogin: Boolean?) {
         isLogin = false
         uid = 0
-        sid = 0
         token = ""
         isNewRegister = false
 

module/backpack/src/main/java/com/adealink/weparty/backpack/dialog/CustomIdOperationDialog.kt

@@ -148,7 +148,7 @@ class CustomIdOperationDialog : BaseDialogFragment(R.layout.dialog_custom_id_ope
         binding.ivGiveToAvatar.setImageUrl(userInfo.url)
         binding.tvGiveToName.text = userInfo.name
         binding.tvGiveToId.text =
-            getCompatString(com.adealink.weparty.R.string.common_short_id, userInfo.shortId)
+            getCompatString(com.adealink.weparty.R.string.common_short_id, userInfo.uid)
     }
 
     private fun onConfirmClick() {

module/backpack/src/main/java/com/adealink/weparty/backpack/dialog/SendPackageItemConfirmDialog.kt

@@ -99,7 +99,7 @@ class SendPackageItemConfirmDialog : BaseDialogFragment(R.layout.dialog_send_pac
             binding.clGiveToCustomId.visibility = View.GONE
             binding.tvGiveToId.visibility = View.VISIBLE
             binding.tvGiveToId.text =
-                getCompatString(APP_R.string.common_short_id, userInfo.shortId)
+                getCompatString(APP_R.string.common_short_id, userInfo.uid)
             binding.clGiveToId.setBackgroundResource(APP_R.drawable.common_f5f7fa_radius_16_bg)
         }
     }

module/couple/src/main/java/com/adealink/weparty/couple/data/LoveHouseListData.kt

@@ -49,7 +49,7 @@ data class LoveHouseFriendData(val userFansInfo: UserFanInfo) : LoveHouseItemDat
 
         fun translateUserInfo(userInfo: com.adealink.weparty.module.profile.data.UserInfo): MutableList<LoveHouseFriendData> {
             val friendList = mutableListOf<LoveHouseFriendData>()
-            friendList.add(LoveHouseFriendData((UserFanInfo(-1, 0,userInfo.name, userInfo.uid.toString(), userInfo.shortId, userInfo.url))))
+            friendList.add(LoveHouseFriendData((UserFanInfo(-1, 0,userInfo.name, userInfo.uid.toString(), userInfo.uid, userInfo.url))))
             return friendList
         }
 

module/couple/src/main/java/com/adealink/weparty/couple/dialog/InviteCPDialogFragment.kt

@@ -261,7 +261,7 @@ class InviteCPDialogFragment : BottomDialogFragment(R.layout.dialog_invite_user)
                             arrayListOf(
                                 CPUserInfo(
                                     searchUserInfo.name,
-                                    searchUserInfo.shortId,
+                                    searchUserInfo.uid,
                                     searchUserInfo.url
                                 )
                             )

module/couple/src/main/java/com/adealink/weparty/couple/manager/CoupleManager.kt

@@ -592,7 +592,7 @@ class CoupleManager : BaseFrame<ICoupleListener>(), ICoupleManager {
                         LayoutCpDialogUserInfoBinding.inflate(LayoutInflater.from(activity))
                     userInfoBinding.ivAvatar.setImageUrl(inviterUserInfo.url)
                     userInfoBinding.tvId.text =
-                        getCompatString(APP_R.string.common_short_id, inviterUserInfo.shortId)
+                        getCompatString(APP_R.string.common_short_id, inviterUserInfo.uid)
                     userInfoBinding.tvName.text = inviterUserInfo.name
                     val dialog = CommonDialog.Builder()
                         .themeColor(CommonThemeColor.RED.value)
@@ -1579,7 +1579,7 @@ class CoupleManager : BaseFrame<ICoupleListener>(), ICoupleManager {
             LayoutCpDialogUserInfoBinding.inflate(LayoutInflater.from(activity))
         userInfoBinding.ivAvatar.setImageUrl(otherUserInfo.url)
         userInfoBinding.tvId.text =
-            getCompatString(APP_R.string.common_short_id, otherUserInfo.shortId)
+            getCompatString(APP_R.string.common_short_id, otherUserInfo.uid)
         userInfoBinding.tvName.text = otherUserInfo.name
         val dialog = CommonDialog.Builder()
             .themeColor(CommonThemeColor.RED.value)

module/medal/src/main/java/com/adealink/weparty/medal/MedalShareActivity.kt

@@ -70,7 +70,7 @@ class MedalShareActivity : BaseActivity() {
         val myUserInfo = ProfileModule.getMyUserInfo()
         binding.ivAvatar.setImageUrl(myUserInfo?.url)
         binding.tvUserName.text = myUserInfo?.name
-        binding.tvUserId.text = myUserInfo?.shortId?.toString()
+        binding.tvUserId.text = myUserInfo?.uid?.toString()
 
         binding.tvSaveImg.setOnClickListener {
             checkStoragePermissionAndSaveImg()

module/operation/src/main/java/com/adealink/weparty/operation/invite/view/BigSupportProfileView.kt

@@ -89,7 +89,7 @@ class BigSupportProfileView @JvmOverloads constructor(
                 binding.ivGoodId.gone()
                 binding.tvId.setTextColor(getCompatColor(APP_R.color.white))
                 binding.tvId.setBackgroundResource(APP_R.drawable.profile_sid_bg)
-                binding.tvId.text = getCompatString(APP_R.string.profile_short_id, shortId)
+                binding.tvId.text = getCompatString(APP_R.string.profile_short_id, uid)
                 binding.tvId.setPaddingRelative(
                     5.dp(),
                     binding.tvId.paddingTop,

module/party/src/main/java/com/adealink/weparty/party/eidt/EditPartyActivity.kt

@@ -130,7 +130,7 @@ class EditPartyActivity : BaseActivity() {
         } else {
             val myUserInfo = ProfileModule.getMyUserInfo()
             partyActivityStatusInfo = PartyActivityStatusInfo(activityId = 0,
-                creatorId = myUserInfo?.shortId ?: 0,
+                creatorId = myUserInfo?.uid ?: 0,
                 creatorGender = myUserInfo?.gender ?: com.adealink.weparty.module.profile.data.Gender.NO_INIT.gender,
                 creatorImgUrl = myUserInfo?.url ?: "",
                 creatorNickName = myUserInfo?.name ?: "",

module/party/src/main/java/com/adealink/weparty/party/view/PartyView.kt

@@ -40,7 +40,7 @@ class PartyView @JvmOverloads constructor(
         binding.btnOperation.setOnClickListener {
             val info = statusInfo ?: return@setOnClickListener
             if (info.activityStatus == PartyActivityStatus.Published.status) {
-                if (info.creatorId == ProfileModule.getMyShortId()) {
+                if (info.creatorId == ProfileModule.getMyUid()) {
                     return@setOnClickListener
                 }
                 partyViewCallBack?.onSubscribedClick(info, !info.subscribed)
@@ -55,7 +55,7 @@ class PartyView @JvmOverloads constructor(
         }
         binding.clHasSubscribe.setOnClickListener {
             val info = statusInfo ?: return@setOnClickListener
-            if (info.creatorId == ProfileModule.getMyShortId()) {
+            if (info.creatorId == ProfileModule.getMyUid()) {
                 return@setOnClickListener
             }
             partyViewCallBack?.onSubscribedClick(info, false)

module/profile/src/main/java/com/adealink/weparty/profile/ProfileServiceImpl.kt

@@ -43,10 +43,6 @@ class ProfileServiceImpl : IProfileService {
         return profileManager.getMyUid()
     }
 
-    override fun getMyShortId(): Long {
-        return profileManager.getMyShortId()
-    }
-
     override fun getMyUserInfo(): UserInfo? {
         return profileManager.getMyUserInfo()
     }

module/profile/src/main/java/com/adealink/weparty/profile/manager/IProfileManager.kt

@@ -13,8 +13,6 @@ import com.adealink.weparty.module.profile.tags.data.UserLabel
 interface IProfileManager : IBaseFrame<IProfileListener> {
     fun getMyUid(): Long
 
-    fun getMyShortId(): Long
-
     fun getMyUserInfo(): UserInfo?
 
     fun setMyUserInfo(userInfo: UserInfo, attrSet: Set<UserAttr>? = null)

module/profile/src/main/java/com/adealink/weparty/profile/manager/ProfileManager.kt

@@ -132,10 +132,6 @@ class ProfileManager : BaseFrame<IProfileListener>(), IProfileManager {
         return AccountModule.uid
     }
 
-    override fun getMyShortId(): Long {
-        return AccountModule.sid
-    }
-
     override fun getMyUserInfo(): UserInfo? {
         val cacheUserInfo = userInfoCache[getMyUid()]
         if (cacheUserInfo != null) {

module/room/src/main/java/com/adealink/weparty/room/micseat/invite/GameInviteMemberViewBinder.kt

@@ -39,7 +39,7 @@ class GameInviteMemberViewBinder(val listener: IGameInviteItemListener) :
                 binding.avatar.setImageUrl(member.url)
                 binding.name.text = member.name
                 binding.shortId.text =
-                    getCompatString(APP_R.string.common_short_id, member.shortId.toString())
+                    getCompatString(APP_R.string.common_short_id, member.uid.toString())
             }
         }
     }

module/room/src/main/java/com/adealink/weparty/room/micseat/invite/RoomGameInviteMemberFragment.kt

@@ -127,7 +127,7 @@ class RoomGameInviteMemberFragment : BaseFragment(R.layout.layout_room_game_invi
             return
         }
         val resultList = members.filter {
-            it.shortId.toString().contains(keyword)
+            it.containsKeywordBySearch(keyword)
         }
         if (resultList.isEmpty()) {
             showSearchEmpty()

module/room/src/main/java/com/adealink/weparty/room/share/RoomShareComp.kt

@@ -110,7 +110,7 @@ class RoomShareComp(
         if (shareLink.isNullOrEmpty()) {
             (activity as? BaseActivity)?.showLoading()
             val deeplink = Uri.parse(Router.getDeepLink(Room.Room.PATH)).buildUpon().apply {
-                appendQueryParameter(EXTRA_INVITE_UID_CODE, AccountModule.sid.toString())
+                appendQueryParameter(EXTRA_INVITE_UID_CODE, AccountModule.uid.toString())
                 appendQueryParameter(EXTRA_INVITE_ROOM_ID_CODE, roomId.toString())
                 ShareLinkSource.RoomShare.scene?.let { scene ->
                     appendQueryParameter(EXTRA_INVITE_SHARE_SCENE, scene.toString())

module/search/src/main/java/com/adealink/weparty/search/adapter/region/RegionResultItemViewBinder.kt

@@ -37,7 +37,7 @@ class RegionResultItemViewBinder(val listener: ISearchRegionListener?) :
                 binding.ivIcon.setImageUrl(userInfo.url)
                 binding.tvName.text = userInfo.name
                 binding.tvId.text =
-                    getCompatString(APP_R.string.common_short_id, userInfo.shortId.toString())
+                    getCompatString(APP_R.string.common_short_id, userInfo.uid.toString())
             } else if (roomInfo != null) {
                 //搜索结果是房间信息
                 binding.ivIcon.setIsAsCircle(false)

module/superadmin/src/main/java/com/adealink/weparty/superadmin/userpenalty/UserPenaltyActivity.kt

@@ -217,7 +217,7 @@ class UserPenaltyActivity : BaseActivity(), SelectedPunishmentReasonListener {
         if (reportUid > 0) {
             profileViewModel?.getUidUserInfo(reportUid)?.observe(this) {
                 if (it is Rlt.Success) {
-                    binding.userIdEt.setText(it.data.shortId.toString())
+                    binding.userIdEt.setText(it.data.uid.toString())
                 } else {
                     binding.userIdEt.setText("")
                 }