Merge remote-tracking branch 'origin/master'

cloudroam

2025-04-02 1e6d955d13346ce89eb2819c86485eb6b122a8bb

 app/src/main/res/layout/activity_vip.xml

@@ -122,7 +122,7 @@
                    android:id="@+id/dynamicContainer"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:padding="20dp"
                    android:padding="10dp"
                    android:layout_marginTop="0dp"
                    android:background="@android:color/transparent"
                    app:layout_constraintTop_toBottomOf="@id/divider"
@@ -290,7 +290,7 @@
    <androidx.cardview.widget.CardView
        android:id="@+id/card_view_fixed"
        android:layout_width="match_parent"
        android:layout_height="180dp"
        android:layout_height="wrap_content"
        android:layout_margin="0dp"
        android:layout_marginTop="10dp"
        android:layout_gravity="bottom"
@@ -299,6 +299,13 @@
        android:background="#030308"
        app:cardBackgroundColor="#030308"
        android:layout_alignParentBottom="true">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:padding="10dp"
            android:gravity="center_horizontal">

        <LinearLayout
            android:id="@+id/alipay_layout"
@@ -361,7 +368,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/wechat_shape"
            android:layout_marginTop="60dp"
                android:layout_marginTop="15dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="3dp"
@@ -417,7 +424,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@android:color/transparent"
            android:layout_marginTop="100dp"
                android:layout_marginTop="15dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="1dp"
@@ -450,7 +457,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@android:color/transparent"
            android:layout_marginTop="140dp"
                android:layout_marginTop="15dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="1dp"
@@ -488,7 +495,7 @@
                    android:textColor="#7E5C3C"
                    android:textSize="14sp"
                    android:gravity="start"
                    android:layout_marginLeft="0dp"
                        android:layout_marginLeft="10dp"
                    android:orientation="horizontal"
                    />

@@ -506,5 +513,6 @@

        </LinearLayout>

        </LinearLayout>
    </androidx.cardview.widget.CardView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>