yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 音乐浮窗和车聊聊浮窗优化

Browse Source 
2. 点击地图车辆显示车聊聊用户信息
This commit is contained in:
wangcongtao
2020-09-25 11:36:05 +08:00
parent d723ade861
commit 865d53a421
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
View File

@@ -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);

17
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -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();