1:新增上线 6版 tipmusic

liugl

2020-12-28 69bb7a2b82d1fa25167a9b6f06ebf5ee725e9206

1:新增上线 6版 tipmusic

 app/src/main/java/com/okgoincar/base/AMapKit.kt

@@ -33,8 +33,8 @@
        //设置为高精度定位模式
//        mLocationOption.isNeedAddress = true
        mLocationOption.interval = 5000
        mLocationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy
//        mLocationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Device_Sensors
//        mLocationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy
        mLocationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Device_Sensors
        //设置定位参数
        mlocationClient.setLocationOption(mLocationOption)
        // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，

 app/src/main/java/com/okgoincar/bean/OrderBean.java

@@ -82,6 +82,28 @@
        private String type;
        private String emergencyCall;
        private String peopleNumber;
        private String  differenceMoney;
        private String cargoType;

        public String getCargoType() {
            return cargoType;
        }

        public void setCargoType(String cargoType) {
            this.cargoType = cargoType;
        }

        public void setTipMoney(Double tipMoney) {
            this.tipMoney = tipMoney;
        }

        public String getDifferenceMoney() {
            return differenceMoney;
        }

        public void setDifferenceMoney(String differenceMoney) {
            this.differenceMoney = differenceMoney;
        }

        public String getPeopleNumber() {
            return peopleNumber;

 app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt

@@ -131,7 +131,8 @@
                tv_money.visible()
                tv_money.setDrawableLeft(R.mipmap.rocket_cargo)
                tv_name.text = data.nickName+"-"+data.phone
                tv_cargo_num.text = "普通小件X"+data.peopleNumber
                var cargoStrType = if (data.cargoType == "1") "普通小件X" else "贵重小件X"
                tv_cargo_num.text = cargoStrType+data.peopleNumber
                if (data.tipMoney != null && data.tipMoney > 0.0){
                    tv_money.text = doubleTwo(data.tipMoney)+"元加急费"
                }else{

 app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt

@@ -250,6 +250,7 @@
        }
    }

    var testOrderId = 267

    override fun setOnclick() {
        tv_server_ing.setOnClickListener {
@@ -281,7 +282,8 @@
        }

        tv_title_top.clickDelay {
            showOrder("33","4",202,1)
            testOrderId++
            showOrder(testOrderId.toString(),"4",265,1)
        }

        iv_small.setOnClickListener {

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

@@ -269,6 +269,10 @@
        }

        tv_gap_money.clickDelay {
            if (orderBean.data.orderState == 12){
                toast("用户已支付差价，不能修改")
                return@clickDelay
            }
            showGaoMoneyDialog()
        }

@@ -543,7 +547,9 @@
                tv_red_money.gone()
            }
            tv_phone.text = orderBean.data.phone
//            tv_gap_money.text = "￥"+doubleTwo(num.toDouble())+"差价(点击修改)"
            if (!it.data.differenceMoney.isNullOrEmpty() && it.data.differenceMoney.toDouble() > 0){
                tv_gap_money.text = "￥"+doubleTwo(it.data.differenceMoney.toDouble())+"差价(点击修改)"
            }
            showStatueMapUI(it)
        }
    }

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

@@ -26,11 +26,11 @@
            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"
            android:textSize="50sp" />
            android:textSize="50sp"
            android:textStyle="bold" />

    </RelativeLayout>

@@ -43,161 +43,174 @@
        android:layout_marginBottom="10dp"
        android:orientation="vertical">

        <LinearLayout
            android:id="@+id/ll_info_top"
            android:layout_width="384dp"
            android:layout_height="wrap_content"
            android:layout_margin="10dp"
            android:background="@drawable/bg_slab_main_8"
            android:elevation="5dp"
            android:orientation="vertical"
            android:paddingStart="10dp">

            <TextView
                android:id="@+id/tv_name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="23dp"
                android:text="可乐"
                android:textColor="#ffffffff"
                android:textSize="34sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_car_num"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="23dp"
                android:layout_marginBottom="9dp"
                android:text="123次乘车"
                android:textColor="#ffffffff"
                android:textSize="30sp"
                android:textStyle="bold"
                android:visibility="gone" />

            <TextView
                android:id="@+id/tv_phone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="23dp"
                android:layout_marginBottom="22dp"
                android:drawableStart="@mipmap/icon_dial_slab"
                android:drawablePadding="10dp"
                android:text="15367543211"
                android:textColor="#ffffffff"
                android:textSize="30sp"
                android:textStyle="bold" />

        </LinearLayout>

        <LinearLayout
            android:id="@+id/ll_order_top"
            android:layout_width="384dp"
            android:layout_height="0dp"
        <androidx.core.widget.NestedScrollView
            android:layout_width="404dp"
            android:layout_weight="1"
            android:layout_marginStart="10dp"
            android:layout_marginEnd="10dp"
            android:layout_marginBottom="10dp"
            android:background="@drawable/bg_slab_main_8_bottom"
            android:elevation="5dp"
            android:orientation="vertical"
            android:paddingStart="16dp">
            android:layout_height="0dp">

            <LinearLayout
                android:layout_width="404dp"
                android:layout_height="match_parent"
                android:orientation="vertical">

                <LinearLayout
                    android:id="@+id/ll_info_top"
                    android:layout_width="384dp"
                    android:layout_height="wrap_content"
                    android:layout_margin="10dp"
                    android:background="@drawable/bg_slab_main_8"
                    android:elevation="5dp"
                    android:orientation="vertical"
                    android:paddingStart="10dp">

                    <TextView
                        android:id="@+id/tv_name"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="23dp"
                        android:text="可乐"
                        android:textColor="#ffffffff"
                        android:textSize="34sp"
                        android:textStyle="bold" />

                    <TextView
                        android:id="@+id/tv_car_num"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="23dp"
                        android:layout_marginBottom="9dp"
                        android:text="123次乘车"
                        android:textColor="#ffffffff"
                        android:textSize="30sp"
                        android:textStyle="bold"
                        android:visibility="gone" />

                    <TextView
                        android:id="@+id/tv_phone"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="23dp"
                        android:layout_marginBottom="22dp"
                        android:drawableStart="@mipmap/icon_dial_slab"
                        android:drawablePadding="10dp"
                        android:text="15367543211"
                        android:textColor="#ffffffff"
                        android:textSize="30sp"
                        android:textStyle="bold" />

                </LinearLayout>



            <TextView
                android:id="@+id/tv_time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="21dp"
                android:maxLines="1"
                android:ellipsize="end"
                android:layout_marginBottom="11dp"
                android:drawableStart="@mipmap/icon_time_xiao"
                android:drawablePadding="13dp"
                android:text="4月3日 14:00"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />
                <LinearLayout
                    android:id="@+id/ll_order_top"
                    android:layout_width="384dp"
                    android:layout_height="0dp"
                    android:layout_marginStart="10dp"
                    android:layout_marginEnd="10dp"
                    android:layout_marginBottom="10dp"
                    android:layout_weight="1"
                    android:background="@drawable/bg_slab_main_8_bottom"
                    android:elevation="5dp"
                    android:orientation="vertical"
                    android:paddingStart="16dp">


            <TextView
                android:id="@+id/tv_start_address"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:maxLines="1"
                android:ellipsize="end"
                android:layout_marginBottom="11dp"
                android:drawableStart="@drawable/bg_point_main_color_slab"
                android:drawablePadding="13dp"
                android:text="柳州市政府旁红旗连锁超市"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />
                    <TextView
                        android:id="@+id/tv_time"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="21dp"
                        android:layout_marginBottom="11dp"
                        android:drawableStart="@mipmap/icon_time_xiao"
                        android:drawablePadding="13dp"
                        android:ellipsize="end"
                        android:maxLines="1"
                        android:text="4月3日 14:00"
                        android:textColor="#ffffffff"
                        android:textSize="26sp"
                        android:textStyle="bold" />


            <TextView
                android:id="@+id/tv_end_address"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:maxLines="1"
                android:ellipsize="end"
                android:layout_marginBottom="11dp"
                android:drawableStart="@drawable/bg_point_main_color_black_slab"
                android:drawablePadding="13dp"
                android:text="柳州客运中心"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />
                    <TextView
                        android:id="@+id/tv_start_address"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="11dp"
                        android:layout_marginBottom="11dp"
                        android:drawableStart="@drawable/bg_point_main_color_slab"
                        android:drawablePadding="13dp"
                        android:ellipsize="end"
                        android:maxLines="1"
                        android:text="柳州市政府旁红旗连锁超市"
                        android:textColor="#ffffffff"
                        android:textSize="26sp"
                        android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_name_phone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginBottom="11dp"
                android:maxLines="1"
                android:ellipsize="end"
                android:drawableStart="@mipmap/people_cargo"
                android:drawablePadding="20dp"
                android:text="张三-145764578"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_type_cargo"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginBottom="11dp"
                android:maxLines="1"
                android:ellipsize="end"
                android:drawableStart="@mipmap/item_cargo"
                android:drawablePadding="20dp"
                android:text="普通小件"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />
                    <TextView
                        android:id="@+id/tv_end_address"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="11dp"
                        android:layout_marginBottom="11dp"
                        android:drawableStart="@drawable/bg_point_main_color_black_slab"
                        android:drawablePadding="13dp"
                        android:ellipsize="end"
                        android:maxLines="1"
                        android:text="柳州客运中心"
                        android:textColor="#ffffffff"
                        android:textSize="26sp"
                        android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_red_money"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:layout_marginBottom="11dp"
                android:maxLines="1"
                android:ellipsize="end"
                android:drawableStart="@mipmap/rocket_cargo"
                android:drawablePadding="20dp"
                android:text="8元加急费"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />
                    <TextView
                        android:id="@+id/tv_name_phone"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="11dp"
                        android:layout_marginBottom="11dp"
                        android:drawableStart="@mipmap/people_cargo"
                        android:drawablePadding="20dp"
                        android:ellipsize="end"
                        android:maxLines="1"
                        android:text="张三-145764578"
                        android:textColor="#ffffffff"
                        android:textSize="26sp"
                        android:textStyle="bold" />

        </LinearLayout>
                    <TextView
                        android:id="@+id/tv_type_cargo"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="11dp"
                        android:layout_marginBottom="11dp"
                        android:drawableStart="@mipmap/item_cargo"
                        android:drawablePadding="20dp"
                        android:ellipsize="end"
                        android:maxLines="1"
                        android:text="普通小件"
                        android:textColor="#ffffffff"
                        android:textSize="26sp"
                        android:textStyle="bold" />

                    <TextView
                        android:id="@+id/tv_red_money"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="11dp"
                        android:layout_marginBottom="11dp"
                        android:drawableStart="@mipmap/rocket_cargo"
                        android:drawablePadding="20dp"
                        android:ellipsize="end"
                        android:maxLines="1"
                        android:text="8元加急费"
                        android:textColor="#ffffffff"
                        android:textSize="26sp"
                        android:textStyle="bold" />

                </LinearLayout>

            </LinearLayout>
        </androidx.core.widget.NestedScrollView>

        <com.okgoincar.utils.view.SlidingButton
            android:id="@+id/slide_btn"
@@ -256,14 +269,14 @@
            android:id="@+id/tv_gap_money"
            android:layout_width="wrap_content"
            android:layout_height="40dp"
            android:text="补差价"
            android:gravity="center"
            android:layout_alignParentEnd="true"
            android:layout_alignParentBottom="true"
            android:layout_marginEnd="40dp"
            android:layout_marginBottom="90dp"
            android:textSize="30dp"
            android:gravity="center"
            android:text="补差价"
            android:textColor="@color/main_yellow"
            android:layout_alignParentEnd="true"
            android:layout_alignParentBottom="true" />
            android:textSize="30dp" />

        <ImageView
            android:id="@+id/iv_to_gd"
@@ -306,21 +319,21 @@
                android:id="@+id/tv_code_num"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textStyle="bold"
                android:layout_marginTop="16dp"
                android:text="证号：123441415242345678"
                android:textColor="#ffffffff"
                android:textSize="30sp" />
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_name_car_man"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:textStyle="bold"
                android:text="姓名：张师傅"
                android:textColor="#ffffffff"
                android:textSize="30sp" />
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_car_num_var"
@@ -328,9 +341,9 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:text="车牌：桂B12345"
                android:textStyle="bold"
                android:textColor="#ffffffff"
                android:textSize="30sp" />
                android:textSize="30sp"
                android:textStyle="bold" />

            <LinearLayout
                android:layout_width="wrap_content"
@@ -344,9 +357,9 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="星级："
                    android:textStyle="bold"
                    android:textColor="#ffffffff"
                    android:textSize="30sp" />
                    android:textSize="30sp"
                    android:textStyle="bold" />

                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/recycler_view_start"
@@ -361,9 +374,9 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:text="公司：云森科技公司"
                android:textStyle="bold"
                android:textColor="#ffffffff"
                android:textSize="30sp" />
                android:textSize="30sp"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/tv_time_send_prove"
@@ -371,9 +384,9 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="11dp"
                android:text="发证日期：2018.12.1"
                android:textStyle="bold"
                android:textColor="#ffffffff"
                android:textSize="30sp" />
                android:textSize="30sp"
                android:textStyle="bold" />

        </LinearLayout>

@@ -392,11 +405,11 @@
            android:layout_below="@+id/iv_head"
            android:layout_alignParentEnd="true"
            android:layout_marginTop="14dp"
            android:textStyle="bold"
            android:layout_marginEnd="35dp"
            android:text="8月32日星期三"
            android:textColor="#ffffffff"
            android:textSize="26sp" />
            android:textSize="26sp"
            android:textStyle="bold" />


    </RelativeLayout>
@@ -418,23 +431,21 @@
        android:textSize="40sp" />




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

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


</RelativeLayout>