From 68f444b3fc48b1fc269039b25facdf3526eba3f4 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: Thu, 12 Sep 2024 14:20:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=82=B9=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BC=98=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/main/views/MainMeViewHolder.java    | 11 +++++++++--
 .../views/MainMessageViewHolderForActivity.java    | 10 +++++++++-
 main/src/main/res/layout/view_new_main_me.xml      | 14 ++++++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
index d037e64b5..6b040df13 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@@ -416,6 +416,10 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                     forwardRoomManage();
                     break;
                 case 26:
+                    // 幫助與反饋
+                    WebViewActivityMedal.forward(mContext, url);
+                    break;
+
                 case 17:
                     RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
                     break;
@@ -466,9 +470,12 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                     if (bean.getId() == 24) {
                         MobclickAgent.onEvent(mContext, "my_pack", "个人中心点包裹");
                     }
-                    if (bean.getId() == 17 || bean.getId() == 26) {
+                    if (bean.getId() == 17) {
                         RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
-                    } else
+                    }else if (bean.getId() == 26){
+                        // 幫助與反饋
+                        WebViewActivityMedal.forward(mContext, url);
+                    }else
                         WebViewActivity.forward(mContext, url, false);
                 }
 
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 df5f43ac2..e1b389c28 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolderForActivity.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolderForActivity.java
@@ -89,6 +89,8 @@ public class MainMessageViewHolderForActivity extends AbsMainViewHolder {
     public MainMessageViewHolderForActivity(Activity context, ViewGroup parentView) {
         super(context, parentView);
         mContext = context;
+        initData();
+
     }
 
     @Override
@@ -99,7 +101,7 @@ public class MainMessageViewHolderForActivity extends AbsMainViewHolder {
     @Override
     public void onResume() {
         super.onResume();
-        initData();
+//        initData();
     }
 
     @Override
@@ -346,6 +348,12 @@ public class MainMessageViewHolderForActivity extends AbsMainViewHolder {
 
                     }
                 }
+
+                @Override
+                public void onError() {
+                    super.onError();
+                    Log.e("MessageTest","onError");
+                }
             });
         }
     };
diff --git a/main/src/main/res/layout/view_new_main_me.xml b/main/src/main/res/layout/view_new_main_me.xml
index 476f58dd0..aca5c0dcd 100644
--- a/main/src/main/res/layout/view_new_main_me.xml
+++ b/main/src/main/res/layout/view_new_main_me.xml
@@ -205,16 +205,17 @@
     </androidx.cardview.widget.CardView>
 
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginTop="25dp"
         android:scrollbars="none"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rt_setting">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:paddingBottom="30dp"
             >
 
@@ -470,11 +471,16 @@
                     app:indicator_width="8dp" />
             </androidx.cardview.widget.CardView>
 
+            <View
+                android:layout_width="match_parent"
+                app:layout_constraintTop_toBottomOf="@id/lt_advertisement"
+                android:layout_height="100dp"/>
+
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file