From d2e94747c283b72f37e98ffa0ca8a33301eeb7a1 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 15 Jan 2020 09:57:47 +0800 Subject: [PATCH 1/9] fix conflict --- .../tanlu/fragment/TanluCardViewFragment.java | 502 +++++++++--------- 1 file changed, 261 insertions(+), 241 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 818fe19ed8..c4d29fa385 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -63,6 +63,8 @@ import com.mogo.module.tanlu.video.FullMediaActivity; import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer; import com.mogo.module.tanlu.view.AutoZoomInImageView; import com.mogo.service.module.IMogoRegisterCenter; +import com.mogo.service.voice.IMogoVoiceListener; +import com.mogo.service.voice.IMogoVoiceManager; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; @@ -84,7 +86,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; * @description 探路卡片 * @since 2020-01-02 */ -public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView > > +public class TanluCardViewFragment extends MvpFragment> implements IView, IMogoMarkerClickListener, IMogoModuleLifecycle, @@ -103,6 +105,7 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView private IMogoSocketManager mMogoSocketManager; private IMogoLocationClient mLocationClient; private IMogoCardManager iMogoCardManager; + private IMogoVoiceManager mMogoVoiceManager; //声音控制文字 private String voiceGetInfoMationTts; @@ -125,11 +128,11 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView private TextView mDistanceTv; private TextView mTimeTv; - private List< MarkerExploreWay > markerExploreWayList = new ArrayList<>(); + private List markerExploreWayList = new ArrayList<>(); private int currentPosition = 0; //卡片媒体当前位置 private Bitmap mMarkerIcon; private TanluModelData mTanluModelData; - private List< MogoLatLng > passedByPoints; + private List passedByPoints; private IMogoRegisterCenter mMogoRegisterCenter; @@ -141,70 +144,74 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView @Override protected void initViews() { initVideo(); - simpleCoverVideoPlayer = findViewById( R.id.video_player_main ); - autoZoomInImageView = findViewById( R.id.tanlu_photo_imageView ); - mPreviousTv = findViewById( R.id.tv_previous_res ); - mNextTv = findViewById( R.id.tv_next_res ); - mRootLayout = findViewById( R.id.layout_data_show ); - mEmptyLayout = findViewById( R.id.layout_empty_data_show ); - mEmptyTv = findViewById( R.id.tv_main_empty ); - mAddressTv = findViewById( R.id.tv_information_media_content ); - mDistanceTv = findViewById( R.id.tv_distance_video ); - mTimeTv = findViewById( R.id.tv_information_media_time ); + simpleCoverVideoPlayer = findViewById(R.id.video_player_main); + autoZoomInImageView = findViewById(R.id.tanlu_photo_imageView); + mPreviousTv = findViewById(R.id.tv_previous_res); + mNextTv = findViewById(R.id.tv_next_res); + mRootLayout = findViewById(R.id.layout_data_show); + mEmptyLayout = findViewById(R.id.layout_empty_data_show); + mEmptyTv = findViewById(R.id.tv_main_empty); + mAddressTv = findViewById(R.id.tv_information_media_content); + mDistanceTv = findViewById(R.id.tv_distance_video); + mTimeTv = findViewById(R.id.tv_information_media_time); - mPreviousTv.setOnClickListener( this ); - mNextTv.setOnClickListener( this ); - mEmptyTv.setOnClickListener( this ); + mPreviousTv.setOnClickListener(this); + mNextTv.setOnClickListener(this); + mEmptyTv.setOnClickListener(this); - simpleCoverVideoPlayer.setVisibility( View.VISIBLE ); - autoZoomInImageView.setVisibility( View.GONE ); + simpleCoverVideoPlayer.setVisibility(View.VISIBLE); + autoZoomInImageView.setVisibility(View.GONE); //视频配置 TODO 需要去掉 // gsyVideoOptionBuilder.setUrl(mVideoUrl).setCacheWithPlay(false).setPlayTag(TAG) // .build(simpleCoverVideoPlayer); - simpleCoverVideoPlayer.getStartButton().setOnClickListener( new View.OnClickListener() { + simpleCoverVideoPlayer.getStartButton().setOnClickListener(new View.OnClickListener() { @Override - public void onClick( View view ) { - Logger.d( TAG, "simpleCoverVideoPlayer onClick -------> " ); - FullMediaActivity.Companion.launch( getActivity(), mVideoUrl, mImageUrl, mTitle, mGenerateTime ); + public void onClick(View view) { + Logger.d(TAG, "simpleCoverVideoPlayer onClick -------> "); + FullMediaActivity.Companion.launch(getActivity(), mVideoUrl, mImageUrl, mTitle, mGenerateTime); } - } ); + }); } private void initInterface() { //图片配置 - mogoImageloader = ( IMogoImageloader ) ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_IMAGE_LOADER ).navigation(); + mogoImageloader = (IMogoImageloader) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_IMAGE_LOADER).navigation(); //地图marker - mMogoMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( getActivity() ); + mMogoMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(getActivity()); //切换卡片操作 - iMogoCardManager = ( IMogoCardManager ) ARouter.getInstance().build( MogoServicePaths.PATH_CARD_MANAGER ).navigation( getActivity() ); + iMogoCardManager = (IMogoCardManager) ARouter.getInstance().build(MogoServicePaths.PATH_CARD_MANAGER).navigation(getActivity()); - mMogoRegisterCenter = ( IMogoRegisterCenter ) ARouter.getInstance().build( MogoServicePaths.PATH_REGISTER_CENTER ).navigation( getContext() ); + mMogoRegisterCenter = (IMogoRegisterCenter) ARouter.getInstance().build(MogoServicePaths.PATH_REGISTER_CENTER).navigation(getContext()); - mMogoRegisterCenter.registerMogoModuleLifecycle( TanluConstants.MODEL_NAME, this ); + mMogoRegisterCenter.registerMogoModuleLifecycle(TanluConstants.MODEL_NAME, this); + mMogoRegisterCenter = (IMogoRegisterCenter) ARouter.getInstance().build(MogoServicePaths.PATH_REGISTER_CENTER).navigation(getContext()); + //语音操作 + mMogoVoiceManager = (IMogoVoiceManager) ARouter.getInstance().build(MogoServicePaths.PATH_VOICE_MANAGER).navigation(getContext()); } @Override - public void onActivityCreated( @Nullable Bundle savedInstanceState ) { - super.onActivityCreated( savedInstanceState ); - getViewLifecycleOwner().getLifecycle().addObserver( mPresenter ); - EventBus.getDefault().register( this ); + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + getViewLifecycleOwner().getLifecycle().addObserver(mPresenter); + EventBus.getDefault().register(this); initInterface(); initModelData(); handleRoadLineMessage(); initMap(); initStrings(); + initListener(); //TODO切换探路卡片 // iMogoCardManager.switch2(TanluConstants.MODEL_NAME); } private void initModelData() { - if ( mTanluModelData == null ) { - mTanluModelData = new TanluModelData( getContext() ); + if (mTanluModelData == null) { + mTanluModelData = new TanluModelData(getContext()); } } @@ -212,7 +219,7 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView * 初始化导航 TODO */ private void initMap() { - mMogoRegisterCenter.registerMogoNaviListener( TanluConstants.MODEL_NAME, new IMogoNaviListener() { + mMogoRegisterCenter.registerMogoNaviListener(TanluConstants.MODEL_NAME, new IMogoNaviListener() { @Override public void onInitNaviFailure() { @@ -224,7 +231,7 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView } @Override - public void onNaviInfoUpdate( MogoNaviInfo naviinfo ) { + public void onNaviInfoUpdate(MogoNaviInfo naviinfo) { } @@ -248,47 +255,60 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView public void onoCalculateFailed() { } - } ); + }); //监听marker点击 - mMogoRegisterCenter.registerMogoMarkerClickListener( TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() { + mMogoRegisterCenter.registerMogoMarkerClickListener(TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() { @Override - public boolean onMarkerClicked( IMogoMarker marker ) { + public boolean onMarkerClicked(IMogoMarker marker) { //点击marker以后，确认他的位置？然后点击下一个操作 TODO MarkerExploreWay exploreWay = extractFromMarker(marker); - if ( exploreWay == null ) { + if (exploreWay == null) { return false; } - if ( exploreWay.getFileType() == 0 ) { //图片 - refreshPhotoData( exploreWay ); - } else if ( exploreWay.getFileType() == 1 ) { //视频 - handleData( exploreWay ); + if (exploreWay.getFileType() == 0) { //图片 + refreshPhotoData(exploreWay); + } else if (exploreWay.getFileType() == 1) { //视频 + handleData(exploreWay); } //更新位置currentPosition - for ( int i = 0; i < markerExploreWayList.size(); i++ ) { - if ( markerExploreWayList.get( i ) == exploreWay ) { + for (int i = 0; i < markerExploreWayList.size(); i++) { + if (markerExploreWayList.get(i) == exploreWay) { currentPosition = i; break; } - Logger.d( TAG, "onMarkerClicked currentPosition = " + currentPosition ); + Logger.d(TAG, "onMarkerClicked currentPosition = " + currentPosition); } return false; } - } ); - + }); } - private MarkerExploreWay extractFromMarker( IMogoMarker marker ) { - if ( marker == null ) { + /** + * 注册listener监听 + */ + private void initListener() { + //某某路堵不堵，某某地点堵不堵，附近堵不堵，播放路况 + //上报路况，上报拥堵 + mMogoVoiceManager.registerIntentListener("", new IMogoVoiceListener() { + @Override + public void onIntentReceived(String command, Intent intent) { + + } + }); + } + + private MarkerExploreWay extractFromMarker(IMogoMarker marker) { + if (marker == null) { return null; } - if ( marker.getObject() instanceof MarkerShowEntity ) { - MarkerShowEntity showEntity = ( ( MarkerShowEntity ) marker.getObject() ); - if ( showEntity.getBindObj() instanceof MarkerExploreWay ) { - return ( ( MarkerExploreWay ) showEntity.getBindObj() ); + if (marker.getObject() instanceof MarkerShowEntity) { + MarkerShowEntity showEntity = ((MarkerShowEntity) marker.getObject()); + if (showEntity.getBindObj() instanceof MarkerExploreWay) { + return ((MarkerExploreWay) showEntity.getBindObj()); } } return null; @@ -323,9 +343,9 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView * @param view */ @Override - public void onClick( View view ) { + public void onClick(View view) { int id = view.getId(); - if ( id == R.id.tv_previous_res ) { //上一个 + if (id == R.id.tv_previous_res) { //上一个 // 判断是图片还是视频，第一个时，上一个不可点击 Logger.d(TAG, " tv_previous_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); if (currentPosition < 0) { @@ -342,47 +362,47 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView // getNavigationLineData(); // getNaviRoadLineInfo(); - } else if ( id == R.id.tv_next_res ) { //下一个 + } else if (id == R.id.tv_next_res) { //下一个 //判断是图片还是视频，最后一个时，下一个不可点击 - Logger.d( TAG, " tv_next_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size() ); - if ( currentPosition > markerExploreWayList.size() ) { + Logger.d(TAG, " tv_next_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + if (currentPosition > markerExploreWayList.size()) { return; } currentPosition++; - Logger.d( TAG, " tv_next_res --2-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size() ); - if ( markerExploreWayList.size() > currentPosition ) { - handleData( markerExploreWayList.get( currentPosition ) ); + Logger.d(TAG, " tv_next_res --2-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + if (markerExploreWayList.size() > currentPosition) { + handleData(markerExploreWayList.get(currentPosition)); } - } else if ( id == R.id.tv_main_empty ) { //TODO上报路况，逻辑 - Logger.d( TAG, "tv_main_empty click -----> " ); - sendShareReceiver( "1" ); + } else if (id == R.id.tv_main_empty) { //TODO上报路况，逻辑 + Logger.d(TAG, "tv_main_empty click -----> "); + sendShareReceiver("1"); } } /** * 发送广播 */ - private void sendShareReceiver( String type ) { - Logger.d( "liyz", "LaucherShareDialog sendShareReceiver ---->" ); + private void sendShareReceiver(String type) { + Logger.d("liyz", "LaucherShareDialog sendShareReceiver ---->"); Intent intent = new Intent(); - intent.setAction( "com.zhidao.roadcondition.share" ); - intent.putExtra( "type", type ); - getContext().sendBroadcast( intent ); + intent.setAction("com.zhidao.roadcondition.share"); + intent.putExtra("type", type); + getContext().sendBroadcast(intent); } /** * 执行图片动画 */ private void handleImageAnimation() { - autoZoomInImageView.post( new Runnable() { + autoZoomInImageView.post(new Runnable() { @Override public void run() { //放大增量是0.3，放大时间是1000毫秒，放大开始时间是600毫秒以后 autoZoomInImageView.init() - .startZoomInByScaleDeltaAndDuration( 0.2f, 1000, 500 ); + .startZoomInByScaleDeltaAndDuration(0.2f, 1000, 500); } - } ); + }); } /** @@ -392,7 +412,7 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView * @return */ @Override - public boolean onMarkerClicked( IMogoMarker marker ) { + public boolean onMarkerClicked(IMogoMarker marker) { return true; } @@ -401,44 +421,44 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView * * @param exploreWay */ - private void handleData( MarkerExploreWay exploreWay ) { - if ( exploreWay != null ) { - if ( exploreWay.getFileType() == 0 ) { //图片 - refreshPhotoData( exploreWay ); - } else if ( exploreWay.getFileType() == 1 ) { //视频 - refreshVideoData( exploreWay ); + private void handleData(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + if (exploreWay.getFileType() == 0) { //图片 + refreshPhotoData(exploreWay); + } else if (exploreWay.getFileType() == 1) { //视频 + refreshVideoData(exploreWay); } } else { - Logger.e( TAG, "handleData exploreWay == null " ); + Logger.e(TAG, "handleData exploreWay == null "); } } /** * 刷新单个视频数据,更新位置positon */ - private void refreshVideoData( MarkerExploreWay markerExploreWay ) { - if ( markerExploreWay.getItems() == null ) { + private void refreshVideoData(MarkerExploreWay markerExploreWay) { + if (markerExploreWay.getItems() == null) { return; } - if ( markerExploreWay.getItems().size() == 0 ) { + if (markerExploreWay.getItems().size() == 0) { return; } - String videoUrl = markerExploreWay.getItems().get( 0 ).getUrl(); - mImageUrl = markerExploreWay.getItems().get( 0 ).getThumbnail(); + String videoUrl = markerExploreWay.getItems().get(0).getUrl(); + mImageUrl = markerExploreWay.getItems().get(0).getThumbnail(); mGenerateTime = markerExploreWay.getGenerateTime(); mTitle = markerExploreWay.getAddr(); - mAddressTv.setText( markerExploreWay.getAddr() ); - mDistanceTv.setText( handleDistance( markerExploreWay.getDistance() ) ); - mTimeTv.setText( formatDate( markerExploreWay.getGenerateTime() ) ); + mAddressTv.setText(markerExploreWay.getAddr()); + mDistanceTv.setText(handleDistance(markerExploreWay.getDistance())); + mTimeTv.setText(formatDate(markerExploreWay.getGenerateTime())); //判断是图片还是视频，第一个时，上一个不可点击 - simpleCoverVideoPlayer.setVisibility( View.VISIBLE ); + simpleCoverVideoPlayer.setVisibility(View.VISIBLE); //视频配置 mVideoUrl = videoUrl; - gsyVideoOptionBuilder.setUrl( videoUrl ).setCacheWithPlay( false ).setPlayTag( TAG ) - .build( simpleCoverVideoPlayer ); - if ( mImageUrl == null ) { + gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false).setPlayTag(TAG) + .build(simpleCoverVideoPlayer); + if (mImageUrl == null) { return; } } @@ -446,45 +466,45 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView /** * 刷新单个图片数据 */ - private void refreshPhotoData( MarkerExploreWay markerExploreWay ) { - if ( markerExploreWay.getItems() == null ) { + private void refreshPhotoData(MarkerExploreWay markerExploreWay) { + if (markerExploreWay.getItems() == null) { return; } - if ( markerExploreWay.getItems().size() == 0 ) { + if (markerExploreWay.getItems().size() == 0) { return; } - mAddressTv.setText( markerExploreWay.getAddr() ); - mDistanceTv.setText( handleDistance( markerExploreWay.getDistance() ) ); - mTimeTv.setText( formatDate( markerExploreWay.getGenerateTime() ) ); - String thumbnailUrl = markerExploreWay.getItems().get( 0 ).getUrl(); - Logger.d( TAG, "refreshPhotoData thumbnailUrl ------>" + thumbnailUrl ); - autoZoomInImageView.setVisibility( View.VISIBLE ); - simpleCoverVideoPlayer.setVisibility( View.GONE ); - mogoImageloader.downloadImage( getActivity(), thumbnailUrl, new IMogoImageLoaderListener() { + mAddressTv.setText(markerExploreWay.getAddr()); + mDistanceTv.setText(handleDistance(markerExploreWay.getDistance())); + mTimeTv.setText(formatDate(markerExploreWay.getGenerateTime())); + String thumbnailUrl = markerExploreWay.getItems().get(0).getUrl(); + Logger.d(TAG, "refreshPhotoData thumbnailUrl ------>" + thumbnailUrl); + autoZoomInImageView.setVisibility(View.VISIBLE); + simpleCoverVideoPlayer.setVisibility(View.GONE); + mogoImageloader.downloadImage(getActivity(), thumbnailUrl, new IMogoImageLoaderListener() { @Override public void onStart() { } @Override - public void onCompleted( Bitmap bitmap ) { - autoZoomInImageView.setImageBitmap( bitmap ); + public void onCompleted(Bitmap bitmap) { + autoZoomInImageView.setImageBitmap(bitmap); //动画 // handleImageAnimation(); } @Override - public void onFailure( Exception e ) { - Logger.e( TAG, "onFailure ------>" + e ); + public void onFailure(Exception e) { + Logger.e(TAG, "onFailure ------>" + e); } - } ); + }); } @NonNull @Override protected Presenter createPresenter() { - return new Presenter( this ) { + return new Presenter(this) { }; } @@ -494,42 +514,42 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView */ @Override public void onPerform() { - Logger.d( TAG, "tanlu卡片 有效 ---->" ); - mMarkerManager = mMogoMapService.getMarkerManager( getActivity() ); - List< IMogoMarker > markers = mMarkerManager.getMarkers( TanluConstants.MODEL_NAME ); - if ( markers != null && markers.size() > 0 ) { - mEmptyLayout.setVisibility( View.GONE ); - mRootLayout.setVisibility( View.VISIBLE ); - Logger.d( TAG, "onPerform markers.size() =" + markers.size() ); - for ( int i = 0; i < markers.size(); i++ ) { - MarkerExploreWay exploreWay = extractFromMarker(markers.get( i )); - if ( exploreWay == null ) { + Logger.d(TAG, "tanlu卡片 有效 ---->"); + mMarkerManager = mMogoMapService.getMarkerManager(getActivity()); + List markers = mMarkerManager.getMarkers(TanluConstants.MODEL_NAME); + if (markers != null && markers.size() > 0) { + mEmptyLayout.setVisibility(View.GONE); + mRootLayout.setVisibility(View.VISIBLE); + Logger.d(TAG, "onPerform markers.size() =" + markers.size()); + for (int i = 0; i < markers.size(); i++) { + MarkerExploreWay exploreWay = extractFromMarker(markers.get(i)); + if (exploreWay == null) { break; } - markerExploreWayList.add(exploreWay ); + markerExploreWayList.add(exploreWay); } - if ( markers.size() == 1 ) { - mPreviousTv.setVisibility( View.GONE ); - mNextTv.setVisibility( View.GONE ); + if (markers.size() == 1) { + mPreviousTv.setVisibility(View.GONE); + mNextTv.setVisibility(View.GONE); } else { - mPreviousTv.setVisibility( View.VISIBLE ); - mNextTv.setVisibility( View.VISIBLE ); + mPreviousTv.setVisibility(View.VISIBLE); + mNextTv.setVisibility(View.VISIBLE); } //展示第一个数据 - MarkerExploreWay markerExploreWay = markerExploreWayList.get( 0 ); - if ( markerExploreWay != null ) { - if ( markerExploreWay.getFileType() == 0 ) { //图片 - refreshPhotoData( markerExploreWay ); - } else if ( markerExploreWay.getFileType() == 1 ) { //视频 - refreshVideoData( markerExploreWay ); + MarkerExploreWay markerExploreWay = markerExploreWayList.get(0); + if (markerExploreWay != null) { + if (markerExploreWay.getFileType() == 0) { //图片 + refreshPhotoData(markerExploreWay); + } else if (markerExploreWay.getFileType() == 1) { //视频 + refreshVideoData(markerExploreWay); } } } else { - mEmptyLayout.setVisibility( View.VISIBLE ); - mRootLayout.setVisibility( View.GONE ); - mEmptyTv.setText( Html.fromHtml( getContext().getString( R.string.main_empty_content ) ) ); + mEmptyLayout.setVisibility(View.VISIBLE); + mRootLayout.setVisibility(View.GONE); + mEmptyTv.setText(Html.fromHtml(getContext().getString(R.string.main_empty_content))); } } @@ -538,7 +558,7 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView */ @Override public void onDisable() { - Logger.d( TAG, "tanlu卡片 无效 ----->" ); + Logger.d(TAG, "tanlu卡片 无效 ----->"); } @Override @@ -552,32 +572,32 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView } @Override - public void onTouch( MotionEvent motionEvent ) { + public void onTouch(MotionEvent motionEvent) { // Logger.d( TAG, "地图触摸事件" ); } @Override - public void onPOIClick( MogoPoi poi ) { - if ( poi != null ) { - TipToast.shortTip( poi.getName() ); + public void onPOIClick(MogoPoi poi) { + if (poi != null) { + TipToast.shortTip(poi.getName()); } - TanluServiceHandler.getPoiSearch().searchPOIIdAsyn( poi.getPoiId() ); + TanluServiceHandler.getPoiSearch().searchPOIIdAsyn(poi.getPoiId()); } @Override - public void onPoiSearched( MogoPoiResult result, int errorCode ) { + public void onPoiSearched(MogoPoiResult result, int errorCode) { } @Override - public void onPoiItemSearched( MogoPoiItem item, int errorCode ) { - if ( item == null ) { + public void onPoiItemSearched(MogoPoiItem item, int errorCode) { + if (item == null) { return; } } @Override - public void onLocationChanged( MogoLocation location ) { + public void onLocationChanged(MogoLocation location) { // if (location.getErrCode() == 0) { // Logger.d(TAG, "onLocationChanged 当前位置 -->" + location.getAddress()); // } else { @@ -586,32 +606,32 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView } @Override - public void onMapClick( MogoLatLng latLng ) { + public void onMapClick(MogoLatLng latLng) { } @Override - public void onLockMap( boolean isLock ) { + public void onLockMap(boolean isLock) { } @Override - public void onMapModeChanged( EnumMapUI ui ) { - Logger.d( TAG, ui.name() ); + public void onMapModeChanged(EnumMapUI ui) { + Logger.d(TAG, ui.name()); } @Override - public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) { + public void onMapChanged(MogoLatLng location, float zoom, float tilt, float bearing) { } @Override public void onDestroyView() { super.onDestroyView(); - EventBus.getDefault().unregister( this ); - getViewLifecycleOwner().getLifecycle().removeObserver( mPresenter ); - TanluServiceHandler.getLocationClient().removeLocationListener( this ); - mMogoRegisterCenter.unregisterMogoNaviListener( TanluConstants.MODEL_NAME ); + EventBus.getDefault().unregister(this); + getViewLifecycleOwner().getLifecycle().removeObserver(mPresenter); + TanluServiceHandler.getLocationClient().removeLocationListener(this); + mMogoRegisterCenter.unregisterMogoNaviListener(TanluConstants.MODEL_NAME); } /** @@ -619,35 +639,35 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView * * @param event */ - @Subscribe( threadMode = ThreadMode.MAIN ) - public void onMarkerInfo( final MarkerInfo event ) { - Logger.d( TAG, "onMarkerInfo ------>" ); - mMarkerIcon = BitmapFactory.decodeResource( getResources(), R.drawable.ic_search_poi_location ); - mogoImageloader.downloadImage( getActivity(), event.imageUrl, new IMogoImageLoaderListener() { + @Subscribe(threadMode = ThreadMode.MAIN) + public void onMarkerInfo(final MarkerInfo event) { + Logger.d(TAG, "onMarkerInfo ------>"); + mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_search_poi_location); + mogoImageloader.downloadImage(getActivity(), event.imageUrl, new IMogoImageLoaderListener() { @Override public void onStart() { - Logger.d( TAG, "onMarkerInfo onStart ------>" ); + Logger.d(TAG, "onMarkerInfo onStart ------>"); } @Override - public void onCompleted( Bitmap bitmap ) { - Logger.d( TAG, "onMarkerInfo onCompleted ------>" ); + public void onCompleted(Bitmap bitmap) { + Logger.d(TAG, "onMarkerInfo onCompleted ------>"); MogoMarkerOptions options = new MogoMarkerOptions() - .icon( mMarkerIcon ) - .latitude( event.lat ) - .owner( TanluConstants.MODEL_NAME ) - .longitude( event.lon ); + .icon(mMarkerIcon) + .latitude(event.lat) + .owner(TanluConstants.MODEL_NAME) + .longitude(event.lon); - mMogoMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( getContext() ); - mMarkerManager = mMogoMapService.getMarkerManager( getContext() ); - IMogoMarker marker = mMarkerManager.addMarker( TanluConstants.MODEL_NAME, options ); + mMogoMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(getContext()); + mMarkerManager = mMogoMapService.getMarkerManager(getContext()); + IMogoMarker marker = mMarkerManager.addMarker(TanluConstants.MODEL_NAME, options); } @Override - public void onFailure( Exception e ) { - Logger.e( TAG, "onMarkerInfo onFailure -----e =" + e ); + public void onFailure(Exception e) { + Logger.e(TAG, "onMarkerInfo onFailure -----e =" + e); } - } ); + }); } /** @@ -656,107 +676,107 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView public void getNavigationLineData() { Double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); Double lon = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); - Logger.e( TAG, "getNavigationLineData lon = " + lon + ">>>>> lat= " + lat ); - mTanluModelData.getNavigationLineData( lon, lat, new AlongTheWayCallback() { + Logger.e(TAG, "getNavigationLineData lon = " + lon + ">>>>> lat= " + lat); + mTanluModelData.getNavigationLineData(lon, lat, new AlongTheWayCallback() { @Override - public void onSuccess( InformationAndLiveCarResult data ) { - Logger.d( TAG, "getNavigationLineData onSuccess " ); + public void onSuccess(InformationAndLiveCarResult data) { + Logger.d(TAG, "getNavigationLineData onSuccess "); //不做任何处理，直接出发推送，重新请求接口，划线 } @Override - public void onFail( String message, int code ) { - Logger.e( TAG, "getNavigationLineData onFail message = " + message + ">>>code= " + code ); + public void onFail(String message, int code) { + Logger.e(TAG, "getNavigationLineData onFail message = " + message + ">>>code= " + code); } - } ); + }); } /** * 通勤族 事件，监听消息自己请求路线数据 */ public void getRoadLineData() { - mTanluModelData.getRoadLineData( new RoadLineCallback() { + mTanluModelData.getRoadLineData(new RoadLineCallback() { @Override - public void onSuccess( PathLineResult o ) { + public void onSuccess(PathLineResult o) { //绘制线路线 - if ( o != null && o.getPointList() != null && o.getPointList().size() > 0 ) { - drawMapLine( o.getPointList() ); + if (o != null && o.getPointList() != null && o.getPointList().size() > 0) { + drawMapLine(o.getPointList()); } else { - Logger.e( TAG, "getRoadLineData onSuccess o.getPointList() == null" ); + Logger.e(TAG, "getRoadLineData onSuccess o.getPointList() == null"); } } @Override - public void onFail( String message, int code ) { - Logger.d( TAG, "getRoadLineData onFail message =" + message + ">>>code =" + code ); + public void onFail(String message, int code) { + Logger.d(TAG, "getRoadLineData onFail message =" + message + ">>>code =" + code); } - } ); + }); } /** * 导航路线，监听消息自己请求路线数据 */ public void getNaviRoadLineInfo() { - mTanluModelData.getNaviRoadLineInfo( new RoadLineCallback() { + mTanluModelData.getNaviRoadLineInfo(new RoadLineCallback() { @Override - public void onSuccess( PathLineResult o ) { + public void onSuccess(PathLineResult o) { //绘制线路线 - if ( o != null && o.getPointList() != null && o.getPointList().size() > 0 ) { - drawMapLine( o.getPointList() ); + if (o != null && o.getPointList() != null && o.getPointList().size() > 0) { + drawMapLine(o.getPointList()); } else { - Logger.e( TAG, "getNaviRoadLineInfo onSuccess o.getPointList() == null" ); + Logger.e(TAG, "getNaviRoadLineInfo onSuccess o.getPointList() == null"); } } @Override - public void onFail( String message, int code ) { - Logger.d( TAG, "getNaviRoadLineInfo onFail message =" + message + ">>>code =" + code ); + public void onFail(String message, int code) { + Logger.d(TAG, "getNaviRoadLineInfo onFail message =" + message + ">>>code =" + code); } - } ); + }); } /** * 绘制线路 */ - private void drawMapLine( List< Center > pointList ) { - int intervalNum = Utils.getIntervalValue( pointList.size() ); - Logger.d( TAG, "drawMapLine intervalNum = $intervalNum -- pointList.size = ${pointList.size}" ); + private void drawMapLine(List
pointList) { + int intervalNum = Utils.getIntervalValue(pointList.size()); + Logger.d(TAG, "drawMapLine intervalNum = $intervalNum -- pointList.size = ${pointList.size}"); int listSize = pointList.size(); //沿途最多15个点 - for ( int i = 0; i < listSize; i += intervalNum ) { - passedByPoints.add( new MogoLatLng( pointList.get( i ).getLat(), ( pointList.get( i ).getLon() ) ) ); + for (int i = 0; i < listSize; i += intervalNum) { + passedByPoints.add(new MogoLatLng(pointList.get(i).getLat(), (pointList.get(i).getLon()))); } - Logger.d( TAG, "drawMapLine passedByPoints.size() ----> " + passedByPoints.size() ); - MogoLatLng startLatLng = new MogoLatLng( pointList.get( 0 ).getLat(), pointList.get( 0 ).getLon() ); - MogoLatLng endLatLng = new MogoLatLng( pointList.get( listSize - 1 ).getLat(), pointList.get( listSize - 1 ).getLon() ); - mMarkerManager.addRouteWay( getContext(), startLatLng, endLatLng, passedByPoints ); + Logger.d(TAG, "drawMapLine passedByPoints.size() ----> " + passedByPoints.size()); + MogoLatLng startLatLng = new MogoLatLng(pointList.get(0).getLat(), pointList.get(0).getLon()); + MogoLatLng endLatLng = new MogoLatLng(pointList.get(listSize - 1).getLat(), pointList.get(listSize - 1).getLon()); + mMarkerManager.addRouteWay(getContext(), startLatLng, endLatLng, passedByPoints); } /** * 声音控制道路数据 */ - public void getVoiceControlRoadData( String keywords ) { + public void getVoiceControlRoadData(String keywords) { Double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); Double lon = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); String adCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getAdCode(); - Logger.d( TAG, "getVoiceControlRoadData lat =" + lat + ">>>lon =" + lon + ">>>cityCode=" + cityCode + ">>>adCode =" + adCode ); - mTanluModelData.getVoiceControlRoadData( keywords, cityCode, lon, lat, adCode, new VoiceSearchCallback() { + Logger.d(TAG, "getVoiceControlRoadData lat =" + lat + ">>>lon =" + lon + ">>>cityCode=" + cityCode + ">>>adCode =" + adCode); + mTanluModelData.getVoiceControlRoadData(keywords, cityCode, lon, lat, adCode, new VoiceSearchCallback() { @Override - public void onSuccess( VoiceSearchResult o ) { + public void onSuccess(VoiceSearchResult o) { String discription = o.getDescription(); - Logger.d( TAG, "getVoiceControlRoadData discription = " + discription ); - if ( o.getInformations() != null && o.getInformations().size() > 0 ) { - speakSuccessVoice( o.getInformations(), discription == null ? "" : discription ); + Logger.d(TAG, "getVoiceControlRoadData discription = " + discription); + if (o.getInformations() != null && o.getInformations().size() > 0) { + speakSuccessVoice(o.getInformations(), discription == null ? "" : discription); } else { - if ( !TextUtils.isEmpty( discription ) ) { - AIAssist.getInstance( getContext() ).speakTTSVoice( discription, null ); + if (!TextUtils.isEmpty(discription)) { + AIAssist.getInstance(getContext()).speakTTSVoice(discription, null); } else { - AIAssist.getInstance( getContext() ).speakTTSVoice( "未找到其他车主分享的路况信息", null ); + AIAssist.getInstance(getContext()).speakTTSVoice("未找到其他车主分享的路况信息", null); } } @@ -768,70 +788,70 @@ public class TanluCardViewFragment extends MvpFragment< IView, Presenter< IView } @Override - public void onFail( String message, int code ) { - Logger.e( TAG, "getVoiceControlRoadData onFail message = " + message + ">>>code= " + code ); - speakFailVoice( searchfaileVoiceStrings[2] ); + public void onFail(String message, int code) { + Logger.e(TAG, "getVoiceControlRoadData onFail message = " + message + ">>>code= " + code); + speakFailVoice(searchfaileVoiceStrings[2]); } - } ); + }); } Random random = new Random(); - private void speakSuccessVoice( List< Information > informations, String trafficStatus ) { - switch ( informations.size() ) { + private void speakSuccessVoice(List informations, String trafficStatus) { + switch (informations.size()) { case 0: - Logger.d( TAG, "speakSuccessVoice ----> " + random.nextInt( 3 ) ); - speakFailVoice( searchfaileVoiceStrings[random.nextInt( 3 )] ); + Logger.d(TAG, "speakSuccessVoice ----> " + random.nextInt(3)); + speakFailVoice(searchfaileVoiceStrings[random.nextInt(3)]); break; case 1: - trackVoiceSearch( 1 ); - AIAssist.getInstance( getContext() ).speakTTSVoice( ( - String.format( voiceGetInfoMationTts, "1" ) + trafficStatus ), null ); + trackVoiceSearch(1); + AIAssist.getInstance(getContext()).speakTTSVoice(( + String.format(voiceGetInfoMationTts, "1") + trafficStatus), null); case 2: - trackVoiceSearch( 1 ); - AIAssist.getInstance( getContext() ).speakTTSVoice( ( + trackVoiceSearch(1); + AIAssist.getInstance(getContext()).speakTTSVoice(( String.format( voiceGetInfoMationTts, "2" - ) + trafficStatus ), null ); + ) + trafficStatus), null); case 3: - trackVoiceSearch( 1 ); - AIAssist.getInstance( getContext() ).speakTTSVoice( ( + trackVoiceSearch(1); + AIAssist.getInstance(getContext()).speakTTSVoice(( String.format( voiceGetInfoMationTts, "3" - ) + trafficStatus ), null ); + ) + trafficStatus), null); default: - trackVoiceSearch( 1 ); - AIAssist.getInstance( getContext() ).speakTTSVoice( ( + trackVoiceSearch(1); + AIAssist.getInstance(getContext()).speakTTSVoice(( String.format( voiceGetInfoMationTts, "多" - ) + trafficStatus ), null ); + ) + trafficStatus), null); } } private void initStrings() { voiceGetInfoMationTts = - getContext().getResources().getString( R.string.voice_get_informations_tts ); + getContext().getResources().getString(R.string.voice_get_informations_tts); searchingVoiceStrings = - getContext().getResources().getStringArray( R.array.searching_voice_string_array ); + getContext().getResources().getStringArray(R.array.searching_voice_string_array); searchfaileVoiceStrings = - getContext().getResources().getStringArray( R.array.search_fail_voice_array ); + getContext().getResources().getStringArray(R.array.search_fail_voice_array); } - private void speakFailVoice( String string ) { - AIAssist.getInstance( getContext() ).speakTTSVoice( string, null ); + private void speakFailVoice(String string) { + AIAssist.getInstance(getContext()).speakTTSVoice(string, null); } //上报语音搜索 - private void trackVoiceSearch( int type ) { + private void trackVoiceSearch(int type) { } From 99a3e39cb6614a847ccb7a2d7bf4684e62560e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 10:23:43 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E8=BE=86=E7=9A=84=E6=B0=94=E6=B3=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 39 ++++++++----------- .../service/marker/MapMarkerInfoView.java | 8 ++-- .../module/service/marker/MapMarkerView.java | 15 ++----- .../src/main/res/layout/view_map_marker.xml | 1 - .../main/res/layout/view_map_marker_info.xml | 7 ++-- 5 files changed, 28 insertions(+), 42 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index ad9f7d9c6c..de0f503015 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -153,6 +153,8 @@ public class MarkerServiceHandler { Logger.e(TAG, "onMarkerClicked 点击了大而全中的Marker lastMarkerShowEntity：" + lastMarkerShowEntity); lastMarkerShowEntity.setChecked(false); + lastMarkerShowEntity.setHighlighted(false); + drawMapMarkerItem(lastMarkerShowEntity); lastMarker.remove(); @@ -163,6 +165,7 @@ public class MarkerServiceHandler { Logger.e(TAG, "onMarkerClicked 点击了大而全中的Marker markerShowEntity：" + markerShowEntity); markerShowEntity.setChecked(true); + markerShowEntity.setHighlighted(true); lastMarker = drawMapMarkerItem(markerShowEntity); @@ -181,6 +184,7 @@ public class MarkerServiceHandler { // 将上次选中 Marker 设置为未选中状态 MarkerShowEntity lastMarkerShowEntity = (MarkerShowEntity) lastMarker.getObject(); lastMarkerShowEntity.setChecked(false); + lastMarkerShowEntity.setHighlighted(false); drawMapMarkerItem(lastMarkerShowEntity); } lastMarker = null; @@ -203,6 +207,11 @@ public class MarkerServiceHandler { public static void drawMapMarker(MarkerResponse response) { lastMarker = null; getMarkerManager().removeMarkers(); + if (markerShowEntities == null) { + markerShowEntities = new ArrayList<>(); + } else { + markerShowEntities.clear(); + } // 解析不同的Marker类型，然后对应的进行绘制 if (response != null && response.getResult() != null) { @@ -307,15 +316,15 @@ public class MarkerServiceHandler { .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()); options.icon(markerView); + options.alpha(0.8f); IMogoMarker marker = getMarkerManager().addMarker(markerShowEntity.getMarkerType(), options); marker.setOnMarkerClickListener(mogoMarkerClickListener); marker.setObject(markerShowEntity); - if (markerShowEntities == null) { - markerShowEntities = new ArrayList<>(); + if (markerShowEntities != null) { + markerShowEntities.add(markerShowEntity); } - markerShowEntities.add(markerShowEntity); return marker; } else { Logger.e(TAG, "Location 必须进行初始化！！！！！"); @@ -340,6 +349,11 @@ public class MarkerServiceHandler { .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()); options.icon(markerView); + if (markerShowEntity.isHighlighted()) { + options.alpha(1f); + } else { + options.alpha(0.8f); + } IMogoMarker marker = getMarkerManager().addMarker(markerShowEntity.getMarkerType(), options); marker.setOnMarkerClickListener(mogoMarkerClickListener); @@ -354,23 +368,4 @@ public class MarkerServiceHandler { } return null; } - - - //TODO 这里是用来测试的 - public static void drawMapMarker() { -// Logger.e(TAG, "=====绘制Marker===="); -// -// MapMarkerView mapMarkerView = new MapMarkerView(mContext); -// -// MogoMarkerOptions options = new MogoMarkerOptions() -// .icon(mapMarkerView) -// .owner("CARD_TYPE_USER_DATA") -// .latitude(39.574525d + new Random().nextDouble()) -// .longitude(116.21733d + new Random().nextDouble()); -// IMogoMarker marker = getMarkerManager().addMarker("CARD_TYPE_USER_DATA", options); -// marker.setOnMarkerClickListener(mogoMarkerClickListener); -// marker.setObject("我是Marker上面绑定的数据"); -// -// getMapUIController().changeZoom(8); - } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index f5ceb0b08a..7c9fceb9f9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -67,7 +67,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { case ServiceConst.CARD_TYPE_CARS_CHATTING: case ServiceConst.CARD_TYPE_USER_DATA: ivUserHead.setVisibility(View.VISIBLE); - ivIcon.setVisibility(View.GONE); + ivIcon.setVisibility(View.INVISIBLE); if (bindObj instanceof MarkerOnlineCar) { if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { @@ -83,7 +83,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivCar.setRotation((float) markerShowEntity.getMarkerLocation().getAngle()); break; case ServiceConst.CARD_TYPE_ROAD_CONDITION: - ivUserHead.setVisibility(View.GONE); + ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); ivUserHead.setImageResource(R.drawable.icon_map_marker_road_block_up); @@ -92,7 +92,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; case ServiceConst.CARD_TYPE_NOVELTY: - ivUserHead.setVisibility(View.GONE); + ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); @@ -101,7 +101,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; case ServiceConst.CARD_TYPE_SHARE_MUSIC: - ivUserHead.setVisibility(View.GONE); + ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); if (bindObj instanceof MarkerShareMusic) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index d835e32a80..7030794fac 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -56,18 +56,11 @@ public class MapMarkerView extends MapMarkerBaseView { public void updateView(MarkerShowEntity markerShowEntity) { try { Object bindObj = markerShowEntity.getBindObj(); - - if (markerShowEntity.isHighlighted()) { - ivBg.setAlpha(1f); - } else { - ivBg.setAlpha(0.7f); - } - switch (markerShowEntity.getMarkerType()) { case ServiceConst.CARD_TYPE_CARS_CHATTING: case ServiceConst.CARD_TYPE_USER_DATA: ivUserHead.setVisibility(View.VISIBLE); - ivIcon.setVisibility(View.GONE); + ivIcon.setVisibility(View.INVISIBLE); if (bindObj instanceof MarkerOnlineCar) { if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { @@ -81,7 +74,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivCar.setRotation((float) markerShowEntity.getMarkerLocation().getAngle()); break; case ServiceConst.CARD_TYPE_ROAD_CONDITION: - ivUserHead.setVisibility(View.GONE); + ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); ivUserHead.setImageResource(R.drawable.icon_map_marker_road_block_up); @@ -89,7 +82,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; case ServiceConst.CARD_TYPE_NOVELTY: - ivUserHead.setVisibility(View.GONE); + ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); @@ -97,7 +90,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; case ServiceConst.CARD_TYPE_SHARE_MUSIC: - ivUserHead.setVisibility(View.GONE); + ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); if (bindObj instanceof MarkerShareMusic) { diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 83fe9aa7a3..a8c58a240d 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -23,7 +23,6 @@ android:layout_height="@dimen/dp_85" android:layout_gravity="center" android:src="@drawable/bg_map_marker_blue" - android:alpha="0.8" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index 069ca579a5..7a7c5017d4 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -21,7 +21,6 @@ From 9d7c31557b07435dcf256bcd3fe2d56d23e59d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 10:50:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86String=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E4=B8=BAnull=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=BF=94=E5=9B=9E""=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/connection/socket/SocketManager.java | 1 + .../com/mogo/module/common/entity/MarkerCarInfo.java | 8 ++++++++ .../com/mogo/module/common/entity/MarkerDynamicData.java | 5 +++++ .../com/mogo/module/common/entity/MarkerExploreWay.java | 5 +++++ .../mogo/module/common/entity/MarkerExploreWayItem.java | 8 ++++++++ .../com/mogo/module/common/entity/MarkerHobbyDatum.java | 5 +++++ .../com/mogo/module/common/entity/MarkerLocation.java | 5 +++++ .../com/mogo/module/common/entity/MarkerShareMusic.java | 8 ++++++++ .../com/mogo/module/common/entity/MarkerShowEntity.java | 5 +++++ .../com/mogo/module/common/entity/MarkerUserInfo.java | 9 +++++++++ .../com/mogo/module/main/cards/MogoModulesManager.java | 1 + 11 files changed, 60 insertions(+) diff --git a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java index aab919bc38..6aad984e2c 100644 --- a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java +++ b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java @@ -93,6 +93,7 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac while ( iterator.hasNext() ) { IMogoOnMessageListener listener = iterator.next(); if ( listener != null ) { + Logger.d(TAG, "received msg ==" + payload.getPayload().toStringUtf8()); listener.onMsgReceived( GsonUtil.objectFromJson( payload.getPayload().toStringUtf8(), listener.target() ) ); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java index 817e4f31ab..250f5ee2a1 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -11,6 +13,9 @@ public class MarkerCarInfo implements Serializable { private String carTypeName; public String getCarBrandLogoUrl() { + if (TextUtils.isEmpty(carBrandLogoUrl)) { + return ""; + } return carBrandLogoUrl; } @@ -19,6 +24,9 @@ public class MarkerCarInfo implements Serializable { } public String getCarTypeName() { + if (TextUtils.isEmpty(carTypeName)) { + return "未知"; + } return carTypeName; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java index a345206b2e..0d94fae475 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -20,6 +22,9 @@ public class MarkerDynamicData implements Serializable { } public String getName() { + if (TextUtils.isEmpty(name)) { + return "未知"; + } return name; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java index df0972cfb3..e5214dcfd0 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java @@ -1,6 +1,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; import java.util.List; @@ -21,6 +23,9 @@ public class MarkerExploreWay implements Serializable { private List items;//视频地址和图片地址 public String getAddr() { + if (TextUtils.isEmpty(addr)) { + return "未知"; + } return addr; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java index 9f367ee7fe..efc6a88649 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -11,6 +13,9 @@ public class MarkerExploreWayItem implements Serializable { private String url; public String getThumbnail() { + if (TextUtils.isEmpty(thumbnail)) { + return ""; + } return thumbnail; } @@ -19,6 +24,9 @@ public class MarkerExploreWayItem implements Serializable { } public String getUrl() { + if (TextUtils.isEmpty(url)) { + return ""; + } return url; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java index 4cf8e1504c..5d69c78ec0 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -12,6 +14,9 @@ public class MarkerHobbyDatum implements Serializable { private int isCheck; public String getContent() { + if (TextUtils.isEmpty(content)) { + return "未知"; + } return content; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java index 9895187033..16ccc2cf36 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -37,6 +39,9 @@ public class MarkerLocation implements Serializable { } public String getAddress() { + if (TextUtils.isEmpty(address)) { + return "未知"; + } return address; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java index 2f9feeff19..4af69a02dd 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -54,6 +56,9 @@ public class MarkerShareMusic implements Serializable { } public String getMediaImg() { + if (TextUtils.isEmpty(mediaImg)) { + return ""; + } return mediaImg; } @@ -62,6 +67,9 @@ public class MarkerShareMusic implements Serializable { } public String getMediaName() { + if (TextUtils.isEmpty(mediaName)) { + return "未知"; + } return mediaName; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java index a1ade853ad..60b7a9437c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java @@ -1,5 +1,7 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.util.Objects; /** @@ -51,6 +53,9 @@ public class MarkerShowEntity { } public String getTextContent() { + if (TextUtils.isEmpty(textContent)) { + return "未知"; + } return textContent; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java index 5c29773053..ec6271c154 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java @@ -90,6 +90,9 @@ public class MarkerUserInfo implements Serializable { } public String getSn() { + if (TextUtils.isEmpty(sn)) { + return ""; + } return sn; } @@ -98,6 +101,9 @@ public class MarkerUserInfo implements Serializable { } public String getUserHead() { + if (TextUtils.isEmpty(userHead)) { + return ""; + } return userHead; } @@ -114,6 +120,9 @@ public class MarkerUserInfo implements Serializable { } public String getUserName() { + if (TextUtils.isEmpty(userName)) { + return ""; + } return userName; } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 02d40b7a4c..dec3600f87 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -358,6 +358,7 @@ public class MogoModulesManager implements MogoModulesHandler, try { getApplicationContext().unregisterReceiver( mReceiver ); } catch ( Exception e ) { + e.printStackTrace(); } } mReceiver = null; From 81816129986cf533ad6fcc9cab388ca8a7317c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 10:51:31 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/MarkerServiceHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index de0f503015..3289042e0e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -299,11 +299,11 @@ public class MarkerServiceHandler { } } - getMapUIController().changeZoom(12); +// getMapUIController().changeZoom(12); } /** - * 绘制Marker + * 绘制Marker，这里绘制的会使用markerShowEntities队列进行维护 */ public static IMogoMarker drawMapMarker(MarkerShowEntity markerShowEntity) { Logger.e(TAG, "绘制Marker====drawMapMarker：" + markerShowEntity); @@ -336,7 +336,7 @@ public class MarkerServiceHandler { } /** - * 绘制Marker + * 绘制Marker，这里绘制的不会添加到队列中 */ public static IMogoMarker drawMapMarkerItem(MarkerShowEntity markerShowEntity) { Logger.e(TAG, "绘制Marker====drawMapMarkerItem：" + markerShowEntity); From 5011874238e120359e1cea93b7ffae8a004b68fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 11:08:10 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E8=BE=86=E5=9B=A0=E4=B8=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=E5=AF=BC=E8=87=B4=E7=9A=84Marker=E7=BB=98?= =?UTF-8?q?=E5=88=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/marker/MapMarkerBaseView.java | 10 +++++++--- .../module/service/marker/MapMarkerView.java | 4 +--- .../main/res/drawable-xhdpi/icon_default.png | Bin 13510 -> 0 bytes .../src/main/res/layout/view_map_marker.xml | 6 +++--- .../main/res/layout/view_map_marker_info.xml | 6 +++--- 5 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index c27e42f6ca..c994b045aa 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -11,6 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.MarkerServiceHandler; +import com.mogo.module.service.R; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.MogoImageView; import com.mogo.utils.WindowUtils; @@ -55,6 +56,7 @@ public abstract class MapMarkerBaseView extends ConstraintLayout { public abstract void updateView(MarkerShowEntity markerShowEntity); protected void loadImageWithMarker(MarkerShowEntity markerShowEntity) { + if (!TextUtils.isEmpty(markerShowEntity.getIconUrl())) { MarkerServiceHandler .getImageloader() @@ -69,15 +71,17 @@ public abstract class MapMarkerBaseView extends ConstraintLayout { @Override public void onCompleted(Bitmap bitmap) { - // 刷新图标 - Logger.d(TAG, "loaded."); + Logger.d(TAG, "loadImageWithMarker loaded."); } @Override public void onFailure(Exception e) { - + Logger.e(TAG, "loadImageWithMarker onFailure."); } }); + } else { + ivUserHead.setBackgroundResource(R.drawable.default_image); } + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 7030794fac..a800faabe7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -44,8 +44,6 @@ public class MapMarkerView extends MapMarkerBaseView { } protected void initView(Context context) { - setBackground(null); - LayoutInflater.from(context).inflate(R.layout.view_map_marker, this); ivUserHead = findViewById(R.id.ivUserHead); ivIcon = findViewById(R.id.ivIcon); @@ -77,7 +75,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); - ivUserHead.setImageResource(R.drawable.icon_map_marker_road_block_up); + ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up); ivBg.setImageResource(R.drawable.bg_map_marker_blue); ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png deleted file mode 100644 index d24606ab1d4539e00e62b678bbf28792fa9506ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13510 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 As{jB1 diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index a8c58a240d..1b69bcecef 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -36,9 +36,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_failureHolder="@drawable/icon_default" - app:miv_overlayImageId="@drawable/icon_default" - app:miv_placeHolder="@drawable/icon_default" + app:miv_failureHolder="@drawable/default_image" + app:miv_overlayImageId="@drawable/default_image" + app:miv_placeHolder="@drawable/default_image" app:miv_shape="circle" /> Date: Wed, 15 Jan 2020 11:25:10 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/icon_default_user_head.png | Bin 0 -> 8569 bytes .../module/service/MarkerServiceHandler.java | 2 +- .../module/service/marker/MapMarkerBaseView.java | 2 +- .../src/main/res/layout/view_map_marker.xml | 6 +++--- .../src/main/res/layout/view_map_marker_info.xml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png new file mode 100644 index 0000000000000000000000000000000000000000..d5df99fa78a965e590311bc352567c4f5d3e6ced GIT binary patch literal 8569 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 3289042e0e..77df271b52 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -299,7 +299,7 @@ public class MarkerServiceHandler { } } -// getMapUIController().changeZoom(12); + getMapUIController().changeZoom(8); } /** diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index c994b045aa..44a2edbc7b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -80,7 +80,7 @@ public abstract class MapMarkerBaseView extends ConstraintLayout { } }); } else { - ivUserHead.setBackgroundResource(R.drawable.default_image); + ivUserHead.setBackgroundResource(R.drawable.icon_default_user_head); } } diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 1b69bcecef..d883a5d2af 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -36,9 +36,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_failureHolder="@drawable/default_image" - app:miv_overlayImageId="@drawable/default_image" - app:miv_placeHolder="@drawable/default_image" + app:miv_failureHolder="@drawable/icon_default_user_head" + app:miv_overlayImageId="@drawable/icon_default_user_head" + app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" /> Date: Wed, 15 Jan 2020 11:27:21 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86Marker=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/service/MarkerServiceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 77df271b52..f30aaf5686 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -299,7 +299,7 @@ public class MarkerServiceHandler { } } - getMapUIController().changeZoom(8); +// getMapUIController().changeZoom(8); } /** From ea1c66844bc104683c212de4f94583a4ddf5c8ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 11:34:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BA=86=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable-xhdpi/bg_map_marker_blue.png | Bin 2014 -> 4488 bytes .../bg_map_marker_dark_blue.png | Bin 0 -> 4242 bytes .../drawable-xhdpi/bg_map_marker_green.png | Bin 2365 -> 6766 bytes .../drawable-xhdpi/bg_map_marker_oragne.png | Bin 0 -> 6664 bytes .../drawable-xhdpi/bg_map_marker_purple.png | Bin 2064 -> 4515 bytes .../icon_map_marker_ gasoline.png | Bin 0 -> 1156 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_oragne.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_ gasoline.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png index d1e30fb103a2490471d2a6ca36a816352429eb21..29a7b70972cc6b9f856b2f47f2de3d0b7b949fea 100644 GIT binary patch literal 4488 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 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..50e6c6371385fab8efc7f494962c0124e56efb5e GIT binary patch literal 4242 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 QLjV8(07*qoM6N<$f~Wc|N&o-= literal 2365 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 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_oragne.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_oragne.png new file mode 100644 index 0000000000000000000000000000000000000000..40ff4b36b2994a855d0121fbdd5ac2b7ed357de3 GIT binary patch literal 6664 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 SH~V=20000!00001b5ch_0Itp) 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 B-Ua{w literal 2064 zcmV+r2=DiaP)Px+%1J~)RA>dgSW9eFRTw_!cFM*mgsPMs3pRuh(V&0{$zV%Fh$JTN*cDv}B-j`d zLDcv{jT$5YT|m2IV@ymiAg0AO!H7hH7(&>(qdrO$D%E zbN=UdzVjTsn@0&D_^aF9AYLxg6j?5tz?Zp%Y+Z^Hrf-A-Ri2ia~m$WpS*{3 zjzz<^>HNdC(C1UP8{l>T^a_IW_!AT%Vqs)!dg!7YV1EPL^P$U~d2+;GY%?`ewO+pO z51WweD3WhAib}W;DCEE`aJ?O{%Rndx__2z2hc}J-A6rFXac8u@ygjU%nhM8Zyo*dB zk=WO?4Q#=ruu9t!ySa=33V(mLdx<-+`GWsd0?+U@E8t80p_*pyOBb>pizDpBPQx|_ z1mJ~^Y1q?J$WaN0YC;t8iBA)8Ix1S ze%?kuw}UVZnb^+gA3_fdN5-n@K7?vonlgN`njQn3muo$1nJRS6gBdJZSB3Y}2Q)~W-_xt?wP*8Bd@}7_wr$&Z_qfH^Sf$=K z)v(ID^lFxc9%IpJvZ*^>9ZYVu1dGEb`zE(~F8+uz>3r9QXU2=uqh`~kVfuKQWj*B5 zHk8)n4&#LaOGUWWO@++{871_Q%?Gp#<&WGw0hp8`{mz%f`Rddr9AB4(9kYPe*dhu7 z$sMc_g=W_Y|4NtJykmTcTrN4o_cDJ}*&>VagY5iMW|c|RMH#?KU+mD1gIZ{RVk>dz z+*e!f^&#D;P-vQ1mv1Ve7oZx+OjqaL&~{G#KIwn%Qujq+7<}z6v%^{DhfL)c0A&yw zqsk)q7n!YP)px=lnRWw$OK_ii{M*6JWnc)hynzIClo5>SI7rdShU~C^mholi{TExN zo(O4rh11lm5Tt2~2TNhyNLFZTH)|u?MzV(fNwTq$W$8{T2}%l>G=Ns~P-Rf*$F>@C z80x9t>~_xI0V{4ZzeZ9ZQI0f+5#dm0C7P*iS>Abn+>UE1sSCZrljSyWc12lDz|!VQ zFTDrgym_WzY2sVBZtO2!+RkB?K{|xynY2Z)r zu$mA!^@3V}%NL}PN`Z`rr`SjbgN%I+W^w!{z%c&bz`51jI>MXGzA`Cu4rSa{QWpb= zY>QrPI_@8m+guV8oNg&37;Av*G%t!!)mSry%51ELNr(Nhh9|h`Zsj0igWTB^D;!-e zROfPb2vBAw4zI)hSiZLs{IottP_p^ZV6ATjJsV6;nYP51-&q zZv2-U@8QT(UfI&HW6Tugqm42Sn6pw}7SbOWe&2iLzFzz|<-*L)bFUTbL^dJA`=~}P zOxDO?1NJ-bpPeUGc@JkUIYS^!D$Ao(*UJr<*m4QMLu@+ikC*Tnz$#|)*oM1f=vQqT zsbt}DD9h^m(FzqWnOfV0@<*KU!K)8!WxV`19a@L;4FrWTt?cOrq%6h3Z8O2X*hO|b z}N(I5X+g#=F@y0+{)2^qhNH5>(puH6p(q_I|;x0PEvHQM*b8EU_q0>)A1-(LUMDGX^(4gekHTM_dZvtmb|9Br_YO~+BerXBwzNrsMGTlym6 zL`p1!)hp(8k9N_|Ly^*h&Apn_wBEZNQp1_=D^IJcTw+j{>G1d9=_XI#JtUsK;XBlA#Z8w8v}_(^_rT zWcn3=2A(~#+3DYC_(plGVKVg5jR#xWV2vO(O3}!!p-e$fo<==TEQVqYtCO-ywy_+B zKA8tt#+w&l1|aCcwE*q2f${<-KK+U?w5x0|1R@(SY(B z=Rb}Bhu84&oAU?DTnhr&K<{7s$7uu{AhU84axl&fpSbzZyqRSVmIVXMU}Sn9K%*Xz uz&;G0yt!h*z%oZi%HZ0+m-Ew!;Qs-|ACr$FZZ=2&0000Px(K1oDDRA>e5T0L(RF%b1`f*=t{L<$lO0tpF;hK7cYJt;VQw z*3}7+uEBPut9=K%-&vN;cCc%hYz1)H@YKTqfIG*l;pNKg6*?US=<*d~-aj`chr20s zq5HhC%1Jpl1zk|;t4(cZ=jKirbLL`{5Y$vku3RDP6w%(B#C{MX| zjmlX2Z*OZ!EG7tdfj>#eRy> zY_ueP;Nsp(h*pquT4~XPvDo8c^C04l%Uxvw`T_VGILE%KEQCg?FqV?aI!h8r4MtE@ zW6M@^K&8Nh@ctYNg5Rl&Jng-*snsfc^n?*$xkZp0fN%5(zM(*5GRZ z489(Cflwb^wzZuSRV!!q+&RzM4nH~KqYnRHHWFZ484_Wg!2RW|YW*2*%wtl3s(oWJ z${@~d>FgzAKG-KMK0(zT?lX+#NlN9AabD#aa$Y}af#=hf*n=KE9tEW91YRSw#aj`a z^y4DZmhLCm7^@_}F|xRueWVKS=IX?VZE`DI3~Ae7WfC|eC2ml-Qur|3BE(W;(md|hz zjCi5|mmgoQ$cqMFJBNQx%Yj9}(=)Hb>I>CS#a*FS49?4ERt_o@HRmZk{VT#1rsGxg=hrIE(H2wO9R2l-7d!@|?j~Gq`A2pSi7}xHAxvfIm*cA?SJicB( zfEkx9u7o(M!mPd~No{qrh=cBz?tq7^u%hrH^oDZK=r)&FJq2$lTb;6P*z(;0%SmZ7 zZ4Z^|8%N4K1R6Xk+bI3Iyf&eYWK}M@UbhCgbyeMuEjysqu5Cj7watgi#|Dg_HTJ{( zlKJ(;S;ecUUm?HZj%CFvptb~6^H}>D^q=6DhgX|iY?lCw-b3HX_8p7Qb;Z}^8;|*} zi$${IKY2R;n`i7Tjm55`b4&3@tiBu1?Z?>C!OzZp2bk7N8AusO8AusO8Ausu&%j?C WKJJxMg4oOe0000mMg literal 0 HcmV?d00001 From 6b840de0a858e963b31cad9832237372e3a29428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 11:36:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BA=86=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...r_ gasoline.png => icon_map_marker_gasoline.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/mogo-module-service/src/main/res/drawable-xhdpi/{icon_map_marker_ gasoline.png => icon_map_marker_gasoline.png} (100%) diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_ gasoline.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_gasoline.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_ gasoline.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_gasoline.png