Merge branch 'branch_new_dev' into branch_new

BaseModule/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.util.Log;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.xscm.moduleutil.base.CommonAppContext;
 
 public class CrashHandler implements Thread.UncaughtExceptionHandler {
@@ -38,6 +39,7 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
     private void restartApp() {
         // 实现应用重启逻辑
         ARouter.getInstance().build(ARouteConstants.ME).navigation();
+        ActivityUtils.finishAllActivities();
         CommonAppContext.getInstance().initialization();
     }
 }

BaseModule/src/main/res/layout/item_like_user.xml

@@ -1,20 +1,18 @@
 <?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"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingVertical="@dimen/dp_5"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="@dimen/dp_40">
 
-    <com.xscm.moduleutil.widget.GifAvatarOvalView
+    <com.xscm.moduleutil.widget.CircularImage
         android:id="@+id/user_icon"
         android:layout_width="@dimen/dp_18"
-        android:layout_height="@dimen/dp_18"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="@dimen/dp_10"
         android:src="@mipmap/default_avatar"
-        android:layout_marginStart="-5dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:riv_oval="true"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>