修复问题

18034727885

2026-08-21 23fdd779934f8567b7fc72f386a76e02742a9739

修复问题

 app/src/main/java/com/igo/user/ui/trip/OrderDetailActivity.kt

@@ -10,6 +10,7 @@
import android.view.View
import android.widget.CheckBox
import android.widget.LinearLayout
import android.widget.ScrollView
import android.widget.TextView
import androidx.core.os.bundleOf
import androidx.core.view.isVisible
@@ -110,10 +111,8 @@
    private val cl_evaluate by lazy { find<View>(R.id.cl_evaluate) }
    private val fl_label by lazy { find<CenterFlowLayout>(R.id.fl_label) }
    private val tv_confirm_fee by lazy { find<View>(R.id.tv_confirm_fee) }


    private val cl_driver by lazy { find<View>(R.id.cl_driver) }

    private val scrollView by lazy { find<ScrollView>(R.id.scrollView) }

    private var isCancel = false
    private var balance = -1.0
@@ -193,6 +192,7 @@
            if (it.toInt() != score)
                inputLabel(it.toInt())
            score = it.toInt()
            scrollView.post { scrollView.smoothScrollTo(0, scrollView.getChildAt(0).bottom) }
        }
        iv_header_home.setOnClickListener {
            order?.also {
@@ -470,6 +470,9 @@
                    tv_tip.invisible()
                }
                tv_title.hide()
                if (order!!.orderType == TripOrderFragment.TYPE_LOGISTICS) {
                    tv_action.visible()
                }
                tv_action.text = getString(R.string.匿名评价)
                titleBar.getRightButton(0)?.visible()
                if (order?.isFrozen != 2) {

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

@@ -116,207 +116,13 @@
            app:layout_constraintTop_toTopOf="@id/bg" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <LinearLayout
        android:id="@+id/ll_trip"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@color/white"
        android:orientation="vertical"
        app:layout_constraintTop_toBottomOf="@id/cl_driver">

        <View
            style="@style/style_form_divider_line"
            android:layout_marginStart="14dp" />

        <TextView
            android:id="@+id/tv_time"
            style="@style/style_common_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="15dp"
            android:drawableStart="@mipmap/icon_time_grey"
            android:drawablePadding="6dp"
            android:gravity="center_vertical"
            android:paddingTop="11dp"
            android:paddingBottom="11dp"
            android:textStyle="bold"
            tools:text="4月3日 14:00" />

        <View
            style="@style/style_form_divider_line"
            android:layout_marginStart="14dp" />

        <TextView
            android:id="@+id/tv_start"
            style="@style/style_common_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="13dp"
            android:drawableStart="@mipmap/icon_starting_point"
            android:drawablePadding="5dp"
            android:gravity="center_vertical"
            android:paddingTop="11dp"
            android:paddingBottom="11dp"
            android:singleLine="true"
            android:textStyle="bold"
            tools:text="柳州市政府" />

        <View
            style="@style/style_form_divider_line"
            android:layout_marginStart="14dp" />

        <TextView
            android:id="@+id/tv_end"
            style="@style/style_common_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="13dp"
            android:drawableStart="@mipmap/icon_end_point"
            android:drawablePadding="5dp"
            android:gravity="center_vertical"
            android:paddingTop="11dp"
            android:paddingBottom="11dp"
            android:singleLine="true"
            android:textStyle="bold"
            tools:text="柳州客运中心" />

        <View
            style="@style/style_form_divider_line"
            android:layout_marginStart="14dp" />

        <TextView
            android:id="@+id/tv_passenger_num"
            style="@style/style_common_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="13dp"
            android:drawableStart="@mipmap/icon_people"
            android:drawablePadding="5dp"
            android:gravity="center_vertical"
            android:paddingTop="11dp"
            android:paddingBottom="11dp"
            android:singleLine="true"
            android:textStyle="bold"
            android:visibility="gone"
            tools:text="3" />

        <View
            style="@style/style_form_divider_line"
            android:layout_marginStart="14dp" />

        <TextView
            android:id="@+id/tv_remark"
            style="@style/style_common_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="13dp"
            android:drawableStart="@mipmap/icon_types"
            android:drawablePadding="5dp"
            android:gravity="center_vertical"
            android:paddingTop="11dp"
            android:paddingBottom="11dp"
            android:singleLine="true"
            android:textStyle="bold"
            android:visibility="gone"
            tools:text="3" />

        <LinearLayout
            android:id="@+id/ll_pickup_picture"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:visibility="gone"
            tools:visibility="visible">

            <View
                style="@style/style_form_divider_line"
                android:layout_marginStart="14dp" />

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginStart="15dp"
                android:gravity="center_vertical"
                android:orientation="horizontal"
                android:paddingTop="10dp">

                <ImageView
                    android:layout_width="10dp"
                    android:layout_height="10dp"
                    android:src="@mipmap/icon_picture_gray" />

                <TextView
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="7dp"
                    android:gravity="center_vertical"
                    android:singleLine="true"
                    android:text="@string/取货图片"
                    android:textStyle="bold" />
            </LinearLayout>

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/rv_pickup"
                android:layout_width="match_parent"
                android:layout_height="68dp"
                android:layout_marginStart="25dp"
                android:layout_marginTop="4dp"
                android:layout_marginBottom="8dp" />
        </LinearLayout>

        <LinearLayout
            android:id="@+id/ll_delivery_picture"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:visibility="gone"
            tools:visibility="visible">

            <View
                style="@style/style_form_divider_line"
                android:layout_marginStart="14dp" />

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginStart="15dp"
                android:gravity="center_vertical"
                android:orientation="horizontal"
                android:paddingTop="10dp">

                <ImageView
                    android:layout_width="10dp"
                    android:layout_height="10dp"
                    android:src="@mipmap/icon_picture_gray" />

                <TextView
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="7dp"
                    android:gravity="center_vertical"
                    android:singleLine="true"
                    android:text="@string/送达图片"
                    android:textStyle="bold" />
            </LinearLayout>

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/rv_delivery"
                android:layout_width="match_parent"
                android:layout_height="68dp"
                android:layout_marginStart="25dp"
                android:layout_marginTop="4dp"
                android:layout_marginBottom="8dp" />
        </LinearLayout>
    </LinearLayout>

    <ScrollView
        android:id="@+id/scrollView"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginBottom="10dp"
        app:layout_constraintBottom_toTopOf="@id/tv_action"
        app:layout_constraintTop_toBottomOf="@id/ll_trip"
        app:layout_constraintTop_toBottomOf="@id/cl_driver"
        app:layout_goneMarginBottom="0dp">

        <LinearLayout
@@ -324,6 +130,207 @@
            android:layout_height="wrap_content"
            android:gravity="center"
            android:orientation="vertical">

            <LinearLayout
                android:id="@+id/ll_trip"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@color/white"
                android:orientation="vertical"
                app:layout_constraintTop_toBottomOf="@id/cl_driver">

                <View
                    style="@style/style_form_divider_line"
                    android:layout_marginStart="14dp" />

                <TextView
                    android:id="@+id/tv_time"
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="15dp"
                    android:drawableStart="@mipmap/icon_time_grey"
                    android:drawablePadding="6dp"
                    android:gravity="center_vertical"
                    android:paddingTop="11dp"
                    android:paddingBottom="11dp"
                    android:textStyle="bold"
                    tools:text="4月3日 14:00" />

                <View
                    style="@style/style_form_divider_line"
                    android:layout_marginStart="14dp" />

                <TextView
                    android:id="@+id/tv_start"
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="13dp"
                    android:drawableStart="@mipmap/icon_starting_point"
                    android:drawablePadding="5dp"
                    android:gravity="center_vertical"
                    android:paddingTop="11dp"
                    android:paddingBottom="11dp"
                    android:singleLine="true"
                    android:textStyle="bold"
                    tools:text="柳州市政府" />

                <View
                    style="@style/style_form_divider_line"
                    android:layout_marginStart="14dp" />

                <TextView
                    android:id="@+id/tv_end"
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="13dp"
                    android:drawableStart="@mipmap/icon_end_point"
                    android:drawablePadding="5dp"
                    android:gravity="center_vertical"
                    android:paddingTop="11dp"
                    android:paddingBottom="11dp"
                    android:singleLine="true"
                    android:textStyle="bold"
                    tools:text="柳州客运中心" />

                <View
                    style="@style/style_form_divider_line"
                    android:layout_marginStart="14dp" />

                <TextView
                    android:id="@+id/tv_passenger_num"
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="13dp"
                    android:drawableStart="@mipmap/icon_people"
                    android:drawablePadding="5dp"
                    android:gravity="center_vertical"
                    android:paddingTop="11dp"
                    android:paddingBottom="11dp"
                    android:singleLine="true"
                    android:textStyle="bold"
                    android:visibility="gone"
                    tools:text="3" />

                <View
                    style="@style/style_form_divider_line"
                    android:layout_marginStart="14dp" />

                <TextView
                    android:id="@+id/tv_remark"
                    style="@style/style_common_text"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="13dp"
                    android:drawableStart="@mipmap/icon_types"
                    android:drawablePadding="5dp"
                    android:gravity="center_vertical"
                    android:paddingTop="11dp"
                    android:paddingBottom="11dp"
                    android:singleLine="true"
                    android:textStyle="bold"
                    android:visibility="gone"
                    tools:text="3" />

                <LinearLayout
                    android:id="@+id/ll_pickup_picture"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
                    android:visibility="gone"
                    tools:visibility="visible">

                    <View
                        style="@style/style_form_divider_line"
                        android:layout_marginStart="14dp" />

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginStart="15dp"
                        android:gravity="center_vertical"
                        android:orientation="horizontal"
                        android:paddingTop="10dp">

                        <ImageView
                            android:layout_width="10dp"
                            android:layout_height="10dp"
                            android:src="@mipmap/icon_picture_gray" />

                        <TextView
                            style="@style/style_common_text"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginStart="7dp"
                            android:gravity="center_vertical"
                            android:singleLine="true"
                            android:text="@string/取货图片"
                            android:textStyle="bold" />
                    </LinearLayout>

                    <androidx.recyclerview.widget.RecyclerView
                        android:id="@+id/rv_pickup"
                        android:layout_width="match_parent"
                        android:layout_height="68dp"
                        android:layout_marginStart="25dp"
                        android:layout_marginTop="4dp"
                        android:layout_marginBottom="8dp" />
                </LinearLayout>

                <LinearLayout
                    android:id="@+id/ll_delivery_picture"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
                    android:visibility="gone"
                    tools:visibility="visible">

                    <View
                        style="@style/style_form_divider_line"
                        android:layout_marginStart="14dp" />

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginStart="15dp"
                        android:gravity="center_vertical"
                        android:orientation="horizontal"
                        android:paddingTop="10dp">

                        <ImageView
                            android:layout_width="10dp"
                            android:layout_height="10dp"
                            android:src="@mipmap/icon_picture_gray" />

                        <TextView
                            style="@style/style_common_text"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginStart="7dp"
                            android:gravity="center_vertical"
                            android:singleLine="true"
                            android:text="@string/送达图片"
                            android:textStyle="bold" />
                    </LinearLayout>

                    <androidx.recyclerview.widget.RecyclerView
                        android:id="@+id/rv_delivery"
                        android:layout_width="match_parent"
                        android:layout_height="68dp"
                        android:layout_marginStart="25dp"
                        android:layout_marginTop="4dp"
                        android:layout_marginBottom="8dp" />
                </LinearLayout>
            </LinearLayout>

            <View
                android:layout_width="match_parent"
                android:layout_height="4dp"
                android:background="@drawable/bg_shadow_top"
                app:layout_constraintTop_toBottomOf="@id/ll_trip" />

            <TextView
                android:id="@+id/tv_title"
@@ -438,16 +445,9 @@
                    app:layout_constraintTop_toBottomOf="@id/rating" />
            </androidx.constraintlayout.widget.ConstraintLayout>


        </LinearLayout>

    </ScrollView>

    <View
        android:layout_width="match_parent"
        android:layout_height="4dp"
        android:background="@drawable/bg_shadow_top"
        app:layout_constraintTop_toBottomOf="@id/ll_trip" />

    <TextView
        android:id="@+id/tv_action"