fix bug cancelAccountFromServer add accessToken

apex-wang · apex-wang · commit 1ea6f25f9644 · 2024-08-13T14:54:37.000+08:00
diff --git a/app/src/main/kotlin/com/hyphenate/chatdemo/common/DemoDataModel.kt b/app/src/main/kotlin/com/hyphenate/chatdemo/common/DemoDataModel.kt
@@ -123,8 +123,8 @@ class DemoDataModel(private val context: Context) {
      */
     fun updateUsersTimes(userIds: List<EaseProfile>) {
         if (userIds.isNotEmpty()) {
-            userIds?.map { it.id }?.let { userIds ->
-                getUserDao().updateUsersTimes(userIds)
+            userIds.map { it.id }.let { ids ->
+                getUserDao().updateUsersTimes(ids)
                 loadContactFromDb()
             }
         }
diff --git a/app/src/main/kotlin/com/hyphenate/chatdemo/repository/EMClientRepository.kt b/app/src/main/kotlin/com/hyphenate/chatdemo/repository/EMClientRepository.kt
@@ -326,6 +326,7 @@ class EMClientRepository: BaseRepository() {
         try {
             val headers: MutableMap<String, String> = java.util.HashMap()
             headers["Content-Type"] = "application/json"
+            headers["Authorization"] = "Bearer ${ChatClient.getInstance().accessToken}"
             val url = "$CANCEL_ACCOUNT/${DemoHelper.getInstance().getDataModel().getPhoneNumber()}"
             EMLog.d("cancelAccountFromServer url : ", url)
             val response =
diff --git a/app/src/main/kotlin/com/hyphenate/chatdemo/ui/contact/ChatContactDetailActivity.kt b/app/src/main/kotlin/com/hyphenate/chatdemo/ui/contact/ChatContactDetailActivity.kt
@@ -175,12 +175,15 @@ class ChatContactDetailActivity:EaseContactDetailsActivity(), IPresenceResultVie
             .post(lifecycleScope, EaseEvent(DemoConstant.EVENT_UPDATE_USER_SUFFIX, EaseEvent.TYPE.CONTACT, user?.userId))
     }
 
-    private fun updatePresence(){
+    private fun updatePresence(isRefreshAvatar:Boolean = false){
         val map = PresenceCache.getPresenceInfo
         user?.let { user->
             map.let {
                 binding.epPresence.getStatusView().visibility = View.VISIBLE
-                binding.epPresence.setUserAvatarData(user.toProfile(),EasePresenceUtil.getPresenceIcon(mContext,it[user.userId]))
+                if (isRefreshAvatar){
+                    binding.epPresence.setUserAvatarData(user.toProfile())
+                }
+                binding.epPresence.setUserStatusData(EasePresenceUtil.getPresenceIcon(mContext,it[user.userId]))
             }
         }
     }
diff --git a/app/src/main/kotlin/com/hyphenate/chatdemo/ui/contact/ChatContactListFragment.kt b/app/src/main/kotlin/com/hyphenate/chatdemo/ui/contact/ChatContactListFragment.kt
@@ -44,7 +44,7 @@ class ChatContactListFragment : EaseContactsListFragment() {
             it.setTitle("")
             it.setTitleEndDrawable(R.drawable.contact_title)
         }
-        updateProfile()
+        updateProfile(true)
     }
 
     override fun initData() {
@@ -56,7 +56,7 @@ class ChatContactListFragment : EaseContactsListFragment() {
         }
         EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE + EaseEvent.TYPE.CONTACT).register(this) {
             if (it.isContactChange && it.event == DemoConstant.EVENT_UPDATE_SELF) {
-                updateProfile()
+                updateProfile(true)
             }
         }
         EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE.name).register(this) {
@@ -95,7 +95,7 @@ class ChatContactListFragment : EaseContactsListFragment() {
        }
     }
 
-    private fun updateProfile(){
+    private fun updateProfile(isRefreshAvatar:Boolean = false){
         binding?.titleContact?.let { titlebar->
             EaseIM.getConfig()?.avatarConfig?.setAvatarStyle(titlebar.getLogoView())
             EaseIM.getConfig()?.avatarConfig?.setStatusStyle(titlebar.getStatusView(),2.dpToPx(mContext),
@@ -111,7 +111,9 @@ class ChatContactListFragment : EaseContactsListFragment() {
                     titlebar.setLogoStatusSize(resources.getDimensionPixelSize(R.dimen.em_title_bar_status_icon_size))
                 }
                 ChatLog.e(TAG,"updateProfile ${profile.id} ${profile.name} ${profile.avatar}")
-                titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))
+                if (isRefreshAvatar){
+                    titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))
+                }
                 val layoutParams = titlebar.getLogoView()?.layoutParams as? ViewGroup.MarginLayoutParams
                 layoutParams?.marginStart = 12.dpToPx(mContext)
                 titlebar.getTitleView().let { text ->
diff --git a/app/src/main/kotlin/com/hyphenate/chatdemo/ui/conversation/ConversationListFragment.kt b/app/src/main/kotlin/com/hyphenate/chatdemo/ui/conversation/ConversationListFragment.kt
@@ -44,15 +44,15 @@ class ConversationListFragment: EaseConversationListFragment() {
             EaseIM.getConfig()?.avatarConfig?.setAvatarStyle(it.getLogoView())
             EaseIM.getConfig()?.avatarConfig?.setStatusStyle(it.getStatusView(),2.dpToPx(mContext),
                 ContextCompat.getColor(mContext, com.hyphenate.easeui.R.color.ease_color_background))
-            updateProfile()
+            updateProfile(true)
             it.setTitleEndDrawable(R.drawable.conversation_title)
         }
     }
 
     private fun initEventBus() {
         EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE + EaseEvent.TYPE.CONTACT).register(this) {
             if (it.isContactChange && it.event == DemoConstant.EVENT_UPDATE_SELF) {
-                updateProfile()
+                updateProfile(true)
             }
         }
 
@@ -83,7 +83,7 @@ class ConversationListFragment: EaseConversationListFragment() {
         }
     }
 
-    private fun updateProfile(){
+    private fun updateProfile(isRefreshAvatar:Boolean = false){
         binding?.titleConversations?.let { titlebar->
             EaseIM.getCurrentUser()?.let { profile->
                 val presence = PresenceCache.getUserPresence(profile.id)
@@ -95,7 +95,9 @@ class ConversationListFragment: EaseConversationListFragment() {
                     titlebar.setLogoStatusSize(resources.getDimensionPixelSize(R.dimen.em_title_bar_status_icon_size))
                 }
                 ChatLog.e("ConversationListFragment","updateProfile ${profile.id} ${profile.name} ${profile.avatar}")
-                titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))
+                if (isRefreshAvatar){
+                    titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))
+                }
                 val layoutParams = titlebar.getLogoView()?.layoutParams as? ViewGroup.MarginLayoutParams
                 layoutParams?.marginStart = 12.dpToPx(mContext)
                 titlebar.getTitleView().let { text ->
diff --git a/app/src/main/kotlin/com/hyphenate/chatdemo/ui/login/AboutMeFragment.kt b/app/src/main/kotlin/com/hyphenate/chatdemo/ui/login/AboutMeFragment.kt
@@ -112,7 +112,7 @@ class AboutMeFragment: EaseBaseFragment<DemoFragmentAboutMeBinding>(), View.OnCl
 
         EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE + EaseEvent.TYPE.CONTACT).register(this) {
             if (it.isContactChange && it.event == DemoConstant.EVENT_UPDATE_SELF) {
-                updatePresence()
+                updatePresence(true)
             }
         }
     }
@@ -140,16 +140,19 @@ class AboutMeFragment: EaseBaseFragment<DemoFragmentAboutMeBinding>(), View.OnCl
         }
     }
 
-    private fun updatePresence(){
+    private fun updatePresence(isRefreshAvatar:Boolean = false){
         EaseIM.getCurrentUser()?.let { user->
             val presence = PresenceCache.getUserPresence(user.id)
             presence?.let {
-                binding?.epPresence?.setUserAvatarData(user,EasePresenceUtil.getPresenceIcon(mContext,it))
-                binding?.epPresence?.getStatusView()?.visibility = View.VISIBLE
-                val subtitle = EasePresenceUtil.getPresenceString(mContext,it)
-                binding?.itemPresence?.setContent(subtitle)
-            }
-            if (presence == null){
+                if (isRefreshAvatar){
+                    binding?.epPresence?.setUserAvatarData(user)
+                }else{
+                    binding?.epPresence?.setUserStatusData(EasePresenceUtil.getPresenceIcon(mContext,it))
+                    binding?.epPresence?.getStatusView()?.visibility = View.VISIBLE
+                    val subtitle = EasePresenceUtil.getPresenceString(mContext,it)
+                    binding?.itemPresence?.setContent(subtitle)
+                }
+            }?:kotlin.run {
                 binding?.epPresence?.setUserAvatarData(user)
             }
             binding?.tvName?.text = user.getNotEmptyName()

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ class DemoDataModel(private val context: Context) {`
`123`	`123`	`*/`
`124`	`124`	`fun updateUsersTimes(userIds: List<EaseProfile>) {`
`125`	`125`	`if (userIds.isNotEmpty()) {`
`126`		`- userIds?.map { it.id }?.let { userIds ->`
`127`		`- getUserDao().updateUsersTimes(userIds)`
	`126`	`+ userIds.map { it.id }.let { ids ->`
	`127`	`+ getUserDao().updateUsersTimes(ids)`
`128`	`128`	`loadContactFromDb()`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,12 +175,15 @@ class ChatContactDetailActivity:EaseContactDetailsActivity(), IPresenceResultVie`
`175`	`175`	`.post(lifecycleScope, EaseEvent(DemoConstant.EVENT_UPDATE_USER_SUFFIX, EaseEvent.TYPE.CONTACT, user?.userId))`
`176`	`176`	`}`
`177`	`177`
`178`		`- private fun updatePresence(){`
	`178`	`+ private fun updatePresence(isRefreshAvatar:Boolean = false){`
`179`	`179`	`val map = PresenceCache.getPresenceInfo`
`180`	`180`	`user?.let { user->`
`181`	`181`	`map.let {`
`182`	`182`	`binding.epPresence.getStatusView().visibility = View.VISIBLE`
`183`		`- binding.epPresence.setUserAvatarData(user.toProfile(),EasePresenceUtil.getPresenceIcon(mContext,it[user.userId]))`
	`183`	`+ if (isRefreshAvatar){`
	`184`	`+ binding.epPresence.setUserAvatarData(user.toProfile())`
	`185`	`+ }`
	`186`	`+ binding.epPresence.setUserStatusData(EasePresenceUtil.getPresenceIcon(mContext,it[user.userId]))`
`184`	`187`	`}`
`185`	`188`	`}`
`186`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class ChatContactListFragment : EaseContactsListFragment() {`
`44`	`44`	`it.setTitle("")`
`45`	`45`	`it.setTitleEndDrawable(R.drawable.contact_title)`
`46`	`46`	`}`
`47`		`- updateProfile()`
	`47`	`+ updateProfile(true)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`override fun initData() {`
`@@ -56,7 +56,7 @@ class ChatContactListFragment : EaseContactsListFragment() {`
`56`	`56`	`}`
`57`	`57`	`EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE + EaseEvent.TYPE.CONTACT).register(this) {`
`58`	`58`	`if (it.isContactChange && it.event == DemoConstant.EVENT_UPDATE_SELF) {`
`59`		`- updateProfile()`
	`59`	`+ updateProfile(true)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE.name).register(this) {`
`@@ -95,7 +95,7 @@ class ChatContactListFragment : EaseContactsListFragment() {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- private fun updateProfile(){`
	`98`	`+ private fun updateProfile(isRefreshAvatar:Boolean = false){`
`99`	`99`	`binding?.titleContact?.let { titlebar->`
`100`	`100`	`EaseIM.getConfig()?.avatarConfig?.setAvatarStyle(titlebar.getLogoView())`
`101`	`101`	`EaseIM.getConfig()?.avatarConfig?.setStatusStyle(titlebar.getStatusView(),2.dpToPx(mContext),`
`@@ -111,7 +111,9 @@ class ChatContactListFragment : EaseContactsListFragment() {`
`111`	`111`	`titlebar.setLogoStatusSize(resources.getDimensionPixelSize(R.dimen.em_title_bar_status_icon_size))`
`112`	`112`	`}`
`113`	`113`	`ChatLog.e(TAG,"updateProfile ${profile.id} ${profile.name} ${profile.avatar}")`
`114`		`- titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))`
	`114`	`+ if (isRefreshAvatar){`
	`115`	`+ titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))`
	`116`	`+ }`
`115`	`117`	`val layoutParams = titlebar.getLogoView()?.layoutParams as? ViewGroup.MarginLayoutParams`
`116`	`118`	`layoutParams?.marginStart = 12.dpToPx(mContext)`
`117`	`119`	`titlebar.getTitleView().let { text ->`
Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,15 @@ class ConversationListFragment: EaseConversationListFragment() {`
`44`	`44`	`EaseIM.getConfig()?.avatarConfig?.setAvatarStyle(it.getLogoView())`
`45`	`45`	`EaseIM.getConfig()?.avatarConfig?.setStatusStyle(it.getStatusView(),2.dpToPx(mContext),`
`46`	`46`	`ContextCompat.getColor(mContext, com.hyphenate.easeui.R.color.ease_color_background))`
`47`		`- updateProfile()`
	`47`	`+ updateProfile(true)`
`48`	`48`	`it.setTitleEndDrawable(R.drawable.conversation_title)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`private fun initEventBus() {`
`53`	`53`	`EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE + EaseEvent.TYPE.CONTACT).register(this) {`
`54`	`54`	`if (it.isContactChange && it.event == DemoConstant.EVENT_UPDATE_SELF) {`
`55`		`- updateProfile()`
	`55`	`+ updateProfile(true)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`@@ -83,7 +83,7 @@ class ConversationListFragment: EaseConversationListFragment() {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- private fun updateProfile(){`
	`86`	`+ private fun updateProfile(isRefreshAvatar:Boolean = false){`
`87`	`87`	`binding?.titleConversations?.let { titlebar->`
`88`	`88`	`EaseIM.getCurrentUser()?.let { profile->`
`89`	`89`	`val presence = PresenceCache.getUserPresence(profile.id)`
`@@ -95,7 +95,9 @@ class ConversationListFragment: EaseConversationListFragment() {`
`95`	`95`	`titlebar.setLogoStatusSize(resources.getDimensionPixelSize(R.dimen.em_title_bar_status_icon_size))`
`96`	`96`	`}`
`97`	`97`	`ChatLog.e("ConversationListFragment","updateProfile ${profile.id} ${profile.name} ${profile.avatar}")`
`98`		`- titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))`
	`98`	`+ if (isRefreshAvatar){`
	`99`	`+ titlebar.setLogo(profile.avatar, com.hyphenate.easeui.R.drawable.ease_default_avatar, 32.dpToPx(mContext))`
	`100`	`+ }`
`99`	`101`	`val layoutParams = titlebar.getLogoView()?.layoutParams as? ViewGroup.MarginLayoutParams`
`100`	`102`	`layoutParams?.marginStart = 12.dpToPx(mContext)`
`101`	`103`	`titlebar.getTitleView().let { text ->`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class AboutMeFragment: EaseBaseFragment<DemoFragmentAboutMeBinding>(), View.OnCl`
`112`	`112`
`113`	`113`	`EaseFlowBus.with<EaseEvent>(EaseEvent.EVENT.UPDATE + EaseEvent.TYPE.CONTACT).register(this) {`
`114`	`114`	`if (it.isContactChange && it.event == DemoConstant.EVENT_UPDATE_SELF) {`
`115`		`- updatePresence()`
	`115`	`+ updatePresence(true)`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
`@@ -140,16 +140,19 @@ class AboutMeFragment: EaseBaseFragment<DemoFragmentAboutMeBinding>(), View.OnCl`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`- private fun updatePresence(){`
	`143`	`+ private fun updatePresence(isRefreshAvatar:Boolean = false){`
`144`	`144`	`EaseIM.getCurrentUser()?.let { user->`
`145`	`145`	`val presence = PresenceCache.getUserPresence(user.id)`
`146`	`146`	`presence?.let {`
`147`		`- binding?.epPresence?.setUserAvatarData(user,EasePresenceUtil.getPresenceIcon(mContext,it))`
`148`		`- binding?.epPresence?.getStatusView()?.visibility = View.VISIBLE`
`149`		`- val subtitle = EasePresenceUtil.getPresenceString(mContext,it)`
`150`		`- binding?.itemPresence?.setContent(subtitle)`
`151`		`- }`
`152`		`- if (presence == null){`
	`147`	`+ if (isRefreshAvatar){`
	`148`	`+ binding?.epPresence?.setUserAvatarData(user)`
	`149`	`+ }else{`
	`150`	`+ binding?.epPresence?.setUserStatusData(EasePresenceUtil.getPresenceIcon(mContext,it))`
	`151`	`+ binding?.epPresence?.getStatusView()?.visibility = View.VISIBLE`
	`152`	`+ val subtitle = EasePresenceUtil.getPresenceString(mContext,it)`
	`153`	`+ binding?.itemPresence?.setContent(subtitle)`
	`154`	`+ }`
	`155`	`+ }?:kotlin.run {`
`153`	`156`	`binding?.epPresence?.setUserAvatarData(user)`
`154`	`157`	`}`
`155`	`158`	`binding?.tvName?.text = user.getNotEmptyName()`