1:新增上线 6版 tipmusic

liugl

2020-12-24 37dab403a9c8a31c8a1a1aa01cc5c1cf75d02ff5

1:新增上线 6版 tipmusic

 app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt

@@ -326,7 +326,7 @@
    private fun callseatmoney(num: String, click: () -> Unit) {
        var map = getMapByAny()
        map["orderId"] = orderId
        map["difference"] = num
        map["difference"] = doubleTwo(num.toDouble())
        callNet(true,Api.makeUpTheDifference, map) {
            click()
        }
@@ -543,6 +543,7 @@
                tv_red_money.gone()
            }
            tv_phone.text = orderBean.data.phone
//            tv_gap_money.text = "￥"+doubleTwo(num.toDouble())+"差价(点击修改)"
            showStatueMapUI(it)
        }
    }
@@ -775,8 +776,13 @@
                toast("请输入金额")
                return@setOnClickListener
            }
            if (num.toDouble() > 9999) {
                toast("金额不能大于9999元")
                return@setOnClickListener
            }
            callseatmoney(num){
                dialog.dismiss()
                tv_gap_money.text = "￥"+doubleTwo(num.toDouble())+"差价(点击修改)"
                toast("设置成功")
            }
        }

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

@@ -50,7 +50,7 @@
                android:background="#396F6A"
                android:hint="填写金额"
                android:inputType="numberDecimal"
                android:maxLength="10"
                android:maxLength="7"
                android:paddingStart="10dp"
                android:paddingTop="10dp"
                android:paddingEnd="10dp"

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

@@ -13,7 +13,7 @@
        <RelativeLayout
            android:id="@+id/rl_top_back"
            android:layout_width="match_parent"
            android:layout_height="140dp"
            android:layout_height="110dp"
            android:background="@color/green_154c49">

            <TextView
@@ -21,10 +21,10 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerHorizontal="true"
                android:layout_marginTop="38dp"
                android:layout_marginTop="20dp"
                android:text="距您约1.5公里"
                android:textColor="@color/yellow_ffa72d"
                android:textSize="60sp" />
                android:textSize="55sp" />

            <TextView
                android:id="@+id/tv_car_type"
@@ -82,85 +82,85 @@
            android:background="#154C49"
            android:orientation="vertical"
            android:paddingStart="33dp"
            android:paddingTop="15dp">
            android:paddingTop="10dp">

            <TextView
                android:id="@+id/tv_time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="6dp"
                android:layout_marginTop="1dp"
                android:drawablePadding="5dp"
                android:layout_marginBottom="6dp"
                android:drawableStart="@mipmap/icon_time_xiao"
                android:text="4月3日 14:00"
                android:textColor="@color/write"
                android:textSize="32sp"
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_start"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="6dp"
                android:layout_marginBottom="6dp"
                android:layout_marginTop="4dp"
                android:layout_marginBottom="4dp"
                android:drawableStart="@drawable/bg_point_main_color_slab"
                android:drawablePadding="5dp"
                android:text="柳州市政府"
                android:textColor="@color/write"
                android:textSize="32sp"
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_end"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="6dp"
                android:layout_marginBottom="6dp"
                android:layout_marginTop="4dp"
                android:layout_marginBottom="4dp"
                android:drawableStart="@drawable/bg_point_main_color_black_slab"
                android:drawablePadding="5dp"
                android:text="柳州客运中心"
                android:textColor="@color/write"
                android:textSize="32sp"
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="6dp"
                android:layout_marginBottom="6dp"
                android:layout_marginTop="4dp"
                android:layout_marginBottom="4dp"
                android:drawableStart="@mipmap/people_cargo"
                android:drawablePadding="10dp"
                android:text="张三-169345734"
                android:textColor="@color/write"
                android:textSize="32sp"
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_cargo_num"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="6dp"
                android:layout_marginBottom="6dp"
                android:layout_marginTop="4dp"
                android:layout_marginBottom="4dp"
                android:drawableStart="@mipmap/item_cargo"
                android:drawablePadding="10dp"
                android:text="普通小件"
                android:textColor="@color/write"
                android:textSize="32sp"
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_money"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="3dp"
                android:layout_marginTop="1dp"
                android:layout_marginStart="2dp"
                android:layout_marginBottom="17dp"
                android:layout_marginBottom="15dp"
                android:drawableStart="@mipmap/hongbao_xiao"
                android:drawablePadding="10dp"
                android:text="2元加急费"
                android:textColor="@color/write"
                android:textSize="32sp"
                android:textSize="30sp"
                android:textStyle="bold" />


@@ -169,7 +169,7 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="17dp"
            android:layout_marginTop="14dp"
            android:orientation="horizontal">

            <TextView