8.6

liugl

2020-08-06 3f55faa0a1298bc2320d1e749f0b08b25b85d671

8.6

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 16
        versionName "16"
        versionCode 13
        versionName "13"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

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

@@ -40,7 +40,7 @@
                    "wisdom.intent.action.priceDevice" -> {
                        var price = intent.getDoubleExtra("price",0.0) //计价器价格，单位为元
                        var mileage = intent.getDoubleExtra("mileage",0.0) //里程，单位为km

                        callOver(contexts!!,price)
                    }
                }


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

@@ -27,6 +27,7 @@
import com.okgoincar.bean.websocket.HeartBean
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.getUserId
import com.okgoincar.netUtls.sendAudio
import com.okgoincar.slab.MySlabBaseActivity
import com.okgoincar.utils.Cache.CacheKey
import org.jetbrains.anko.toast
@@ -321,8 +322,8 @@
                    return Gson().fromJson(locationStr, AMapLocation::class.java)
                } else {
                    val amap = AMapLocation("")
                    amap.latitude = -1.0
                    amap.longitude = -1.0
                    amap.latitude = 0.0
                    amap.longitude = 0.0
                    return amap
                }
            } else {
@@ -400,8 +401,7 @@
        showNum--
        Handler(Looper.getMainLooper()).postDelayed({
            if (showNum == 0) {
                setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
//                getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
                getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
            }
        }, 600)

@@ -411,11 +411,5 @@
        activities.add(activity)
    }

    fun setVideoText(s: String?) {
        val intent = Intent()
        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
        intent.action = "com.wisdom.gps.action.tts"
        intent.putExtra("msg", s)
        sendBroadcast(intent)
    }

}

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

@@ -58,6 +58,15 @@
        private int state;
        private String time;
        private int type;
        private double orderMoney;

        public double getOrderMoney() {
            return orderMoney;
        }

        public void setOrderMoney(double orderMoney) {
            this.orderMoney = orderMoney;
        }

        public String stateStr(){
            switch (state){

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

@@ -7,15 +7,15 @@
public class Api {

    //内网
    public static final String BASE_URL = "http://192.168.0.80:80/driver/";
    public static final String SOCKET_SERVER = "192.168.0.80";
    public static final int SOCKET_PORT = 9999;
//    public static final String BASE_URL = "http://192.168.0.80:80/driver/";
//    public static final String SOCKET_SERVER = "192.168.0.80";
//    public static final int SOCKET_PORT = 9999;

    //外网
//    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 int SUCCESS = 200;
    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  int SUCCESS = 200;

    /**
     * 手机登录

 app/src/main/java/com/okgoincar/netUtls/NetKit.kt

@@ -1,6 +1,7 @@
package com.okgoincar.netUtls

import android.content.Context
import android.content.Intent
import android.os.CountDownTimer
import android.os.Handler
import android.os.Looper
@@ -128,6 +129,14 @@
            clickActionError(msg)
        }
    })
}

fun sendAudio(context: Context,s: String?) {
    val intent = Intent()
    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
    intent.action = "com.wisdom.gps.action.tts"
    intent.putExtra("msg", s)
    context.sendBroadcast(intent)
}


@@ -306,7 +315,6 @@
    val timer by lazy {
        object : CountDownTimer(timeDown, 1000) {
            override fun onFinish() {
                click(0)
            }

            override fun onTick(millisUntilFinished: Long) {

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

@@ -73,7 +73,7 @@
                .show()
            mBackAppTime = System.currentTimeMillis()
        } else {
            closeAll()
            moveTaskToBack(true)
        }
    }


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

@@ -1,5 +1,6 @@
package com.okgoincar.slab

import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
@@ -26,6 +27,7 @@
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.*
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.sendAudio
import com.okgoincar.slab.event.SlabMineEventActivity
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.DateUtil
@@ -213,8 +215,11 @@
            startActivity<SlabMineEventActivity>()
        }

        tv_title_top.clickDelay {
        }

        tv_car.clickDelay {

            //            if (homeDataBean?.data?.work == 1) {
//                callNet(true, Api.work2, getMapByAny()) {
//                    homeDataBean?.data?.work = 2
@@ -235,6 +240,8 @@
    }




    private
    var mBackAppTime: Long = 0

@@ -244,7 +251,7 @@
                .show()
            mBackAppTime = System.currentTimeMillis()
        } else {
            closeAll()
            moveTaskToBack(true)
        }
    }


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

@@ -20,7 +20,7 @@
        holder?.let {
            setblack(getNowTimeBlack(),it.itemView)
            it.itemView.tv_time.text = item!!.time
            it.itemView.tv_money.text = "订单金额：¥"+item!!.redMoney
            it.itemView.tv_money.text = "订单金额：¥"+item!!.orderMoney
        }
    }


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

@@ -49,7 +49,7 @@
            view.tv_start.text = it.startAddress
            view.tv_end.text = it.endAddress
            view.tv_money.text = it.redMoney.toString() + "元红包"
            view. tv_money_num.text = it.redMoney.toString()+"元"
            view. tv_money_num.text = it.orderMoney.toString()+"元"
            setBlack(getNowTimeBlack(),view)
            pop.showCenter(dictorView)
        }

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

@@ -35,12 +35,7 @@
        MyApplication.currentOrderId = ""
        showHeader(false)
        showTitle(false)
        time = timeOver (5000){
            tv_title_slab.text = "已完成($it)"
            if (it == 0){
                onBackPressed()
            }
        }

    }

    override fun onPause() {
@@ -101,6 +96,12 @@
        callNet(this, Api.queryOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderBean::class.java)
            showUi(orderBean)
            time = timeOver (5000){
                tv_title_slab.text = "已完成($it)"
                if (it == 0){
                    onBackPressed()
                }
            }
        }
    }


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

@@ -1,5 +1,6 @@
package com.okgoincar.slab

import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.Handler
@@ -43,12 +44,48 @@
import kotlinx.android.synthetic.main.dialog_select_pay_type.view.*
import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
import kotlinx.android.synthetic.main.item_map_market.view.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
import java.util.concurrent.TimeUnit


class SlabTripActivity : MySlabBaseActivity() {

    private fun callOver(contexts: Context, travelFee:Double){
        if (MyApplication.currentOrderId.isEmpty()){
            cn.sinata.xldutils.utils.toast("没有进行中的订单，无法结束")
            return
        }
        var map = getMapByAny()
        map["orderId"] = MyApplication.currentOrderId
        map["orderType"] = MyApplication.currentOrderType
        map["travelFee"] = travelFee
        map["lat"] = MyApplication.getLocation().latitude
        map["lon"] = MyApplication.getLocation().longitude
        map["type"] = 1
        callNet(contexts,Api.confirmFees_,map){
            EventBus.getDefault().post(BaseEvent(BaseEvent.SURE_MONEY))
        }

    }

    private fun callStatue(contexts: Context, i: Int) {
        if (MyApplication.currentOrderId.isEmpty()){
            cn.sinata.xldutils.utils.toast("没有进行中的订单，无法开始")
            return
        }
        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))
        }
    }


    /***
     * //    流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）
@@ -179,7 +216,17 @@
        }
    }



    private fun onclick() {
        btn_start.clickDelay {
            callStatue(this,5)
        }

        btn_end.clickDelay {
            callOver(this,10.0)
        }

        tv_change.clickDelay {
          changeMode()
        }
@@ -650,7 +697,7 @@
            }

            BaseEvent.SURE_MONEY -> {
                startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
                startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to "2")
                finish()
            }
        }

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

@@ -12,6 +12,20 @@
        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:layout_height="match_parent"/>

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

        <ImageView
            android:id="@+id/iv_back_slab"
            android:layout_width="84dp"
@@ -321,7 +335,7 @@
            android:layout_width="200dp"
            android:layout_height="200dp"
            android:layout_alignParentEnd="true"
            android:layout_marginTop="173dp"
            android:layout_marginTop="153dp"
            android:layout_marginEnd="26dp" />

        <TextView

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

@@ -195,14 +195,13 @@
            android:textSize="30sp"
            android:textStyle="bold" />


    </LinearLayout>

    <ImageView
        android:id="@+id/iv_head"
        android:layout_width="200dp"
        android:layout_height="200dp"
        android:layout_marginTop="103dp"
        android:layout_width="180dp"
        android:layout_height="180dp"
        android:layout_marginTop="75dp"
        android:layout_marginEnd="26dp"
        android:elevation="5dp"
        android:scaleType="centerCrop"