1:新增小件物流

liugl

2020-12-15 3033ff47f2c95c11a0354cceb4b39ce07fa26abe

1:新增小件物流

 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/base/MoneyBroadCastReceiver.kt

@@ -171,7 +171,7 @@
            }
        }

        private fun callStartOrder(contexts: Context, i: Int) {
         fun callStartOrder(contexts: Context, i: Int) {
            var map = getMapByAny()
            map["orderId"] = MyApplication.currentOrderId
            map["orderType"] = MyApplication.currentOrderType

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

@@ -12,14 +12,14 @@
//    public static final int SOCKET_PORT = 9999;

    //39.108.148.228 测试服务器
//    public static final String BASE_URL = "http://39.108.148.228:80/driver/";
//    public static final String SOCKET_SERVER = "39.108.148.228";
//    public static final int SOCKET_PORT = 8888;
    public static final String BASE_URL = "http://39.108.148.228:80/driver/";
    public static final String SOCKET_SERVER = "39.108.148.228";
    public static final int SOCKET_PORT = 8888;

    //外网
    public static final String BASE_URL = "https://okyueche.com:443/driver/";
    public static final String SOCKET_SERVER = "39.108.122.38";
    public static final int SOCKET_PORT = 8888;
//    public static final String BASE_URL = "https://okyueche.com:443/driver/";
//    public static final String SOCKET_SERVER = "39.108.122.38";
//    public static final int SOCKET_PORT = 8888;
    public static final  int SUCCESS = 200;

    /**

 app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt

@@ -13,6 +13,7 @@
import com.okgoincar.bean.OrderListBean
import com.okgoincar.slab.SlabMainActivity
import com.okgoincar.slab.SlabTripActivity
import com.okgoincar.slab.cargo.CargoActivity
import com.okgoincar.slab.util.DialogUtil
import kotlinx.android.synthetic.main.item_main_list_slab.view.*
import kotlinx.android.synthetic.main.item_main_list_slab.view.tv_end
@@ -36,6 +37,13 @@
            it.itemView.tv_qian.text = item.redMoney.toString() + "元小费"

            it.itemView.clickDelay {
                if (item.type == 4 || item.type == 5){
                    context.startActivity<CargoActivity>(
                        "orderId" to item.id.toString(),
                        "orderType" to item.type.toString()
                    )
                    return@clickDelay
                }
                when (item.state) {
                    2, 3, 4, 5 -> {
                        context.startActivity<SlabTripActivity>(

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

@@ -62,7 +62,11 @@
class CargoActivity : MySlabBaseActivity() {

    private fun callOver(contexts: Context, travelFee: Double) {
        MoneyBroadCastReceiver.callOver(contexts, travelFee)
        callEnd(contexts, travelFee)
    }

    private fun callEnd(contexts: Context, travelFee: Double) {
        showChangeCargoDialog()
    }

    private fun callStatue(contexts: Context, i: Int) {
@@ -303,7 +307,7 @@
        var map = getMapByAny()
        map["orderId"] = orderId
        map["pickUpCode"] = num
        callNet(true,Api.fillInPickUpCode, map) {
        callNet(true,Api.                                                                                                                                                            fillInPickUpCode, map) {
            click()
        }
    }
@@ -473,9 +477,6 @@
        callNet(this, Api.queryOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderBean::class.java)
            showUi(orderBean)
//            Handler(Looper.getMainLooper()).postDelayed({
//                startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
//            },1000)
        }
        callPersion()
    }
@@ -721,14 +722,26 @@
            }
            callNumberCargo(num){
                dialog.dismiss()
                startActivity<SlabOrderOverActivity>(
                    "orderId" to orderId,
                    "orderType" to orderType
                )
                callStartOrder(this,6){
                    onBackPressed()
                }
            }
        }
    }

    fun callStartOrder(contexts: Context, i: Int,func:() -> Unit) {
        var map = getMapByAny()
        map["orderId"] = MyApplication.currentOrderId
        map["orderType"] = MyApplication.currentOrderType
        map["state"] = i
        map["lat"] = MyApplication.getLocation().latitude
        map["lon"] = MyApplication.getLocation().longitude
        callNet(contexts, Api.process, map) {
            EventBus.getDefault().post(BaseEvent(BaseEvent.UP_TRIP))
            func()
        }
    }



    private fun showGaoMoneyDialog() {

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

@@ -412,7 +412,6 @@
        android:layout_width="wrap_content"
        android:layout_marginStart="150dp"
        android:text="开始行程"
        android:visibility="gone"
        android:layout_height="match_parent"/>

    <Button
@@ -420,7 +419,6 @@
        android:layout_width="wrap_content"
        android:layout_marginStart="300dp"
        android:text="结束行程"
        android:visibility="gone"
        android:layout_height="match_parent"/>