融合最新代码 升级版本号

18034727885

2026-03-17 162564950c599a0d97ed9aade4301f8f6d285fbe

 app/src/main/java/com/igo/user/ui/MainActivity.kt

@@ -12,6 +12,7 @@
import android.widget.TextView
import androidx.core.os.bundleOf
import androidx.core.view.GravityCompat
import androidx.core.view.isVisible
import androidx.drawerlayout.widget.DrawerLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
@@ -284,6 +285,7 @@
                cn.sinata.xldutils.R.color.black
            ).build()
        tv_tip.text = stringBuilder
        tv_tip.isVisible = mViewPager.currentItem != 1

        /* if (isOpen&&func.isNotEmpty()){
             checkNewVersion()
@@ -562,7 +564,7 @@
                    }
                    isTripping = true
                    tv_tip.text = getString(R.string.您有一笔订单正进行中)
                    tv_tip.visible()
                    tv_tip.isVisible = mViewPager.currentItem != 1
                    Log.e("当前订单详情: ", "order.state ${order.state}")
                    Log.e("当前订单详情: ", "order.orderType ${order.orderType}")
                    tv_tip.setOnClickListener {
@@ -663,6 +665,7 @@

    fun updateTipText(t: Spannable) {
        tv_tip.text = t
        tv_tip.isVisible = mViewPager.currentItem != 1
    }

    /**
@@ -751,14 +754,17 @@
                IGoApplication.lat = data.getDoubleExtra("lat", 0.0)
                IGoApplication.lon = data.getDoubleExtra("lon", 0.0)

                taxiFragment.aMap.moveCamera(
                    CameraUpdateFactory.newLatLng(
                        LatLng(
                            IGoApplication.lat,
                            IGoApplication.lon
                lifecycleScope.launchWhenResumed {
                    taxiFragment.aMap.moveCamera(
                        CameraUpdateFactory.newLatLng(
                            LatLng(
                                IGoApplication.lat,
                                IGoApplication.lon
                            )
                        )
                    )
                )
                }

                Log.e("定位==============》", "${latHome},${lonHome}")
                // finish()
            } else if (!isOpen || func.isEmpty()) {