Merge remote-tracking branch 'origin/master'

tj

2025-03-28 dde2eeddbaf07246da7c2c352e7d49ec63fddcd2

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

@@ -156,49 +156,49 @@
            android:paddingHorizontal="8dp"
            android:paddingVertical="4dp">

            <!-- 会员 -->
            <RelativeLayout
                android:id="@+id/memberVip"
                style="@style/PluginPay"
                android:padding="16dp">
<!--            &lt;!&ndash; 会员 &ndash;&gt;-->
<!--            <RelativeLayout-->
<!--                android:id="@+id/memberVip"-->
<!--                style="@style/PluginPay"-->
<!--                android:padding="16dp">-->

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:text="会员"
                    android:textColor="@android:color/black"
                    android:textSize="16sp" />
<!--                <TextView-->
<!--                    android:layout_width="wrap_content"-->
<!--                    android:layout_height="wrap_content"-->
<!--                    android:layout_centerVertical="true"-->
<!--                    android:text="会员"-->
<!--                    android:textColor="@android:color/black"-->
<!--                    android:textSize="16sp" />-->

                <ImageView
                    android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_alignParentEnd="true"
                    android:layout_centerVertical="true"
                    android:src="@drawable/right_forward" />
            </RelativeLayout>
<!--                <ImageView-->
<!--                    android:layout_width="24dp"-->
<!--                    android:layout_height="24dp"-->
<!--                    android:layout_alignParentEnd="true"-->
<!--                    android:layout_centerVertical="true"-->
<!--                    android:src="@drawable/right_forward" />-->
<!--            </RelativeLayout>-->

            <!-- 支付 -->
            <RelativeLayout
                android:id="@+id/payPlugin"
                style="@style/PluginPay"
                android:padding="16dp">
<!--            &lt;!&ndash; 支付 &ndash;&gt;-->
<!--            <RelativeLayout-->
<!--                android:id="@+id/payPlugin"-->
<!--                style="@style/PluginPay"-->
<!--                android:padding="16dp">-->

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:text="支付"
                    android:textColor="@android:color/black"
                    android:textSize="16sp" />
<!--                <TextView-->
<!--                    android:layout_width="wrap_content"-->
<!--                    android:layout_height="wrap_content"-->
<!--                    android:layout_centerVertical="true"-->
<!--                    android:text="支付"-->
<!--                    android:textColor="@android:color/black"-->
<!--                    android:textSize="16sp" />-->

                <ImageView
                    android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_alignParentEnd="true"
                    android:layout_centerVertical="true"
                    android:src="@drawable/right_forward" />
            </RelativeLayout>
<!--                <ImageView-->
<!--                    android:layout_width="24dp"-->
<!--                    android:layout_height="24dp"-->
<!--                    android:layout_alignParentEnd="true"-->
<!--                    android:layout_centerVertical="true"-->
<!--                    android:src="@drawable/right_forward" />-->
<!--            </RelativeLayout>-->

            <!-- 设置提醒 -->
            <LinearLayout