first commit

liugl

2020-07-14 d1575655feca0be9484ae1050a93992adba6701a

first commit

 app/build.gradle

@@ -32,7 +32,7 @@
        ndk {
            // 设置支持的SO库架构，第三方给的so库哪几种架构，就配置这几种架构
//            abiFilters 'armeabi','x86'
            abiFilters 'armeabi','armeabi-v7a'
            abiFilters 'armeabi'
        }
    }


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

@@ -23,6 +23,7 @@
import com.okgoincar.netUtls.getUserId
import com.okgoincar.utils.Cache.CacheKey
import com.google.gson.Gson
import com.okgoincar.base.gpsnav.util.TTSController
import com.okgoincar.bean.CarLocationBean
import com.okgoincar.bean.OrderSimpleData
import com.okgoincar.bean.websocket.HeartBean
@@ -268,6 +269,7 @@
    companion object {
        private const val TAG = "MyApplication"
        public var appContext: MyApplication? = null
        protected var mTtsManager: TTSController? = null

        fun getInstance(): MyApplication? {
            if (appContext == null) {
@@ -276,6 +278,14 @@
            return appContext
        }

        fun getTTsManager():TTSController{
            if (mTtsManager == null){
                mTtsManager = TTSController.getInstance(getInstance())
                mTtsManager?.init()
            }
            return mTtsManager!!
        }

        fun getLocation(): AMapLocation {
            if (aMapLocation == null) {
                var locationStr = CacheKey.getKeyStr("location")

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

@@ -12,8 +12,8 @@
//    public static final int SOCKET_PORT = 8888;

    //外网
    public static final String BASE_URL = "http://139.9.249.67:80/driver/";
    public static final String SOCKET_SERVER = "139.9.249.67";
    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/slab/SlabGetOrderFragment.kt

@@ -101,6 +101,7 @@
                        lineTance: Float,
                        lineTime: Long
                    ) {
                        MyApplication.getTTsManager().setVideoText("收到新的"+UiUtil.getNameByType(orderType!!)+"订单，"+"从"+data.startAddress+"出发，距您约"+AMapKit.getTance(lineTance))
                        tv_title.text = "距您约" + AMapKit.getTance(lineTance)
                    }
                })

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

@@ -105,6 +105,11 @@
            var data = gson.fromJson<HomeDataBean>(it, HomeDataBean::class.java)
            homeDataBean = data
            tv_car.text = if (data.data.work == 1) "收车" else "出车"
            if (data.data.work == 1){
                MyApplication.getTTsManager().setVideoText("您正在上班中")
            }else{
                MyApplication.getTTsManager().setVideoText("您已下班")
            }
        }


@@ -150,7 +155,7 @@
                callNet(true, Api.work2, getMapByAny()) {
                    homeDataBean?.data?.work = 2
                    tv_car.text = "出车"
                    toast("下班成功")
                    MyApplication.getTTsManager().setVideoText("您已下班")
                }
            } else {
                var map = getMapByAny()
@@ -158,7 +163,7 @@
                callNet(true, Api.work2, map) {
                    homeDataBean?.data?.work = 1
                    tv_car.text = "收车"
                    toast("上班成功")
                    MyApplication.getTTsManager().setVideoText("您正在上班中")
                }
            }
        }