first commit

liugl

2020-07-30 25eca75a51c6b73b3bf6b515e92975e0cbc130c2

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

@@ -27,6 +27,7 @@
            android:id="@+id/tv_title_slab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textStyle="bold"
            android:layout_centerInParent="true"
            android:text="准备出发"
            android:textColor="#ffffffff"
@@ -38,9 +39,9 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/rl_top"
        android:layout_marginStart="26dp"
        android:layout_marginTop="23dp"
        android:layout_marginEnd="20dp"
        android:layout_marginStart="16dp"
        android:layout_marginTop="13dp"
        android:layout_marginEnd="10dp"
        android:layout_toStartOf="@+id/ll_pay_result"
        android:orientation="vertical">

@@ -48,6 +49,10 @@
            android:id="@+id/ll_content_web"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/dp_10"
            android:layout_marginEnd="10dp"
            android:elevation="5dp"
            android:layout_marginTop="10dp"
            android:background="@drawable/bg_slab_main_8"
            android:orientation="vertical"
            android:paddingStart="10dp">
@@ -69,6 +74,7 @@
                android:layout_marginTop="23dp"
                android:layout_marginBottom="9dp"
                android:text="123次乘车"
                android:visibility="gone"
                android:textColor="#ffffffff"
                android:textSize="30sp"
                android:textStyle="bold" />
@@ -77,7 +83,7 @@
                android:id="@+id/tv_phone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="23dp"
                android:layout_marginTop="13dp"
                android:layout_marginBottom="22dp"
                android:drawableStart="@mipmap/icon_dial_slab"
                android:drawablePadding="10dp"
@@ -91,9 +97,12 @@
        <LinearLayout
            android:id="@+id/ll_order_top"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_below="@+id/ll_content_web"
            android:layout_marginStart="10dp"
            android:layout_marginEnd="10dp"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="20dp"
            android:layout_height="match_parent"
            android:layout_below="@+id/ll_content_web"
            android:background="@drawable/bg_slab_main_8_bottom"
            android:elevation="3dp"
            android:orientation="vertical"
@@ -107,29 +116,27 @@
            </RelativeLayout>


            <include layout="@layout/include_line" />

            <TextView
                android:id="@+id/tv_time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginTop="21dp"
                android:layout_marginBottom="11dp"
                android:drawableStart="@drawable/bg_point_main_color_write"
                android:drawablePadding="5dp"
                android:drawableStart="@mipmap/icon_time_xiao"
                android:drawablePadding="7dp"
                android:text="4月3日 14:00"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />

            <include layout="@layout/include_line" />


            <TextView
                android:id="@+id/tv_start_address"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginTop="28dp"
                android:layout_marginBottom="11dp"
                android:drawableStart="@drawable/bg_point_main_color_slab"
                android:drawablePadding="5dp"
@@ -138,13 +145,12 @@
                android:textSize="26sp"
                android:textStyle="bold" />

            <include layout="@layout/include_line" />

            <TextView
                android:id="@+id/tv_end_address"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginTop="28dp"
                android:layout_marginBottom="11dp"
                android:drawableStart="@drawable/bg_point_main_color_black_slab"
                android:drawablePadding="5dp"
@@ -153,22 +159,20 @@
                android:textSize="26sp"
                android:textStyle="bold" />

            <include layout="@layout/include_line" />

            <TextView
                android:id="@+id/tv_red_money"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginTop="28dp"
                android:layout_marginBottom="11dp"
                android:drawableStart="@mipmap/hongbao"
                android:drawablePadding="5dp"
                android:drawableStart="@mipmap/hongbao_xiao"
                android:drawablePadding="10dp"
                android:text="8元小费"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />

            <include layout="@layout/include_line" />


        </LinearLayout>
@@ -189,13 +193,24 @@
        android:layout_marginTop="20dp"
        android:layout_marginEnd="20dp"
        android:layout_marginBottom="18dp"
        android:background="@drawable/bg_slab_main_8_shen"
        android:gravity="center_horizontal"
        android:orientation="vertical">

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="26dp"
            android:id="@+id/tv_order_type"
            android:text="订单金额"
            android:textStyle="bold"
            android:textColor="#ffffffff"
            android:textSize="50sp"
            />

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"
            android:layout_marginTop="30dp"
            android:orientation="horizontal">

@@ -236,7 +251,7 @@
            android:text="¥51.5"
            android:textColor="#fffea62d"
            android:textStyle="bold"
            android:textSize="70sp"/>
            android:textSize="100sp"/>

        <LinearLayout
            android:layout_width="match_parent"
@@ -245,6 +260,7 @@
            android:orientation="horizontal">

            <TextView
                android:id="@+id/tv_hive_small_money"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="其中含小费："
@@ -263,6 +279,21 @@

        </LinearLayout>

        <include layout="@layout/include_weight_height"/>

        <TextView
            android:id="@+id/tv_to_main"
            android:layout_width="match_parent"
            android:layout_height="100dp"
            android:background="@drawable/bg_event_btn_one"
            android:gravity="center"
            android:text="返回首页"
            android:layout_marginEnd="50dp"
            android:layout_marginStart="50dp"
            android:textColor="#ffffffff"
            android:textSize="40sp"
            />



    </LinearLayout>