Merge remote-tracking branch 'origin/master'

cloudroam

2025-04-02 1e6d955d13346ce89eb2819c86485eb6b122a8bb

Merge remote-tracking branch 'origin/master'

 app/src/main/java/com/example/firstapp/activity/VipActivity.kt

@@ -378,13 +378,6 @@
                    )
                }


//                setPadding(
//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20f, resources.displayMetrics).toInt(), // left padding
//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt(), // top padding
//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20f, resources.displayMetrics).toInt(), // right padding
//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt()  // bottom padding
//                )
            }

            val textView = TextView(this).apply {
@@ -396,7 +389,8 @@

            val checkView = ImageView(this).apply {
                id = View.generateViewId()
                setImageResource(R.drawable.ic_check)
//                setImageResource(R.drawable.ic_check)
                setImageResource(R.mipmap.vip_right)
                layoutParams = ConstraintLayout.LayoutParams(
                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt(),
                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt()
@@ -416,14 +410,14 @@
                ConstraintSet.TOP,
                previousViewId,
                if (index == 0) ConstraintSet.TOP else ConstraintSet.BOTTOM,
                16
                32
            )
            constraintSet.connect(
                iconView.id,
                ConstraintSet.START,
                ConstraintSet.PARENT_ID,
                ConstraintSet.START,
                16
                32
            )

            // Text 位置
@@ -433,7 +427,7 @@
                ConstraintSet.START,
                iconView.id,
                ConstraintSet.END,
                8
                32
            )

            // Check 位置
@@ -443,7 +437,7 @@
                ConstraintSet.END,
                ConstraintSet.PARENT_ID,
                ConstraintSet.END,
                16
                32
            )

            constraintSet.applyTo(container)

 app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt

@@ -51,8 +51,15 @@
            // 开通状态
            if(userInfo.isMember){
                // 判断userInfo.memberOvertime是否为空，如果不为空，则截取字符串到年月日
                if(userInfo.memberOvertime.isNotEmpty()){
                    _memberStatus.value = userInfo.memberOvertime.substring(0,10)+" 到期"
//                if(userInfo.memberOvertime.isNotEmpty()){
//                    _memberStatus.value = userInfo.memberOvertime.substring(0,10)+" 到期"
//                }

                _memberStatus.value = " 到期"
                userInfo.memberOvertime?.let {
                    if (it.isNotEmpty()) {
                        _memberStatus.value = it.substring(0, 10) + " 到期"
                    }
                }
                // vip头像
                _vipCover.value ="http://192.168.1.201:9000/sms/member/vip.png"

 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"
@@ -301,210 +301,218 @@
        android:layout_alignParentBottom="true">

        <LinearLayout
            android:id="@+id/alipay_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/alipay_shape"
            android:layout_marginTop="15dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="3dp"
            android:orientation="vertical"
            android:gravity="center">
            android:padding="10dp"
            android:gravity="center_horizontal">

            <LinearLayout
                android:layout_width="250dp"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:gravity="center"
                android:baselineAligned="false"
                >

                <ImageView
                    android:layout_width="30dp"
                    android:layout_height="30dp"
                    android:src="@mipmap/vip_alipay"
                    android:layout_marginEnd="8dp"/>

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="确认协议并支付"
                    android:textColor="#419AE4"
                    android:textSize="16sp"
                    android:gravity="start"/>

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="¥"
                    android:textColor="#419AE4"
                    android:textSize="16sp"
                    android:layout_marginLeft="10dp"
                    android:layout_marginRight="5dp"
                    android:gravity="start"/>

                <TextView
                    android:id="@+id/alipay_amount"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="30"
                    android:textColor="#419AE4"
                    android:textSize="16sp"
                    android:gravity="start"/>
            </LinearLayout>

        </LinearLayout>

        <LinearLayout
            android:id="@+id/wechat_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/wechat_shape"
            android:layout_marginTop="60dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="3dp"
            android:orientation="vertical"
            android:gravity="center">

            <LinearLayout
                android:layout_width="250dp"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:gravity="center"
                android:baselineAligned="false"
                >

                <ImageView
                    android:layout_width="30dp"
                    android:layout_height="30dp"
                    android:src="@mipmap/vip_wechat"
                    android:layout_marginEnd="8dp"/>

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="确认协议并支付"
                    android:textColor="#77E382"
                    android:textSize="16sp"
                    android:gravity="start"/>

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="¥"
                    android:textColor="#77E382"
                    android:textSize="16sp"
                    android:layout_marginLeft="10dp"
                    android:layout_marginRight="5dp"
                    android:gravity="start"/>

                <TextView
                    android:id="@+id/wechat_amount"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="30"
                    android:textColor="#77E382"
                    android:textSize="16sp"
                    android:gravity="start"/>
            </LinearLayout>

        </LinearLayout>

        <LinearLayout
            android:id="@+id/xieyi_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@android:color/transparent"
            android:layout_marginTop="100dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="1dp"
            android:orientation="vertical"
            android:gravity="center">

            <LinearLayout
                android:id="@+id/alipay_layout"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:gravity="start"
                android:baselineAligned="false"
                >
                android:background="@drawable/alipay_shape"
                android:layout_marginTop="15dp"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
                android:padding="3dp"
                android:orientation="vertical"
                android:gravity="center">

                <TextView
                    android:id="@+id/protocol_desc_layout"
                    android:layout_width="wrap_content"
                <LinearLayout
                    android:layout_width="250dp"
                    android:layout_height="wrap_content"
                    android:text="自动续费可随时取消，开通后每月按12元自动续费，可随时取消自动续费"
                    android:textColor="#A19FA7"
                    android:textSize="12sp"
                    android:gravity="start"/>
                    android:orientation="horizontal"
                    android:gravity="center"
                    android:baselineAligned="false"
                    >

                    <ImageView
                        android:layout_width="30dp"
                        android:layout_height="30dp"
                        android:src="@mipmap/vip_alipay"
                        android:layout_marginEnd="8dp"/>

                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="确认协议并支付"
                        android:textColor="#419AE4"
                        android:textSize="16sp"
                        android:gravity="start"/>

                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="¥"
                        android:textColor="#419AE4"
                        android:textSize="16sp"
                        android:layout_marginLeft="10dp"
                        android:layout_marginRight="5dp"
                        android:gravity="start"/>

                    <TextView
                        android:id="@+id/alipay_amount"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="30"
                        android:textColor="#419AE4"
                        android:textSize="16sp"
                        android:gravity="start"/>
                </LinearLayout>

            </LinearLayout>

        </LinearLayout>


        <LinearLayout
            android:id="@+id/protocol_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@android:color/transparent"
            android:layout_marginTop="140dp"
            android:layout_marginLeft="15dp"
            android:layout_marginRight="15dp"
            android:padding="1dp"
            android:orientation="vertical"
            android:gravity="center">

            <LinearLayout
                android:layout_width="300dp"
                android:id="@+id/wechat_layout"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:gravity="center_vertical"
                android:baselineAligned="false"
                >
                android:background="@drawable/wechat_shape"
                android:layout_marginTop="15dp"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
                android:padding="3dp"
                android:orientation="vertical"
                android:gravity="center">

<!--                <CheckBox-->
<!--                    android:id="@+id/protocol_checkbox"-->
<!--                    android:layout_width="20dp"-->
<!--                    android:layout_height="20dp"-->
<!--                    android:text=""-->
<!--                    android:orientation="horizontal"-->
<!--                    android:gravity="start"-->
<!--                    />-->

                <CheckBox
                    android:id="@+id/protocol_checkbox"
                    android:layout_width="20dp"
                    android:layout_height="20dp"
                    />


                <TextView
                    android:layout_width="wrap_content"
                <LinearLayout
                    android:layout_width="250dp"
                    android:layout_height="wrap_content"
                    android:text="已阅读并同意"
                    android:textColor="#7E5C3C"
                    android:textSize="14sp"
                    android:gravity="start"
                    android:layout_marginLeft="0dp"
                    android:orientation="horizontal"
                    />
                    android:gravity="center"
                    android:baselineAligned="false"
                    >

                <TextView
                    android:id="@+id/protocol_vip"
                    android:layout_width="wrap_content"
                    <ImageView
                        android:layout_width="30dp"
                        android:layout_height="30dp"
                        android:src="@mipmap/vip_wechat"
                        android:layout_marginEnd="8dp"/>

                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="确认协议并支付"
                        android:textColor="#77E382"
                        android:textSize="16sp"
                        android:gravity="start"/>

                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="¥"
                        android:textColor="#77E382"
                        android:textSize="16sp"
                        android:layout_marginLeft="10dp"
                        android:layout_marginRight="5dp"
                        android:gravity="start"/>

                    <TextView
                        android:id="@+id/wechat_amount"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="30"
                        android:textColor="#77E382"
                        android:textSize="16sp"
                        android:gravity="start"/>
                </LinearLayout>

            </LinearLayout>

            <LinearLayout
                android:id="@+id/xieyi_layout"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@android:color/transparent"
                android:layout_marginTop="15dp"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
                android:padding="1dp"
                android:orientation="vertical"
                android:gravity="center">

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="《VIP会员服务协议》"
                    android:textColor="#15759E"
                    android:textSize="14sp"
                    android:gravity="start"
                    android:orientation="horizontal"
                    />
                    android:gravity="start"
                    android:baselineAligned="false"
                    >

                    <TextView
                        android:id="@+id/protocol_desc_layout"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="自动续费可随时取消，开通后每月按12元自动续费，可随时取消自动续费"
                        android:textColor="#A19FA7"
                        android:textSize="12sp"
                        android:gravity="start"/>
                </LinearLayout>

            </LinearLayout>


            <LinearLayout
                android:id="@+id/protocol_layout"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@android:color/transparent"
                android:layout_marginTop="15dp"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
                android:padding="1dp"
                android:orientation="vertical"
                android:gravity="center">

                <LinearLayout
                    android:layout_width="300dp"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal"
                    android:gravity="center_vertical"
                    android:baselineAligned="false"
                    >

    <!--                <CheckBox-->
    <!--                    android:id="@+id/protocol_checkbox"-->
    <!--                    android:layout_width="20dp"-->
    <!--                    android:layout_height="20dp"-->
    <!--                    android:text=""-->
    <!--                    android:orientation="horizontal"-->
    <!--                    android:gravity="start"-->
    <!--                    />-->

                    <CheckBox
                        android:id="@+id/protocol_checkbox"
                        android:layout_width="20dp"
                        android:layout_height="20dp"
                        />


                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="已阅读并同意"
                        android:textColor="#7E5C3C"
                        android:textSize="14sp"
                        android:gravity="start"
                        android:layout_marginLeft="10dp"
                        android:orientation="horizontal"
                        />

                    <TextView
                        android:id="@+id/protocol_vip"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="《VIP会员服务协议》"
                        android:textColor="#15759E"
                        android:textSize="14sp"
                        android:gravity="start"
                        android:orientation="horizontal"
                        />
                </LinearLayout>

            </LinearLayout>

        </LinearLayout>

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