From 865d53a421ceb06488b8a40b3ddea0e799e394a6 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 25 Sep 2020 11:36:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E9=9F=B3=E4=B9=90=E6=B5=AE=E7=AA=97?=
 =?UTF-8?q?=E5=92=8C=E8=BD=A6=E8=81=8A=E8=81=8A=E6=B5=AE=E7=AA=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=202.=20=E7=82=B9=E5=87=BB=E5=9C=B0=E5=9B=BE=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E6=98=BE=E7=A4=BA=E8=BD=A6=E8=81=8A=E8=81=8A=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/media/window/MediaWindow2.java  |  7 ++++++-
 .../module/service/marker/MapMarkerManager.java | 17 +++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 3abb6ff255..6cc81d0938 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -180,6 +180,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
             });
 
             if ( mIsCallChatWindowVisible ) {
+                Logger.d( TAG, "mWindowView.setVisibility: status = " + mIsCallChatWindowVisible );
                 mWindowView.setVisibility(View.GONE);
             } else {
                 mWindowView.setVisibility(View.VISIBLE);
@@ -199,7 +200,11 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
             if (mMediaInfoData.getType() == MusicConstant.PLAY_STATE_ERROR||isFirstPlay) {
                 mWindowView.setVisibility(View.GONE);
             } else {
-                mWindowView.setVisibility(View.VISIBLE);
+                if ( mIsCallChatWindowVisible ) {
+                    mWindowView.setVisibility(View.GONE );
+                } else {
+                    mWindowView.setVisibility(View.VISIBLE);
+                }
             }
         } else {
             mWindowView.setVisibility(View.GONE);
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index b939bf045c..591a3e5695 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -189,15 +189,12 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         // 在线车辆点击使用infoWindow
         if ( TextUtils.equals( mogoMarker.getOwner(), ModuleNames.CARD_TYPE_USER_DATA ) ) {
             if ( !mogoMarker.isDestroyed() ) {
-                mogoMarker.setInfoWindowAdapter( UserDataMarkerInfoWindowAdapter.getInstance( mContext ) );
-                mogoMarker.showInfoWindow();
-                Logger.d( TAG, "打开info window" );
-//                try {
-//                    MarkerOnlineCar onlineCar = ( MarkerOnlineCar ) ( ( MarkerShowEntity ) mogoMarker.getObject() ).getBindObj();
-//                    CallChatApi.getInstance().showUserWindow( mContext, onlineCar );
-//                } catch ( Exception e ) {
-//                    Logger.e( TAG, e, "openMarker" );
-//                }
+                try {
+                    MarkerOnlineCar onlineCar = ( MarkerOnlineCar ) ( ( MarkerShowEntity ) mogoMarker.getObject() ).getBindObj();
+                    CallChatApi.getInstance().showUserWindow( mContext, onlineCar );
+                } catch ( Exception e ) {
+                    Logger.e( TAG, e, "openMarker" );
+                }
             }
         } else {
             Object object = mogoMarker.getObject();
@@ -228,7 +225,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         }
         // 在线车辆点击使用infoWindow
         if ( TextUtils.equals( mogoMarker.getOwner(), ModuleNames.CARD_TYPE_USER_DATA ) ) {
-            mogoMarker.hideInfoWindow();
+//            mogoMarker.hideInfoWindow();
             Logger.d( TAG, "关闭info window" );
         } else {
             Object object = mogoMarker.getObject();