merge

.idea/misc.xml

@@ -88,6 +88,7 @@
         <entry key="home/src/main/res/layout/activity_home.xml" value="0.25" />
         <entry key="home/src/main/res/layout/activity_official_message.xml" value="0.36302083333333335" />
         <entry key="home/src/main/res/layout/activity_search.xml" value="0.39166666666666666" />
+        <entry key="home/src/main/res/layout/dialog_update.xml" value="0.39166666666666666" />
         <entry key="home/src/main/res/layout/fragment_follow.xml" value="0.35" />
         <entry key="home/src/main/res/layout/fragment_home.xml" value="0.25" />
         <entry key="home/src/main/res/layout/fragment_hot.xml" value="0.35" />
@@ -160,12 +161,56 @@
         <entry key="tuikit/src/main/res/layout/chat_input_layout.xml" value="0.3015625" />
         <entry key="tuikit/src/main/res/layout/chat_inputmore_layout.xml" value="0.2296875" />
         <entry key="tuikit/src/main/res/layout/chat_layout.xml" value="0.303125" />
+        <entry key="tuikit/src/main/res/layout/chat_notice_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/contact_friend_profile_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/contact_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/contact_list.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/contact_selecable_adapter_item.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/conversation_adapter.xml" value="0.20833333333333334" />
+        <entry key="tuikit/src/main/res/layout/conversation_custom_adapter.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/conversation_forward_label_adapter.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/conversation_forward_select_adapter.xml" value="0.22083333333333333" />
         <entry key="tuikit/src/main/res/layout/conversation_layout.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/conversation_search_adapter.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/face_group_icon.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_activity.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_chat_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_contact_selector_item.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_dialog_layout.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/forward_fragment.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_message_adapter_item_content.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/forward_select_group_contact.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/fragment_face.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/group_apply_manager_activity.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/group_apply_manager_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/group_member_pop_menu.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/item_contact_search.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/item_converation_search.xml" value="0.39166666666666666" />
+        <entry key="tuikit/src/main/res/layout/item_face.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/layout_dialog.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/layout_ensure_dialog.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/layout_face_grid.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/line_controller_view.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/loading_progress_bar.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/message_adapter_content_audio.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/message_adapter_content_file.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/message_adapter_content_image.xml" value="0.303125" />
+        <entry key="tuikit/src/main/res/layout/message_adapter_content_text.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/message_adapter_content_tips.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/message_adapter_item_content.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/message_adapter_item_empty.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/pop_dialog_adapter.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/pop_menu_adapter.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/pop_menu_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/popup_start_group_chat_activity.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/popup_start_group_select_activity.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/profile_icon_view.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/search_main_activity.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/search_more_msg_activity.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/selection_activity.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/title_bar_layout.xml" value="0.3015625" />
+        <entry key="tuikit/src/main/res/layout/view_dialog.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/drawable/progress_bar.xml" value="0.3333333333333333" />
         <entry key="user/src/main/res/drawable/shape_37393f_444652.xml" value="0.33177083333333335" />
         <entry key="user/src/main/res/drawable/shape_c3a165_ead6a7_top_10.xml" value="0.3333333333333333" />

baseswago/src/main/java/com/swago/baseswago/activity/WebViewActivity.kt

@@ -1,6 +1,7 @@
 package com.swago.baseswago.activity
 
 import android.annotation.SuppressLint
+import android.view.KeyEvent
 import android.view.ViewGroup
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
@@ -109,4 +110,43 @@ class WebViewActivity : BaseXActivity<ActivityWebBinding>() {
     }
 
     override fun initLiveData() {}
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            webView?.let { webView->
+                if (webView.canGoBack()) {
+                    webView.url?.let {
+                        if (it.contains(url)) {
+                            webView.goBack()
+                        } else {
+                           finish()
+                        }
+                    }
+                } else {
+                    finish()
+                }
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        try {
+            webView?.apply {
+                webChromeClient = null
+                stopLoading()
+                clearHistory()
+                removeAllViews()
+                clearCache(true)
+                destroy()
+                binding.root.removeAllViews()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+
 }

baseswago/src/main/java/com/swago/baseswago/util/SwagoInfo.kt

@@ -13,7 +13,7 @@ object SwagoInfo {
     private var versionCode = ""
     private var languageCode = "en"
     private var appClient = "android"
-    private var channel = "DDD01"
+    private var channel = "DDD02"
 
     fun isGooglePackage():Boolean{
         return false

baseswago/src/main/res/values-in/strings.xml

@@ -66,8 +66,8 @@
     <string name="weekly">Mingguan</string>
     <string name="monthly">Bulanan</string>
     <string name="need_exp">Poin pengalaman yang diperlukan</string>
-    <string name="exp_explain">Untuk setiap hadiah 10 koin yg dikasih, poin pengalaman +1</string>
-    <string name="exp_explain2">ntuk setiap hadiah 10 koin yang diterima, poin pengalaman +1</string>
+    <string name="exp_explain">Untuk setiap hadiah 100 koin yg dikasih, poin pengalaman +1</string>
+    <string name="exp_explain2">ntuk setiap hadiah 100 koin yang diterima, poin pengalaman +1</string>
     <string name="report">Laporan</string>
     <string name="report_success">Melaporkan sukses</string>
     <string name="report_one">Konten kasar atau sexsual</string>

baseswago/src/main/res/values-zh/strings.xml

@@ -66,8 +66,8 @@
     <string name="weekly">周榜</string>
     <string name="monthly">月榜</string>
     <string name="need_exp">所需经验值</string>
-    <string name="exp_explain">每送出10金币的礼物，经验值+1</string>
-    <string name="exp_explain2">每收到10金币的礼物，经验值+1</string>
+    <string name="exp_explain">每送出100金币的礼物，经验值+1</string>
+    <string name="exp_explain2">每收到100金币的礼物，经验值+1</string>
     <string name="report">举报</string>
     <string name="report_success">举报成功</string>
     <string name="report_one">粗俗或色情</string>

baseswago/src/main/res/values/strings.xml

@@ -69,8 +69,8 @@
     <string name="weekly">Weekly</string>
     <string name="monthly">Monthly</string>
     <string name="need_exp">Required experience points</string>
-    <string name="exp_explain">For every gift of 10 gold coins, experience points +1</string>
-    <string name="exp_explain2">For every gift of 10 gold coins received, experience points +1</string>
+    <string name="exp_explain">For every gift of 100 gold coins, experience points +1</string>
+    <string name="exp_explain2">For every gift of 100 gold coins received, experience points +1</string>
     <string name="report">Report</string>
     <string name="report_success">Report success</string>
     <string name="report_one">Vulgar or pornographic content</string>

home/src/main/AndroidManifest.xml

@@ -11,8 +11,6 @@
             android:screenOrientation="portrait"/>
         <activity android:name=".search.SearchActivity"
             android:screenOrientation="portrait"/>
-        <activity android:name=".web.CommonWebActivity"
-            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

home/src/main/java/com/swago/home/innerhome/HotFragment.kt

@@ -12,6 +12,7 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.swago.baseswago.constant.ARouteConstant
+import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.cusview.SwagoRecyclerView
 import com.swago.baseswago.fragment.BaseListFragment
 import com.swago.baseswago.fragment.BaseXFragment
@@ -70,7 +71,11 @@ class HotFragment : BaseListFragment<FragmentHotBinding, MomentModel>() {
             ?.setAdapter(bannerAdapter)
             ?.setIndicator(CircleIndicator(context))
             ?.setOnBannerListener { data, _ ->
-
+                if (data is BannerModel){
+                    ARouter.getInstance().build(ARouteConstant.Base.webView)
+                        .withString("url", data.rotation_url)
+                        .navigation()
+                }
             }
 
         smartRecyclerView.recyclerView?.addItemDecoration(HomeGridItemDecoration())

home/src/main/java/com/swago/home/update/UpdateDialog.kt

@@ -0,0 +1,19 @@
+package com.swago.home.update
+
+import com.swago.baseswago.dialog.BaseXDFragment
+import com.swago.home.databinding.DialogUpdateBinding
+
+/**
+ *@date 2022/3/31 13:35
+ *description:
+ */
+class UpdateDialog : BaseXDFragment<DialogUpdateBinding>() {
+
+    override fun initOther() {
+    }
+
+    override fun initLiveData() {
+    }
+
+
+}

home/src/main/res/layout/activity_search.xml

@@ -30,7 +30,7 @@
         android:layout_marginStart="60dp"
         android:layout_marginEnd="20dp"
         android:textSize="12dp"
-        android:paddingStart="35dp"
+        android:paddingStart="10dp"
         android:hint="@string/search_name_or_id"
         android:textColorHint="#868686"
         android:background="@drawable/shape_white_20"
@@ -40,7 +40,7 @@
 
     <ImageView
         android:id="@+id/ivSearch"
-        app:layout_constraintStart_toStartOf="@+id/etInput"
+        app:layout_constraintEnd_toEndOf="@+id/etInput"
         app:layout_constraintTop_toTopOf="@+id/toolbar"
         app:layout_constraintBottom_toBottomOf="@+id/toolbar"
         android:src="@mipmap/icon_search"

home/src/main/res/layout/dialog_update.xml

@@ -0,0 +1,47 @@
+<?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="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/clRoot"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:background="@mipmap/bg_update"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <com.swago.baseswago.cusview.BoldTextView
+            android:id="@+id/tv"
+            android:textSize="16dp"
+            android:textColor="#131B23"
+            android:text="Version update"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="138dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvDescribe"
+            app:layout_constraintStart_toStartOf="@+id/tv"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:textSize="14dp"
+            app:layout_constraintTop_toBottomOf="@+id/tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -14,6 +14,7 @@ import com.facebook.internal.AppCall
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.swago.baseswago.GradientIndicator
+import com.swago.baseswago.PayVm
 import com.swago.baseswago.SwagoAdapter
 import com.swago.baseswago.baseroom.SwagoRoomManager
 import com.swago.baseswago.dialog.BaseXDFragment
@@ -38,6 +39,7 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.Simple
 class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
 
     private val giftVm by viewModels<GiftVm>()
+    private val payVm by viewModels<PayVm>()
     private var giftBatch = 0
     private var returnGiftBatch = 0
     private var receiveId = ""
@@ -87,6 +89,7 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
 
     override fun initOther() {
         arguments?.let {
+            payVm.getCoins()
             receiveId = it.getString("receiveId", "")
             receiveName = it.getString("receiveName", "")
 
@@ -170,7 +173,8 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     simplePagerTitleView.text = titleList[index]
                     val padding = DpPxUtil.dip2px(15f).toFloat()
                     simplePagerTitleView.textSize = 16f
-                    simplePagerTitleView.typeface = Typeface.createFromAsset(AppContext.getContext().assets,"bold.otf")
+                    simplePagerTitleView.typeface =
+                        Typeface.createFromAsset(AppContext.getContext().assets, "bold.otf")
                     simplePagerTitleView.setPadding(padding.toInt(), 0, padding.toInt(), 0)
                     simplePagerTitleView.normalColor = Color.parseColor("#828C9D")
                     simplePagerTitleView.selectedColor = Color.parseColor("#ffffff")
@@ -353,11 +357,15 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     binding.tvCoins.text = it.user_coins ?: "0"
                     returnGiftBatch = it.gift_batch
                 }
-            }else{
+            } else {
                 val payDialog = PayDialog.newInstance()
                 payDialog.show(parentFragmentManager, "PayDialog")
                 dismissAllowingStateLoss()
             }
         }
+
+        payVm.coinLiveData.observe(this) {
+            UserInfo.getUserInfo()?.user_coins = it.user_coins
+        }
     }
 }

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/TUIKitImpl.java

@@ -5,6 +5,7 @@ import static com.tencent.qcloud.tim.uikit.utils.NetWorkUtils.sIMSDKConnected;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -52,6 +53,36 @@ public class TUIKitImpl {
     private static TUIKitConfigs         sConfigs;
     private static List<IMEventListener> sIMEventListeners = new ArrayList<>();
     private static Gson                  sGson;
+
+    private static V2TIMAdvancedMsgListener listener = new V2TIMAdvancedMsgListener() {
+        @Override
+        public void onRecvNewMessage(V2TIMMessage msg) {
+            Log.d("消息","dddd");
+            if(TextUtils.isEmpty(msg.getGroupID())) {
+                return;
+            }
+            for (IMEventListener l : sIMEventListeners) {
+                Log.d("监听","dddd");
+                l.onNewMessage(msg);
+            }
+        }
+
+        @Override
+        public void onRecvC2CReadReceipt(List<V2TIMMessageReceipt> receiptList) {
+            C2CChatManagerKit.getInstance().onReadReport(receiptList);
+        }
+
+        @Override
+        public void onRecvMessageRevoked(String msgID) {
+            super.onRecvMessageRevoked(msgID);
+        }
+
+        @Override
+        public void onRecvMessageModified(V2TIMMessage msg) {
+            TUIKitLog.i(TAG, "onRecvMessageModified msgID:" + msg.getMsgID());
+        }
+    };
+
     /**
      * TUIKit的初始化函数
      *
@@ -359,37 +390,13 @@ public class TUIKitImpl {
             }
         });*/
 
-        V2TIMManager.getMessageManager().addAdvancedMsgListener(new V2TIMAdvancedMsgListener() {
-            @Override
-            public void onRecvNewMessage(V2TIMMessage msg) {
-                if(TextUtils.isEmpty(msg.getGroupID())) {
-                    return;
-                }
-                for (IMEventListener l : sIMEventListeners) {
-                    l.onNewMessage(msg);
-                }
-            }
-
-            @Override
-            public void onRecvC2CReadReceipt(List<V2TIMMessageReceipt> receiptList) {
-                C2CChatManagerKit.getInstance().onReadReport(receiptList);
-            }
-
-            @Override
-            public void onRecvMessageRevoked(String msgID) {
-                super.onRecvMessageRevoked(msgID);
-            }
-
-            @Override
-            public void onRecvMessageModified(V2TIMMessage msg) {
-                TUIKitLog.i(TAG, "onRecvMessageModified msgID:" + msg.getMsgID());
-            }
-        });
+        V2TIMManager.getMessageManager().addAdvancedMsgListener(listener);
 
         V2TIMManager.getMessageManager().addAdvancedMsgListener(MessageRevokedManager.getInstance());
     }
 
     public static void unInit() {
+        V2TIMManager.getMessageManager().removeAdvancedMsgListener(listener);
         ConversationManagerKit.getInstance().destroyConversation();
         unInitTUIKitLive();
     }

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/chat/layout/message/holder/MessageContentHolder.java

@@ -1,27 +1,27 @@
 package com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder;
 
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.swago.baseswago.util.UserInfo;
 import com.tencent.imsdk.v2.V2TIMMessage;
 import com.tencent.qcloud.tim.uikit.R;
-import com.tencent.qcloud.tim.uikit.component.gatherimage.UserIconView;
 import com.tencent.qcloud.tim.uikit.config.TUIKitConfigs;
 import com.tencent.qcloud.tim.uikit.modules.message.MessageInfo;
 
-import java.util.ArrayList;
-import java.util.List;
+import de.hdodenhof.circleimageview.CircleImageView;
 
 public abstract class MessageContentHolder extends MessageEmptyHolder {
 
-    public UserIconView leftUserIcon;
-    public UserIconView rightUserIcon;
+    public CircleImageView leftUserIcon;
+    public CircleImageView rightUserIcon;
     public TextView usernameText;
     public LinearLayout msgContentLinear;
     public ProgressBar sendingProgress;
@@ -55,33 +55,6 @@ public abstract class MessageContentHolder extends MessageEmptyHolder {
             leftUserIcon.setVisibility(View.VISIBLE);
             rightUserIcon.setVisibility(View.GONE);
         }
-        if (properties.getAvatar() != 0) {
-            leftUserIcon.setDefaultImageResId(properties.getAvatar());
-            rightUserIcon.setDefaultImageResId(properties.getAvatar());
-        } else {
-            leftUserIcon.setDefaultImageResId(R.drawable.default_head);
-            rightUserIcon.setDefaultImageResId(R.drawable.default_head);
-        }
-        if (properties.getAvatarRadius() != 0) {
-            leftUserIcon.setRadius(properties.getAvatarRadius());
-            rightUserIcon.setRadius(properties.getAvatarRadius());
-        } else {
-            leftUserIcon.setRadius(5);
-            rightUserIcon.setRadius(5);
-        }
-        if (properties.getAvatarSize() != null && properties.getAvatarSize().length == 2) {
-            ViewGroup.LayoutParams params = leftUserIcon.getLayoutParams();
-            params.width = properties.getAvatarSize()[0];
-            params.height = properties.getAvatarSize()[1];
-            leftUserIcon.setLayoutParams(params);
-
-            params = rightUserIcon.getLayoutParams();
-            params.width = properties.getAvatarSize()[0];
-            params.height = properties.getAvatarSize()[1];
-            rightUserIcon.setLayoutParams(params);
-        }
-        leftUserIcon.invokeInformation(msg);
-        rightUserIcon.invokeInformation(msg);
 
         //// 用户昵称设置
         if (msg.isSelf()) { // 默认不显示自己的昵称
@@ -109,6 +82,15 @@ public abstract class MessageContentHolder extends MessageEmptyHolder {
         }
         // 聊天界面设置头像和昵称
         V2TIMMessage timMessage = msg.getTimMessage();
+        if (timMessage != null) {
+            if (timMessage.isSelf()) {
+                if (UserInfo.INSTANCE.getUserInfo() != null) {
+                    Glide.with(rightUserIcon.getContext()).load(UserInfo.INSTANCE.getUserInfo().getUser_head_img_url()).placeholder(R.mipmap.default_avatar).error(R.mipmap.default_avatar).into(rightUserIcon);
+                }
+            } else {
+                Glide.with(leftUserIcon.getContext()).load(timMessage.getFaceUrl()).placeholder(R.mipmap.default_avatar).error(R.mipmap.default_avatar).into(leftUserIcon);
+            }
+        }
         if (!TextUtils.isEmpty(timMessage.getNameCard())) {
             usernameText.setText(timMessage.getNameCard());
         } else if (!TextUtils.isEmpty(timMessage.getFriendRemark())) {
@@ -119,16 +101,6 @@ public abstract class MessageContentHolder extends MessageEmptyHolder {
             usernameText.setText(timMessage.getSender());
         }
 
-        if (!TextUtils.isEmpty(timMessage.getFaceUrl())) {
-            List<Object> urllist = new ArrayList<>();
-            urllist.add(timMessage.getFaceUrl());
-            if (msg.isSelf()) {
-                rightUserIcon.setIconUrls(urllist);
-            } else {
-                leftUserIcon.setIconUrls(urllist);
-            }
-        }
-
         if (msg.isSelf()) {
             if (msg.getStatus() == MessageInfo.MSG_STATUS_SEND_FAIL
                     || msg.getStatus() == MessageInfo.MSG_STATUS_SEND_SUCCESS

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/conversation/ConversationManagerKit.java

@@ -239,6 +239,7 @@ public class ConversationManagerKit implements MessageRevokedManager.MessageRevo
 
         info.setShowDisturbIcon(conversation.getRecvOpt() == V2TIMMessage.V2TIM_NOT_RECEIVE_MESSAGE ? true : false);
         info.setConversationId(conversation.getConversationID());
+        info.setConversationFaceUrl(conversation.getFaceUrl());
         info.setGroup(isGroup);
         // AVChatRoom 不支持未读数。
         if (!V2TIMManager.GROUP_TYPE_AVCHATROOM.equals(conversation.getGroupType())) {

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/conversation/base/ConversationInfo.java

@@ -1,7 +1,6 @@
 package com.tencent.qcloud.tim.uikit.modules.conversation.base;
 
 import android.graphics.Bitmap;
-import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
@@ -99,6 +98,8 @@ public class ConversationInfo implements Serializable, Comparable<ConversationIn
      */
     private long orderKey;
 
+    private String conversationFaceUrl;
+
     public ConversationInfo() {
 
     }
@@ -222,6 +223,14 @@ public class ConversationInfo implements Serializable, Comparable<ConversationIn
         return orderKey;
     }
 
+    public String getConversationFaceUrl() {
+        return conversationFaceUrl;
+    }
+
+    public void setConversationFaceUrl(String conversationFaceUrl) {
+        this.conversationFaceUrl = conversationFaceUrl;
+    }
+
     @Override
     public int compareTo(@NonNull ConversationInfo other) {
         long thisOrderKey = this.orderKey;

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/conversation/holder/ConversationCommonHolder.java

@@ -9,12 +9,12 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.tencent.qcloud.tim.uikit.R;
 import com.tencent.qcloud.tim.uikit.TUIKit;
-import com.tencent.qcloud.tim.uikit.base.TUIKitListenerManager;
 import com.tencent.qcloud.tim.uikit.base.TUIConversationControllerListener;
+import com.tencent.qcloud.tim.uikit.base.TUIKitListenerManager;
 import com.tencent.qcloud.tim.uikit.component.face.FaceManager;
-import com.tencent.qcloud.tim.uikit.modules.conversation.base.ConversationIconView;
 import com.tencent.qcloud.tim.uikit.modules.conversation.base.ConversationInfo;
 import com.tencent.qcloud.tim.uikit.modules.conversation.base.DraftInfo;
 import com.tencent.qcloud.tim.uikit.modules.message.MessageInfo;
@@ -26,9 +26,11 @@ import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
 public class ConversationCommonHolder extends ConversationBaseHolder {
 
-    public ConversationIconView conversationIconView;
+    public CircleImageView conversationIconView;
     protected LinearLayout leftItemLayout;
     protected TextView titleText;
     protected TextView messageText;
@@ -126,7 +128,6 @@ public class ConversationCommonHolder extends ConversationBaseHolder {
             }
         }
 
-        conversationIconView.setRadius(mAdapter.getItemAvatarRadius());
         if (mAdapter.getItemDateTextSize() != 0) {
             timelineText.setTextSize(mAdapter.getItemDateTextSize());
         }
@@ -140,10 +141,12 @@ public class ConversationCommonHolder extends ConversationBaseHolder {
             unreadText.setVisibility(View.GONE);
         }
 
-        if (conversation.getIconUrlList() != null) {
-            conversationIconView.setConversation(conversation);
-        }
+        if(conversation.getLastMessage()!=null&&conversation.getLastMessage().getTimMessage()!=null) {
+            Glide.with(itemView.getContext()).load(conversation.getConversationFaceUrl())
+                    .placeholder(R.mipmap.default_avatar)
+                    .error(R.mipmap.default_avatar).into(conversationIconView);
 
+        }
         if (conversation.isShowDisturbIcon()) {
             disturbView.setVisibility(View.VISIBLE);
         } else {

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/forward/message/ForwardMessageBaseHolder.java

@@ -1,11 +1,9 @@
 package com.tencent.qcloud.tim.uikit.modules.forward.message;
 
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -15,24 +13,11 @@ import com.tencent.qcloud.tim.uikit.TUIKit;
 import com.tencent.qcloud.tim.uikit.base.IBaseViewHolder;
 import com.tencent.qcloud.tim.uikit.base.TUIChatControllerListener;
 import com.tencent.qcloud.tim.uikit.base.TUIKitListenerManager;
-import com.tencent.qcloud.tim.uikit.component.face.FaceManager;
-import com.tencent.qcloud.tim.uikit.config.TUIKitConfigs;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.MessageLayout;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.MessageLayoutUI;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.MessageListAdapter;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageAudioHolder;
 import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageContentHolder;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageCustomHolder;
 import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageEmptyHolder;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageFileHolder;
 import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageForwardHolder;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageImageHolder;
-import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.holder.MessageTextHolder;
 import com.tencent.qcloud.tim.uikit.modules.message.MessageInfo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public abstract class ForwardMessageBaseHolder extends MessageContentHolder {
 
 
@@ -54,20 +39,7 @@ public abstract class ForwardMessageBaseHolder extends MessageContentHolder {
             leftUserIcon.setVisibility(View.VISIBLE);
             rightUserIcon.setVisibility(View.GONE);
         }
-        if (properties.getAvatar() != 0) {
-            leftUserIcon.setDefaultImageResId(properties.getAvatar());
-            rightUserIcon.setDefaultImageResId(properties.getAvatar());
-        } else {
-            leftUserIcon.setDefaultImageResId(R.drawable.default_head);
-            rightUserIcon.setDefaultImageResId(R.drawable.default_head);
-        }
-        if (properties.getAvatarRadius() != 0) {
-            leftUserIcon.setRadius(properties.getAvatarRadius());
-            rightUserIcon.setRadius(properties.getAvatarRadius());
-        } else {
-            leftUserIcon.setRadius(5);
-            rightUserIcon.setRadius(5);
-        }
+
         if (properties.getAvatarSize() != null && properties.getAvatarSize().length == 2) {
             ViewGroup.LayoutParams params = leftUserIcon.getLayoutParams();
             params.width = properties.getAvatarSize()[0];
@@ -79,8 +51,6 @@ public abstract class ForwardMessageBaseHolder extends MessageContentHolder {
             params.height = properties.getAvatarSize()[1];
             rightUserIcon.setLayoutParams(params);
         }
-        leftUserIcon.invokeInformation(msg);
-        rightUserIcon.invokeInformation(msg);
 
         //// 用户昵称设置
         if (msg.isSelf()) { // 默认不显示自己的昵称
@@ -119,16 +89,6 @@ public abstract class ForwardMessageBaseHolder extends MessageContentHolder {
             usernameText.setText(timMessage.getSender());
         }
 
-        if (!TextUtils.isEmpty(timMessage.getFaceUrl())) {
-            List<Object> urllist = new ArrayList<>();
-            urllist.add(timMessage.getFaceUrl());
-            if (msg.isSelf()) {
-                rightUserIcon.setIconUrls(urllist);
-            } else {
-                leftUserIcon.setIconUrls(urllist);
-            }
-        }
-
         if (msg.isSelf()) {
             if (msg.getStatus() == MessageInfo.MSG_STATUS_SEND_FAIL
                     || msg.getStatus() == MessageInfo.MSG_STATUS_SEND_SUCCESS

tuikit/src/main/res/layout/conversation_adapter.xml

@@ -18,7 +18,7 @@
         android:layout_marginRight="6.23dp"
         android:visibility="gone" />
 
-        <com.tencent.qcloud.tim.uikit.modules.conversation.base.ConversationIconView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/conversation_icon"
             android:layout_width="@dimen/conversation_avatar_width"
             android:layout_height="@dimen/conversation_avatar_height" />

tuikit/src/main/res/layout/message_adapter_item_content.xml

@@ -39,24 +39,22 @@
         android:layout_width="match_parent">
 
 
-        <com.tencent.qcloud.tim.uikit.component.gatherimage.UserIconView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/left_user_icon_view"
             android:layout_width="41dp"
             android:layout_height="41dp"
             android:layout_alignParentLeft="true"
             android:layout_marginRight="6.23dp"
-            app:default_image="@drawable/default_user_icon"
-            app:image_radius="20dp"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            android:scaleType="centerCrop"/>
 
-        <com.tencent.qcloud.tim.uikit.component.gatherimage.UserIconView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/right_user_icon_view"
             android:layout_width="41dp"
             android:layout_height="41dp"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="6.23dp"
-            app:default_image="@drawable/default_user_icon"
-            app:image_radius="20dp"
+            android:scaleType="centerCrop"
             android:visibility="gone"/>
 
         <TextView

user/src/main/java/com/swago/user/SettingActivity.kt

@@ -63,6 +63,7 @@ class SettingActivity : BaseXActivity<ActivitySettingBinding>() {
                 override fun onSuccess(data: Any?) {}
                 override fun onError(module: String?, errCode: Int, errMsg: String?) {}
             })
+            TUIKit.unInit()
             ARouter.getInstance().build(ARouteConstant.Login.login)
                 .withFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
                 .navigation()

user/src/main/res/layout/fragment_anchor_level.xml

@@ -163,6 +163,8 @@
         android:layout_marginStart="15dp"
         android:layout_marginEnd="15dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="10dp"
+        android:layout_height="0dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>