From c3e8d385d7dfe271f4a225cd6e03c7e165af1e2c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 4 Aug 2023 11:47:21 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81java->kotlin,arouter?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8F=92=E4=BB=B6=E8=A6=81=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE=202=E3=80=81gradle=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B04.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/taxi/mogo-och-taxi-unmanned/build.gradle | 18 ++++++++----- .../och/taxi/network/OchLoginServiceApi.java | 2 +- .../mogo/och/taxi/ui/TaxiBeingTaskFragment.kt | 25 ++++++++----------- .../och/taxi/ui/TaxiReserveOrderFragment.kt | 4 +-- gradle/ext.gradle | 2 +- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/OCH/taxi/mogo-och-taxi-unmanned/build.gradle b/OCH/taxi/mogo-och-taxi-unmanned/build.gradle index f12678afda..986e8e676c 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/build.gradle +++ b/OCH/taxi/mogo-och-taxi-unmanned/build.gradle @@ -16,9 +16,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - javaCompileOptions { - annotationProcessorOptions { - arguments = [AROUTER_MODULE_NAME: project.getName(),"room.schemaLocation": "$projectDir/schemas".toString()] + kapt { + useBuildCache = false + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) } } } @@ -51,15 +52,20 @@ dependencies { implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.material - annotationProcessor rootProject.ext.dependencies.aroutercompiler + kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap implementation "androidx.fragment:fragment-ktx:1.3.6" - kapt "android.arch.lifecycle:extensions:1.1.1" - kapt "android.arch.persistence.room:compiler:1.1.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + +// annotationProcessor"android.arch.lifecycle:compiler:1.1.1" +// kapt"android.arch.lifecycle:compiler:1.1.1" + + annotationProcessor"android.arch.persistence.room:compiler:1.1.1" + kapt"android.arch.persistence.room:compiler:1.1.1" implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java index 9872605495..14cc0a6e89 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java @@ -57,7 +57,7 @@ interface OchLoginServiceApi { * @return */ @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @GET( "/autopilot-car-hailing/operation/v1/driver/taxi/loginStatus") + @GET( "/och-taxi-cabin/api/business/v1/loginStatus") Observable queryDriverServiceStatusAndLoginStatus(@Header ("appId") String appId , @Header("ticket") String ticket, @Query("sn") String sn); diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt index 302842062b..d1dca56480 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt @@ -2,7 +2,6 @@ package com.mogo.och.taxi.ui import android.annotation.SuppressLint import android.app.Activity -import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Build @@ -88,8 +87,9 @@ class TaxiBeingTaskFragment : BaseFragment(), return "TaxiBeingTaskFragment" } - override fun onAttach(context: Context) { - super.onAttach(context) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } override fun initViews() { @@ -105,8 +105,7 @@ class TaxiBeingTaskFragment : BaseFragment(), private fun initData() { lifecycleScope.launchWhenStarted { - mViewModel.let { - it.uiIntentFlow.collect { state -> + mViewModel.uiIntentFlow.collect { state -> d(TAG,"uiIntentFlow: $state") when(state){ is UnmannedIntent.GetNextTask -> { @@ -119,13 +118,12 @@ class TaxiBeingTaskFragment : BaseFragment(), else -> {} } } - } + } //监听返回的数据状态 lifecycleScope.launchWhenStarted { - mViewModel.let{ - it.uiStateFlow.map {it.taskUiState}.collect {state -> + mViewModel.uiStateFlow.map {it.taskUiState}.collect {state -> d(TAG,"uiStateFlow: $state") when(state){ is TaskUiState.INIT -> { @@ -138,7 +136,6 @@ class TaxiBeingTaskFragment : BaseFragment(), } } } - } } } @@ -388,9 +385,9 @@ class TaxiBeingTaskFragment : BaseFragment(), private fun startOrEndService() { if (mCurrentOrder == null) return if (TaxiOrderStatusEnum.ArriveAtStart.code == mCurrentOrder!!.orderStatus) { //到达乘客上车点，司机可跳过乘客屏认证 - mViewModel?.sendUiIntent(UnmannedIntent.JumpPassengerCheckDone) + mViewModel.sendUiIntent(UnmannedIntent.JumpPassengerCheckDone) } else if (TaxiOrderStatusEnum.ArriveAtEnd.code == mCurrentOrder!!.orderStatus) { //点击了完成服务，结束订单并更新订单信息 - mViewModel?.sendUiIntent(UnmannedIntent.JourneyCompleted) + mViewModel.sendUiIntent(UnmannedIntent.JourneyCompleted) } else if (TaxiOrderStatusEnum.OnTheWayToEnd.code == mCurrentOrder!!.orderStatus) { //前往目的地过程中可提前结束行程 //自驾中提示，接管后才能结束 if (getState() @@ -413,7 +410,7 @@ class TaxiBeingTaskFragment : BaseFragment(), .build(requireContext()) closeOrderDialog!!.setClickListener(object : OCHCommitDialog.ClickListener { override fun confirm() { - mViewModel?.sendUiIntent(UnmannedIntent.CloseOrderByDriver) + mViewModel.sendUiIntent(UnmannedIntent.CloseOrderByDriver) } override fun cancel() { @@ -821,9 +818,7 @@ class TaxiBeingTaskFragment : BaseFragment(), } fun updateOrderBottomBtnUI() { - mViewModel?.let { - it.sendUiIntent(UnmannedIntent.StartTask) - } + mViewModel.sendUiIntent(UnmannedIntent.StartTask) } private fun updateOrderBottomBtn(txt: String?, txtColorId: Int, bgColorId: Int, isClickable: Boolean) { diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt index 9ffafbf45e..083cbd4625 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt @@ -44,8 +44,7 @@ class TaxiReserveOrderFragment : BaseFragment() { private fun initData() { //监听返回的数据状态 lifecycleScope.launchWhenStarted { - mViewModel.let{ - it.uiStateFlow.map {it.orderUiState}.collect {state -> + mViewModel.uiStateFlow.map {it.orderUiState}.collect {state -> CallerLogger.d(TAG, "uiStateFlow: $state") when(state){ is OrderUiState.INIT -> { @@ -58,7 +57,6 @@ class TaxiReserveOrderFragment : BaseFragment() { } } } - } } companion object { diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 8f5714fe9b..7c2804c944 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -1,5 +1,5 @@ ext { - gradle_version = '3.5.3' + gradle_version = '4.0.0' kotlin_version = '1.5.30' plugin_version = '10.0.0_mogo' hook_log_plugin_version = '1.7.2'