From c126430ada0a6bc72c2057d425749c4b754abeca Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 23 Apr 2024 10:35:13 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[statusbar=20=E5=81=9A=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E3=80=81taxi=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=A4=B1=E8=B4=A5]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/facade/script/och.gradle                           |  9 ++++-----
 .../java/com/mogo/och/facade/route/FacadeProvider.kt   |  7 ++++++-
 OCH/taxi/unmanned-passenger/build.gradle               | 10 ++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle
index dd8c3488f0..34d12a2126 100644
--- a/OCH/facade/script/och.gradle
+++ b/OCH/facade/script/och.gradle
@@ -5,14 +5,11 @@ project.dependencies {
 
     } else {
         if (isCurrentDriver("C1")) {
-            println "och.gradle---Driver---C1"
             implementation project.project(':OCH:sweeper:driver')
         } else if (isCurrentDriver("B1")) {
-            println "och.gradle---Driver---B1"
             implementation project.project(':OCH:shuttle:driver')
             implementation project.project(':OCH:bus:driver')
         } else if (isCurrentPassenger("B1")) {
-            println "och.gradle---Passenger---B1"
             implementation project.project(':OCH:bus:passenger')
             implementation project.project(':OCH:shuttle:passenger')
         } else if (isCurrentDriver("M1")) {
@@ -39,10 +36,12 @@ project.dependencies {
             }
         } else if (isCurrentPassenger("T1T2")) {
             println "och.gradle---Passenger---T1T2"
-            if(isCurrentDriver("saas")){
+            if(isCurrentPassenger("saas")){
+                println "och.gradle---saasPassenger---T1T2"
                 implementation project.project(':OCH:taxi:unmanned-passenger')
             }
-            if(isCurrentDriver("mogo")){
+            if(isCurrentPassenger("mogo")){
+                println "och.gradle---mogoPassenger---T1T2"
                 implementation project.project(':OCH:taxi:passenger')
             }
         } else {
diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
index 31c5e4c81f..611a8e09e2 100644
--- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
@@ -167,7 +167,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
     }
 
     private fun injectStatusBar() {
-        activity?.let {
+        activity?.let { it ->
             val decorView = it.window.decorView as? FrameLayout ?: return
             val contentView =
                 (decorView.findViewById<View>(android.R.id.content) as? ViewGroup)?.getChildAt(0)
@@ -184,6 +184,11 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
             )
             statusBarLP.topMargin = 0
             statusBarLP.gravity = Gravity.TOP
+            statusBar?.let {view->
+                if(view.isAttachedToWindow){
+                    return
+                }
+            }
             decorView.addView(statusBarView, statusBarLP)
         }
     }
diff --git a/OCH/taxi/unmanned-passenger/build.gradle b/OCH/taxi/unmanned-passenger/build.gradle
index f38c1df5fd..ddd26f146c 100644
--- a/OCH/taxi/unmanned-passenger/build.gradle
+++ b/OCH/taxi/unmanned-passenger/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -15,9 +16,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: "taxiunmanned"+project.getName()]
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", "taxiunmanned"+project.getName())
             }
         }
     }
@@ -51,7 +53,7 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxrecyclerview
     implementation rootProject.ext.dependencies.material
     implementation rootProject.ext.dependencies.flexbox
-    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