From 0cf0870889d65f5d11d0b2c8af7bca9442a7ba19 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 21 四月 2025 17:14:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

---
 app/src/main/res/layout/activity_invitation_main.xml |   70 +++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/activity_invitation_main.xml b/app/src/main/res/layout/activity_invitation_main.xml
index 2859f8b..120d1f0 100644
--- a/app/src/main/res/layout/activity_invitation_main.xml
+++ b/app/src/main/res/layout/activity_invitation_main.xml
@@ -39,15 +39,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:padding="16dp"
+                    android:padding="10dp"
                     android:textColor="#FFFFFF"
                     android:textSize="15sp" />
 
                 <!-- 横幅广告区域 -->
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
-                    android:layout_height="160dp"
-                    android:layout_marginBottom="16dp"
+                    android:layout_height="140dp"
+                    android:layout_marginBottom="10dp"
                     app:cardCornerRadius="13dp"
                     app:cardPreventCornerOverlap="true">
 
@@ -62,13 +62,13 @@
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="20dp"
+                    android:layout_marginBottom="10dp"
                     app:cardCornerRadius="38dp">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/invitationsuccessRecyclerView"
                         android:layout_width="match_parent"
-                        android:layout_height="60dp"
+                        android:layout_height="40dp"
                         android:nestedScrollingEnabled="false"
                         android:overScrollMode="never" />
                 </androidx.cardview.widget.CardView>
@@ -82,7 +82,7 @@
                     android:backgroundTint="#FF0000"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:padding="12dp"
+                    android:padding="10dp"
                     android:text="立即邀请好友"
                     android:textColor="#FFFFFF"
                     android:textSize="16sp"
@@ -288,13 +288,14 @@
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
 
-                <!-- 邀请记录区域 -->
-                <androidx.cardview.widget.CardView
+
+                <LinearLayout
+                    android:id="@+id/invitationrecordLinearLayout"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="20dp"
-                    app:cardCornerRadius="6dp"
-                    app:cardPreventCornerOverlap="true">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:background="@drawable/bg_invitation_record"
+                    android:padding="10dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -305,13 +306,45 @@
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingLeft="16dp"
+                            android:paddingBottom="5dp"
+                            android:text="我的邀请记录"
+                            android:textColor="#333333"
+                            android:textSize="16sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/invited_record_recycler_view_2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                </LinearLayout>
+
+                <!-- 邀请记录区域 -->
+               <!-- <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:cardCornerRadius="6dp"
+                >
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        &lt;!&ndash; 添加"我的邀请记录"标题 &ndash;&gt;
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
                             android:paddingLeft="16dp"
                             android:paddingBottom="8dp"
                             android:text="我的邀请记录"
                             android:textColor="#333333"
                             android:textSize="16sp"
-                            android:textStyle="bold"
-                            android:gravity="center" />
+                            android:textStyle="bold" />
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/invitationrecordRecyclerView"
@@ -319,8 +352,13 @@
                             android:layout_height="wrap_content"
                             android:nestedScrollingEnabled="false"
                             android:overScrollMode="never" />
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
+
+                        </LinearLayout>
+
+
+                </androidx.cardview.widget.CardView>-->
+
+
 
                 <!-- 添加一个权重为1的View，用于填充剩余空间 -->
                 <View

--
Gitblit v1.9.3