合并最新代码

18034727885

2026-03-18 7804ce8edeba51418b5fde2d306e5f476dfb5993

 app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt

@@ -41,8 +41,6 @@
import com.driver.igotrip.bean.UpCarInfo
import com.driver.igotrip.bean.VersionBean
import com.driver.igotrip.netUtls.Api
import com.driver.igotrip.netUtls.Api.completeOrder
import com.driver.igotrip.netUtls.Api.getDriverOrderMessage
import com.driver.igotrip.netUtls.callNet
import com.driver.igotrip.netUtls.getMapByAny
import com.driver.igotrip.ui.DialogUtil
@@ -417,6 +415,9 @@
    private fun initLocation() {
        val fragment = map_view as SupportMapFragment
        AMapKit.initMap(fragment) {
            // zmc-remark 测试代码 给个初始位置
//            MyApplication.aMapLocation = LatLng(30.659221715540937,104.06676612263988)

            aMap = it
            RxPermissions(this).request(Manifest.permission.ACCESS_FINE_LOCATION).subscribe {
                if (it) {