9.10-1

liugl

2020-09-10 ba70502796a47ae0d4087ec2d7c0970e618665d6

9.10-1

 app/src/main/java/com/okgoincar/netUtls/Api.java

@@ -35,8 +35,7 @@
    public static String loginByIdentification = "base/driver/loginByIdentification"; //api/driver/work2 司机身份证登录
    public static String loginOut = "api/driver/loginOut"; ///api/driver/loginOut 司机退出登录
    public static String loginByTaxiAptitudeCard = "base/driver/loginByTaxiAptitudeCard";
    public static String completeOrder = "api/taxi/completeOrder"; // /api/taxi/completeOrder 手动确认订单完成

    public static String completeOrder = "api/order/completeOrder"; // /api/order/completeOrder 手动确认订单完成

    /***
     * 首页

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

@@ -284,7 +284,7 @@
        <TextView
            android:id="@+id/tv_complete"
            android:layout_width="wrap_content"
            android:text="我已付款 >"
            android:text="乘客已付款 >"
            android:textSize="30sp"
            android:layout_gravity="center"
            android:layout_marginBottom="10dp"

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

@@ -12,21 +12,6 @@
        android:layout_height="70dp"
        android:layout_marginTop="26dp">

        <Button
            android:id="@+id/btn_start"
            android:layout_width="wrap_content"
            android:layout_marginStart="150dp"
            android:text="开始行程"
            android:visibility="gone"
            android:layout_height="match_parent"/>

        <Button
            android:id="@+id/btn_end"
            android:layout_width="wrap_content"
            android:layout_marginStart="300dp"
            android:text="结束行程"
            android:visibility="gone"
            android:layout_height="match_parent"/>

        <ImageView
            android:id="@+id/iv_back_slab"
@@ -383,4 +368,21 @@
        android:layout_marginBottom="14dp"
        android:visibility="gone" />

    <Button
        android:id="@+id/btn_start"
        android:layout_width="wrap_content"
        android:layout_marginStart="150dp"
        android:text="开始行程"
        android:visibility="gone"
        android:layout_height="match_parent"/>

    <Button
        android:id="@+id/btn_end"
        android:layout_width="wrap_content"
        android:layout_marginStart="300dp"
        android:text="结束行程"
        android:visibility="gone"
        android:layout_height="match_parent"/>


</RelativeLayout>