From bfb172c1e8ea2506729bfd7d54871c044e15c2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E7=9A=AE?=
 <14840170+lao-pi123@user.noreply.gitee.com>
Date: Fri, 13 Sep 2024 10:06:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=92=AD=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8E=9F=E6=A0=B7=E5=AD=90=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=202=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/activity/WebViewActivity.java |  9 +--------
 .../views/MainMessageViewHolderForActivity.java     |  3 ++-
 main/src/main/res/layout/view_main_message.xml      | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
index 0b56ea832..6cadac775 100644
--- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
@@ -11,6 +11,7 @@ import android.os.Build;
 import android.os.Handler;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -94,14 +95,6 @@ public class WebViewActivity extends AbsActivity {
 //        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
 
-    @Override
-    public void backClick(View v) {
-        if (mWebView.canGoBack()){
-            mWebView.goBack();
-        }else {
-            finish();
-        }
-    }
 
     @Override
     protected void main() {
diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolderForActivity.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolderForActivity.java
index e1b389c28..cf72a6a5d 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolderForActivity.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolderForActivity.java
@@ -71,7 +71,7 @@ public class MainMessageViewHolderForActivity extends AbsMainViewHolder {
     private String type = null;
     private List<ImUserBean> listUserBean = new ArrayList<>();
     private LinearLayout topLayout, ltNodataMsg;
-    private ImageView imgNewsNotice, imgNewsInteraction, imgNewsOnline, imgSystemMessages;
+    private ImageView imgNewsNotice, imgNewsInteraction, imgNewsOnline, imgSystemMessages,btn_back;
     private Handler netHandler;
     private Activity mContext;
 
@@ -119,6 +119,7 @@ public class MainMessageViewHolderForActivity extends AbsMainViewHolder {
         imgNewsInteraction = (ImageView) findViewById(R.id.img_news_interaction);
         imgSystemMessages = (ImageView) findViewById(R.id.img_system_messages);
         imgNewsOnline = (ImageView) findViewById(R.id.img_news_online);
+        btn_back = (ImageView) findViewById(R.id.btn_back);
         netHandler = new Handler();
 
     }
diff --git a/main/src/main/res/layout/view_main_message.xml b/main/src/main/res/layout/view_main_message.xml
index a783924f1..542f13ef4 100644
--- a/main/src/main/res/layout/view_main_message.xml
+++ b/main/src/main/res/layout/view_main_message.xml
@@ -9,11 +9,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <ImageView
+            android:id="@+id/btn_back"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:onClick="backClick"
+            android:layout_gravity="start|center_vertical"
+            android:padding="9dp"
+            android:src="@mipmap/icon_back"
+            android:tint="@color/textColor" />
+
         <TextView
             android:id="@+id/top_noback"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="18dp"
+            android:layout_marginStart="50dp"
+            android:layout_gravity="start|center_vertical"
             android:text="@string/message"
             android:textColor="#ff161616"
             android:textSize="24sp"