From 85054bb8b88f87aeb0747299daa0caa5837c45c5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 2 Aug 2024 17:08:39 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[=E7=A6=BB=E7=BA=BF=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logchainanalytic/OchChainLogManager.kt    |  2 ++
 .../mogo/och/offline/model/OrderModel.java    |  2 +-
 .../main/res/layout/offline_base_fragment.xml | 22 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
index b6456d7d02..c07b21a18e 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
@@ -23,6 +23,8 @@ object OchChainLogManager {
     // 音乐播放日志
     const val EVENT_KEY_INFE_WITH_MUSIC = "event_key_och_music_info"
 
+    const val EVENT_KEY_INFE_WITH_BUS = "event_key_och_bus_info"
+
     // 需要举行观察的
     const val EVENT_KEY_INFE_ERROR = "event_key_och_error"
 
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
index 2b21a7120b..9ce4171536 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
@@ -1015,7 +1015,7 @@ public class OrderModel {
     // 登出
     public void logout() {
         MogoLocation gcj02 = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02();
-        LoginStatusManager.loginOut(gcj02.getLatitude(), gcj02.getLongitude());
+        LoginStatusManager.loginOut();
     }
 
     public void triggerStartServiceEvent(boolean isRestart, boolean send) {
diff --git a/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
index 7b275ee30e..7569f3ee91 100644
--- a/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
@@ -198,6 +198,15 @@
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
 
+    <!--切换地图远近事件 @dimen/module_switch_map -->
+    <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
+        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
+        android:layout_marginBottom="@dimen/dp_28"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
         layout="@layout/offline_test_bar_view"
@@ -231,23 +240,12 @@
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>
 
-    <!--切换地图远近事件 @dimen/module_switch_map -->
-    <com.mogo.och.common.module.wigets.map.switchvisual.VisualView
-        android:id="@+id/switch_visual_view"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/toolsView"
-        android:layout_marginStart="-10dp"
-        android:layout_marginBottom="@dimen/dp_17"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"/>
-
-
     <com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
         android:id="@+id/reportworkorderview"
         android:layout_marginStart="-10dp"
         android:layout_marginBottom="@dimen/dp_17"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
+        app:layout_constraintLeft_toRightOf="@id/toolsView"
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>