From 4d9dbadea5d43959b0bebadfc1ffd02911fd4541 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 14 Feb 2023 14:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E5=A4=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=86=85=E5=AD=98=E7=82=B9=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AA=E9=80=80=E5=9B=9E=E5=88=B0=E9=A6=96=E9=A1=B5=E5=90=8E?=
 =?UTF-8?q?=E6=98=AF=E9=BB=98=E8=AE=A4=E5=9C=A8=E7=A4=BE=E5=8C=BA=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E8=BF=9E=E4=B8=8D=E4=B8=8AIM=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yunbao/common/custom/TabButtonGroup.java | 3 +++
 .../main/java/com/yunbao/live/views/CustomViewHolder.java  | 4 ++++
 live/src/main/res/layout/view_start_level.xml              | 6 +++---
 .../main/java/com/yunbao/main/activity/MainActivity.java   | 7 +++++++
 .../java/com/yunbao/main/views/MainHomeViewHolder.java     | 2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/custom/TabButtonGroup.java b/common/src/main/java/com/yunbao/common/custom/TabButtonGroup.java
index 6f8d14c52..d2e0c7682 100644
--- a/common/src/main/java/com/yunbao/common/custom/TabButtonGroup.java
+++ b/common/src/main/java/com/yunbao/common/custom/TabButtonGroup.java
@@ -75,6 +75,9 @@ public class TabButtonGroup extends LinearLayout implements View.OnClickListener
         }
     }
 
+    public int getCurPosition() {
+        return mCurPosition;
+    }
 
     @Override
     public void onClick(View v) {
diff --git a/live/src/main/java/com/yunbao/live/views/CustomViewHolder.java b/live/src/main/java/com/yunbao/live/views/CustomViewHolder.java
index 085d8de5a..9a5c5fb36 100644
--- a/live/src/main/java/com/yunbao/live/views/CustomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/CustomViewHolder.java
@@ -37,6 +37,10 @@ public class CustomViewHolder implements BannerViewHolder<BannerBean> {
         TextView targetAssist = contextView.findViewById(R.id.target_assist_num);
         TextView currentAssist = contextView.findViewById(R.id.current_assist_num);
         TextView title = contextView.findViewById(R.id.title);
+
+        bannerBack.setImageResource(R.mipmap.start_level);
+        iconStart.setImageResource(R.mipmap.icon_start);
+        iconStartNumber.setImageResource(R.mipmap.icon_start_number);
         if (data.isStart()) {
             startContext.setVisibility(View.VISIBLE);
             Glide.with(context).load(R.mipmap.start_level).into(bannerBack);
diff --git a/live/src/main/res/layout/view_start_level.xml b/live/src/main/res/layout/view_start_level.xml
index 65d8c8ef5..8eb6bc17e 100644
--- a/live/src/main/res/layout/view_start_level.xml
+++ b/live/src/main/res/layout/view_start_level.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:src="@mipmap/start_level" />
+         />
 
     <FrameLayout
         android:id="@+id/start_context"
@@ -51,7 +51,7 @@
                         android:id="@+id/icon_start"
                         android:layout_width="12dp"
                         android:layout_height="12dp"
-                        android:src="@mipmap/icon_start" />
+                       />
 
                     <TextView
                         android:id="@+id/total_star_value"
@@ -118,7 +118,7 @@
                         android:id="@+id/icon_start_number"
                         android:layout_width="12dp"
                         android:layout_height="12dp"
-                        android:src="@mipmap/icon_start_number" />
+                       />
 
                     <TextView
                         android:id="@+id/number_of_people_assisted"
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 584273828..a19a92cd3 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -7,6 +7,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
+import android.app.Application;
 import android.app.Dialog;
 import android.app.NotificationChannel;
 import android.app.PendingIntent;
@@ -312,6 +313,12 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
             @Override
             public void onPageSelected(int position) {
+                if (mTabButtonGroup.getCurPosition() != position) {
+                    System.err.println("重新初始化IM");
+                    RongcloudIMManager.connectIM(mContext.getApplication());
+                    position = 0;
+                    mTabButtonGroup.setCurPosition(0);
+                }
                 if (position != 0) {
                     loadPageData(position, true);
                 }
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
index e3c341ab1..77065b095 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -82,7 +82,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
                         for (WeakReference<Activity> reference : CommonAppContext.activityList) {
                             builder.append(reference.get().getClass().getSimpleName()).append("\n");
                         }
-                        builder.append("内存:").append(DeviceUtils.getMemory(mContext));
+                        builder.append("内存:").append(DeviceUtils.getMemoryToFormat(mContext));
                         if (debugView != null) {
                             handler.post(() -> debugView.setText(builder.toString()));
                         }