优化订单结束交互

18034727885

2026-07-02 79c5ddcd7db9752289f3a0915636aad0b20ade02

优化订单结束交互

 app/build.gradle

@@ -24,8 +24,8 @@
        applicationId "com.jxonlinecar.driver"
        minSdkVersion 26
        targetSdkVersion 30
        versionCode 1
        versionName "1.0"
        versionCode 2
        versionName "1.1"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -42,7 +42,7 @@
            applicationVariants.all { variant ->
                // 更新至Android Studio 3.3 gradle 4.10.1
                variant.outputs.all {
                    outputFileName = "jxonlinecar-${defaultConfig.versionName}-${new Date().format("yyyy-MM-dd" , TimeZone.getTimeZone("GMT+08")) }.apk"
                    outputFileName = "jxonlinecar-${defaultConfig.versionName}-${variant.name}-${new Date().format("yyyy-MM-dd" , TimeZone.getTimeZone("GMT+08")) }.apk"
                }
            }
        }

 app/src/main/java/com/jxonlinecar/driver/base/MyApplication.kt

@@ -17,6 +17,7 @@
import com.amap.api.location.AMapLocationListener
import com.amap.api.maps.MapsInitializer
import com.google.gson.Gson
import com.jxonlinecar.driver.BuildConfig
import com.jxonlinecar.driver.base.gaode.AMapKit
import com.jxonlinecar.driver.base.gaode.gpsnav.util.TTSController
import com.jxonlinecar.driver.bean.*
@@ -32,6 +33,7 @@
import com.jxonlinecar.driver.utils.Cache.CacheUtil
import com.jxonlinecar.driver.utils.LogUtils
import com.jxonlinecar.driver.utils.SPUtil
import com.tencent.bugly.crashreport.CrashReport
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
import com.xuexiang.xui.XUI
@@ -93,7 +95,11 @@
        PlatformConfig.setWeixin("wxd997f17beb1dd7a4", "a403388bafbfceb639e0a451e5403a12")
        PlatformConfig.setQQZone("1105920536", "bx7zWrVgTskXHZTr") //qq互联
        LogUtils.OpenLog(true)
//        CrashReport.initCrashReport(getApplicationContext(), "444bb776ed", false);
        CrashReport.initCrashReport(
            applicationContext,
            if (BuildConfig.DEBUG) "cc3a0708c6" else "aac9e8444c",
            false
        )
    }

    private fun initSocket() {

 app/src/main/java/com/jxonlinecar/driver/ui/main/TripActivity.kt

@@ -226,7 +226,8 @@
                                callStatue(6,{
                                    startActivity<MajorSureMoneyActivity>(
                                        "orderId" to orderId,
                                        "orderType" to orderType
                                        "orderType" to orderType,
                                        "needJumpOverPage" to false
                                    )
                                    finish()
                                }) {
@@ -305,10 +306,10 @@
            callStatue(6,{
                callNet(Api.confirmFees, map) {
                    finish()
                    startActivity<OrderOverActivity>(
                            "orderId" to orderId,
                            "orderType" to orderType
                    )
//                    startActivity<OrderOverActivity>(
//                            "orderId" to orderId,
//                            "orderType" to orderType
//                    )
                }
            }) {


 app/src/main/java/com/jxonlinecar/driver/ui/main/major/MajorSureMoneyActivity.kt

@@ -24,6 +24,10 @@
        intent.getStringExtra("orderId")
    }

    private val needJumpOverPage by lazy {
        intent.getBooleanExtra("needJumpOverPage", true)
    }

    override fun setContentView() {
        setContentView(R.layout.activity_sure_money)
    }
@@ -78,11 +82,13 @@
        callNet(false, Api.confirmFees, map) {
            EventBus.getDefault().post(BaseEvent(BaseEvent.BACK_CAR_OVER))
            finish()
            startActivity<OrderOverActivity>(
                "orderId" to orderId,
                "orderType" to orderType,
                "isTrip" to true
            )
            if(needJumpOverPage){
                startActivity<OrderOverActivity>(
                    "orderId" to orderId,
                    "orderType" to orderType,
                    "isTrip" to true
                )
            }
        }
    }