Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit...

liugl

2020-12-31 5af5d1d3134ebd217630c07245dd072942cbf9a4

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

@@ -366,7 +366,7 @@
    private fun initMineLocation() {
        AMapKit.initLocation(this, AMapLocationListener {
            it?.let {
                toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
//                toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
                if (it.errorCode == 0) {
                    MyApplication.aMapLocation = it
                    carMarker!!.position = LatLng(it.latitude, it.longitude)