From 1163ededfee0c8ddb3f97a5366f7110647df3274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sat, 15 Feb 2020 23:54:31 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=8D=A1=E7=89=87=E7=9A=84=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/amap/AMapNaviViewWrapper.java | 12 ++++ .../impl/amap/marker/AMapMarkerWrapper.java | 8 +++ .../amap/uicontroller/AMapUIController.java | 8 +++ .../java/com/mogo/map/marker/IMogoMarker.java | 2 + .../uicontroller/IMogoMapUIController.java | 8 +++ .../com/mogo/map/MogoMapUIController.java | 8 +++ .../service/marker/MapMarkerManager.java | 59 +++++++++++++++---- 7 files changed, 94 insertions(+), 11 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 3bb667fda2..c9bb2505b9 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -533,6 +533,18 @@ public class AMapNaviViewWrapper implements IMogoMapView, return null; } + @Override + public MogoLatLng getLocationMogoLatLngInScreen(Point point) { + if ( checkAMapView() ) { + try { + return ObjectUtils.fromAMap(mMapView.getMap().getProjection().fromScreenLocation( point )); + } catch ( Exception e ) { + return null; + } + } + return null; + } + @Override public void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator, long duration ) { if ( marker == null || high <= 0.0f || interpolator == null || duration < 0 ) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index c36b011c69..c811a6860f 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java @@ -1,14 +1,18 @@ package com.mogo.map.impl.amap.marker; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.Point; import android.view.View; +import android.view.animation.Interpolator; import com.amap.api.maps.model.BitmapDescriptor; import com.amap.api.maps.model.BitmapDescriptorFactory; import com.amap.api.maps.model.LatLng; import com.amap.api.maps.model.Marker; import com.amap.api.maps.model.MarkerOptions; +import com.amap.api.maps.model.animation.Animation; +import com.amap.api.maps.model.animation.TranslateAnimation; import com.mogo.map.MogoLatLng; import com.mogo.map.impl.amap.utils.ObjectUtils; import com.mogo.map.marker.IMogoInfoWindowAdapter; @@ -16,6 +20,8 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.IMogoMarkerIconViewCreator; import com.mogo.map.marker.MogoMarkerOptions; +import com.mogo.utils.WindowUtils; +import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.Observable; @@ -29,6 +35,8 @@ import java.util.Observer; */ public class AMapMarkerWrapper implements IMogoMarker, Observer { + private final String TAG = AMapMarkerWrapper.class.getName(); + private Marker mMarker; private Object mObject; private IMogoMarkerClickListener mMogoMarkerClickListener; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java index 0df050bb3d..72da50a6ba 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java @@ -156,6 +156,14 @@ public class AMapUIController implements IMogoMapUIController { return null; } + @Override + public MogoLatLng getLocationMogoLatLngInScreen(Point point) { + if ( mClient != null ) { + return mClient.getLocationMogoLatLngInScreen( point ); + } + return null; + } + @Override public void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator, long duration ) { if ( mClient != null ) { diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java index 881ff0fbc9..9eeca2123d 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java @@ -1,7 +1,9 @@ package com.mogo.map.marker; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.Point; +import android.view.animation.Interpolator; import com.mogo.map.MogoLatLng; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 4d269020d1..8b854d2844 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -115,6 +115,14 @@ public interface IMogoMapUIController { */ Point getLocationPointInScreen( MogoLatLng latLng ); + /** + * 获取像素点对应的经纬度 + * + * @param point + * @return + */ + MogoLatLng getLocationMogoLatLngInScreen( Point point ); + /** * marker 跳跃动画 * diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index d664bb8a22..05634e5b08 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -149,6 +149,14 @@ public class MogoMapUIController implements IMogoMapUIController { return null; } + @Override + public MogoLatLng getLocationMogoLatLngInScreen(Point point) { + if (mDelegate != null) { + return mDelegate.getLocationMogoLatLngInScreen(point); + } + return null; + } + @Override public void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator, long duration ) { if ( mDelegate != null ) { 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 2b854906ef..85172a947d 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 @@ -1,12 +1,18 @@ package com.mogo.module.service.marker; import android.content.Context; +import android.graphics.Point; import android.os.Handler; import android.os.Looper; import android.text.TextUtils; -import android.view.View; +import android.view.animation.Interpolator; +import com.amap.api.maps.model.LatLng; +import com.amap.api.maps.model.animation.Animation; +import com.amap.api.maps.model.animation.TranslateAnimation; import com.mogo.map.MogoLatLng; +import com.mogo.map.impl.amap.marker.AMapMarkerWrapper; +import com.mogo.map.impl.amap.utils.ObjectUtils; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.MogoMarkerOptions; @@ -27,6 +33,7 @@ import com.mogo.module.service.Utils; import com.mogo.module.service.datamanager.MogoDataHandler; import com.mogo.service.cardmanager.IMogoCardChangedListener; import com.mogo.service.connection.IMogoOnMessageListener; +import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; import org.json.JSONArray; @@ -49,7 +56,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag // 第一次请求到地图的Marker数据 private boolean isFirstMarker = true; private boolean isOnLineCard = false; - private Context mContext; + private static Context mContext; private static IMogoMarker lastMarker; private static MapMarkerManager mMarkerManager; @@ -191,30 +198,60 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag public synchronized static void highlightedMarker(final String typeTag) { try { - if ( TextUtils.equals( mLastHighLightModule, typeTag ) ) { + if (TextUtils.equals(mLastHighLightModule, typeTag)) { return; } // 上一次高亮的变暗 - List lastHighLightList = MarkerServiceHandler.getMarkerManager().getMarkers( mLastHighLightModule ); + List lastHighLightList = MarkerServiceHandler.getMarkerManager().getMarkers(mLastHighLightModule); setMarkersAlpha(lastHighLightList, 0.7f); // 将当前高亮 - List currentHighLightList = MarkerServiceHandler.getMarkerManager().getMarkers( typeTag ); + List currentHighLightList = MarkerServiceHandler.getMarkerManager().getMarkers(typeTag); setMarkersAlpha(currentHighLightList, 1f); } catch (Exception e) { e.printStackTrace(); } } - private static void setMarkersAlpha(List markers,float alpha){ - if ( markers == null || markers.isEmpty() ) { + private static void setMarkersAlpha(List markers, float alpha) { + if (markers == null || markers.isEmpty()) { return; } - for ( IMogoMarker mogoMarker : markers ) { - if ( mogoMarker == null || mogoMarker.isDestroyed() ) { + for (IMogoMarker mogoMarker : markers) { + if (mogoMarker == null || mogoMarker.isDestroyed()) { continue; } - mogoMarker.setAlpha( alpha ); + mogoMarker.setAlpha(alpha); + + if (alpha == 1) { + try { + Point point = MarkerServiceHandler.getMapUIController().getLocationPointInScreen(mogoMarker.getPosition()); + point.y -= WindowUtils.dip2px(mContext, 100f); + MogoLatLng targetMogoLatLng = MarkerServiceHandler.getMapUIController().getLocationMogoLatLngInScreen(point); + LatLng target = ObjectUtils.fromMogo2(targetMogoLatLng); + //使用TranslateAnimation,填写一个需要移动的目标点 + Animation animation = new TranslateAnimation(target); + animation.setInterpolator(new Interpolator() { + @Override + public float getInterpolation(float input) { + if (input <= 0.5) { + return (float) (0.5f - 2.0 * (0.5 - input) * (0.5 - input)); + } else { + return (float) (0.5f - Math.sqrt((double) ((input - 0.5f) * (1.5f - input)))); + } + } + }); + //整个移动所需要的时间 + animation.setDuration(1000); + //设置动画 + if (mogoMarker instanceof AMapMarkerWrapper) { + ((AMapMarkerWrapper) mogoMarker).getMarker().setAnimation(animation); + ((AMapMarkerWrapper) mogoMarker).getMarker().startAnimation(); + } + } catch (Exception e) { + Logger.e(TAG, e, "error."); + } + } } } @@ -475,7 +512,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag options.icon(markerView.getView()); IMogoMarker marker = MarkerServiceHandler.getMarkerManager().addMarker(markerShowEntity.getMarkerType(), options); - markerView.setMarker( marker ); + markerView.setMarker(marker); marker.setOnMarkerClickListener(this); return marker; } else { From 565f495cc7b0818d4fb26159e52f70a8e75a5a6f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Feb 2020 10:53:13 +0800 Subject: [PATCH 2/9] opt video --- .../mogo/module/tanlu/fragment/TanluCardViewFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 ac8f087749..0ce83ed42f 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 @@ -94,6 +94,7 @@ import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; +import com.shuyu.gsyvideoplayer.GSYVideoManager; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; import org.greenrobot.eventbus.EventBus; @@ -675,7 +676,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; .build(simpleCoverVideoPlayer); simpleCoverVideoPlayer.getStartButton().performClick(); traceVideoPlayStatusData(); - + Log.d(TAG, "videoUrl = " + videoUrl); if (mImageUrl == null) { return; } @@ -714,12 +715,10 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; mogoImageloader.downloadImage(getActivity(), thumbnailUrl, new IMogoImageLoaderListener() { @Override public void onStart() { - Log.d(TAG, "onStart ------>"); } @Override public void onCompleted(Bitmap bitmap) { - Log.d(TAG, "onCompleted ------>bitmap = " + bitmap); autoZoomInImageView.setImageBitmap(bitmap); //动画 // handleImageAnimation(); @@ -927,6 +926,8 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; TanluServiceHandler.getLocationClient().removeLocationListener(this); mMogoRegisterCenter.unregisterMogoNaviListener(TanluConstants.MODEL_NAME); mogoIntentManager.unregisterIntentListener(MogoReceiver.ACTIION_ADAS); + Log.e(TAG, "onDestroyView --------> "); + GSYVideoManager.releaseAllVideos(); } /** From b1524e7037316a564ffa92a6403f2d3c525a61d1 Mon Sep 17 00:00:00 2001 From: lidongxiu Date: Sun, 16 Feb 2020 11:41:11 +0800 Subject: [PATCH 3/9] move --- .../java/com/mogo/module/back/utils/WindowViewHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java index 329ce1863e..bbd48717cd 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java @@ -86,7 +86,7 @@ public interface WindowViewHandler { if ( mWindowView == null ) { return; } - /* WindowManager wm = ( ( WindowManager ) mWindowView.getContext().getSystemService( Context.WINDOW_SERVICE ) ); + WindowManager wm = ( ( WindowManager ) mWindowView.getContext().getSystemService( Context.WINDOW_SERVICE ) ); if ( mParams.x > WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) / 2 ) { mParams.x = WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) - mWindowView.getMeasuredWidth(); @@ -94,7 +94,7 @@ public interface WindowViewHandler { mParams.x = 0; } - wm.updateViewLayout( mWindowView, alignLayoutParamsBoundary( mParams ) );*/ + wm.updateViewLayout( mWindowView, alignLayoutParamsBoundary( mParams ) ); } protected WindowManager.LayoutParams alignLayoutParamsBoundary( WindowManager.LayoutParams params ) { From 3d48ce12fe787feb767ac2019e97189d3138308f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Feb 2020 12:29:06 +0800 Subject: [PATCH 4/9] add log --- .../com/mogo/module/tanlu/fragment/TanluCardViewFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0ce83ed42f..f9dc00ad0d 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 @@ -239,7 +239,8 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; public void onGeocodeSearched(MogoGeocodeResult geocodeResult) { Logger.d(TAG, "onGeocodeSearched ------mKeywords =" + mKeywords); if (geocodeResult != null) { - if (geocodeResult.getAddresses() != null && geocodeResult.getAddresses().size() != 0) { + if (geocodeResult.getAddresses() != null && geocodeResult.getAddresses().size() > 0) { + Log.d(TAG, "geocodeResult.getAddresses().size() = " + geocodeResult.getAddresses().size()); MogoGeocodeAddress geocodeAddress = geocodeResult.getAddresses().get(0); MogoLatLng latLon = geocodeAddress.getLatlng(); Double longit; //经度 From 86161714f5e72d590a8914640ba53026702564c9 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Feb 2020 14:56:44 +0800 Subject: [PATCH 5/9] opt xx search poi --- .../tanlu/fragment/TanluCardViewFragment.java | 202 +++++++++++------- .../src/main/res/values/strings.xml | 4 +- 2 files changed, 121 insertions(+), 85 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 f9dc00ad0d..392f8dcdd4 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 @@ -125,7 +125,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; IMogoPoiSearchListener, IMogoLocationListener, View.OnClickListener, - IMogoDataChangedListener { + IMogoDataChangedListener{ private static final String TAG = "TanluCardViewFragment"; SimpleCoverVideoPlayer simpleCoverVideoPlayer; @@ -229,78 +229,78 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; mIMogoFragmentManager = (IMogoFragmentManager) ARouter.getInstance().build(MogoServicePaths.PATH_FRAGMENT_MANAGER).navigation(getContext()); - mIMogoGeoSearch.setGeoSearchListener(new IMogoGeoSearchListener() { - @Override - public void onRegeocodeSearched(MogoRegeocodeResult regeocodeResult) { - Logger.d(TAG, "onRegeocodeSearched -----> "); - } - - @Override - public void onGeocodeSearched(MogoGeocodeResult geocodeResult) { - Logger.d(TAG, "onGeocodeSearched ------mKeywords =" + mKeywords); - if (geocodeResult != null) { - if (geocodeResult.getAddresses() != null && geocodeResult.getAddresses().size() > 0) { - Log.d(TAG, "geocodeResult.getAddresses().size() = " + geocodeResult.getAddresses().size()); - MogoGeocodeAddress geocodeAddress = geocodeResult.getAddresses().get(0); - MogoLatLng latLon = geocodeAddress.getLatlng(); - Double longit; //经度 - Double lat; //维度 - if (mKeywords.equals("附近")) { - Logger.d(TAG, "附近 ----1---"); - longit = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); - lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); - } else { - Logger.d(TAG, "其他 ---1----"); - longit = latLon.lng; - lat = latLon.lat; - } - Log.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude= " + lat); - getVoiceControlRoadData(mKeywords, lat, longit); - } else { - String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); - MogoPoiSearchQuery poiSearchQuery = new MogoPoiSearchQuery(mKeywords, "", cityCode); - IMogoPoiSearch poiSearch = mMogoMapService.getPoiSearch(getContext(), poiSearchQuery); - poiSearch.setPoiSearchListener(new IMogoPoiSearchListener() { - @Override - public void onPoiSearched(MogoPoiResult p0, int p1) { - if (p1 == 1000) { - if (p0.getPois() != null && p0.getPois().size() != 0) { - MogoPoiItem poi = p0.getPois().get(0); - MogoLatLng latLon = poi.getPoint(); - Double longit; //经度 - Double lat; //维度 - if (mKeywords.equals("附近")) { - Logger.d(TAG, "附近 ----2---"); - longit = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); - lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); - } else { - Logger.d(TAG, "其他 --2----"); - longit = latLon.lng; - lat = latLon.lat; - } - getVoiceControlRoadData(mKeywords, lat, longit); - Log.d(TAG, "setOnPoiSearchListener keywords =" + mKeywords + ">>longitude= " + longit + "--latitude" + lat); - } else { - Logger.e(TAG, "poi == null"); - } - } else { - Logger.e(TAG, "poi search result p1 = " + p1); - } - } - - @Override - public void onPoiItemSearched(MogoPoiItem item, int errorCode) { - - } - }); - poiSearch.searchPOIAsyn(); - } - } else { - Logger.e(TAG, "onGeocodeSearched -----geocodeResult == null"); - speakFailVoice(searchfaileVoiceStrings[2]); - } - } - }); +// mIMogoGeoSearch.setGeoSearchListener(new IMogoGeoSearchListener() { +// @Override +// public void onRegeocodeSearched(MogoRegeocodeResult regeocodeResult) { +// Logger.d(TAG, "onRegeocodeSearched -----> "); +// } +// +// @Override +// public void onGeocodeSearched(MogoGeocodeResult geocodeResult) { +// Logger.d(TAG, "onGeocodeSearched ------mKeywords =" + mKeywords); +// if (geocodeResult != null) { +// if (geocodeResult.getAddresses() != null && geocodeResult.getAddresses().size() > 0) { +// Log.d(TAG, "geocodeResult.getAddresses().size() = " + geocodeResult.getAddresses().size()); +// MogoGeocodeAddress geocodeAddress = geocodeResult.getAddresses().get(0); +// MogoLatLng latLon = geocodeAddress.getLatlng(); +// Double longit; //经度 +// Double lat; //维度 +// if (mKeywords.equals("附近")) { +// Logger.d(TAG, "附近 ----1---"); +// longit = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); +// lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); +// } else { +// Logger.d(TAG, "其他 ---1----"); +// longit = latLon.lng; +// lat = latLon.lat; +// } +// Log.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude= " + lat); +// getVoiceControlRoadData(mKeywords, lat, longit); +// } else { +// String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); +// MogoPoiSearchQuery poiSearchQuery = new MogoPoiSearchQuery(mKeywords, "", cityCode); +// IMogoPoiSearch poiSearch = mMogoMapService.getPoiSearch(getContext(), poiSearchQuery); +// poiSearch.setPoiSearchListener(new IMogoPoiSearchListener() { +// @Override +// public void onPoiSearched(MogoPoiResult p0, int p1) { +// if (p1 == 1000) { +// if (p0.getPois() != null && p0.getPois().size() != 0) { +// MogoPoiItem poi = p0.getPois().get(0); +// MogoLatLng latLon = poi.getPoint(); +// Double longit; //经度 +// Double lat; //维度 +// if (mKeywords.equals("附近")) { +// Logger.d(TAG, "附近 ----2---"); +// longit = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); +// lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); +// } else { +// Logger.d(TAG, "其他 --2----"); +// longit = latLon.lng; +// lat = latLon.lat; +// } +// getVoiceControlRoadData(mKeywords, lat, longit); +// Log.d(TAG, "setOnPoiSearchListener keywords =" + mKeywords + ">>longitude= " + longit + "--latitude" + lat); +// } else { +// Logger.e(TAG, "poi == null"); +// } +// } else { +// Logger.e(TAG, "poi search result p1 = " + p1); +// } +// } +// +// @Override +// public void onPoiItemSearched(MogoPoiItem item, int errorCode) { +// +// } +// }); +// poiSearch.searchPOIAsyn(); +// } +// } else { +// Logger.e(TAG, "onGeocodeSearched -----geocodeResult == null"); +// speakFailVoice(searchfaileVoiceStrings[2]); +// } +// } +// }); DataSetChangedAdapter.getInstance().setDelegate( this ); } @@ -406,19 +406,26 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; /** - * 处理关键词搜索 + * 处理关键词搜索 TODO * * @return */ private void handleActionFoo(String keywords) { - speakSearchingVoice(); - MogoGeocodeQuery geocodeQuery; - String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); +// speakSearchingVoice(); +// MogoGeocodeQuery geocodeQuery; +// String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); +// +// geocodeQuery = new MogoGeocodeQuery(); +// geocodeQuery.setLocationName(keywords); +// geocodeQuery.setCity(cityCode); +// mIMogoGeoSearch.getFromLocationNameAsyn(geocodeQuery); - geocodeQuery = new MogoGeocodeQuery(); - geocodeQuery.setLocationName(keywords); - geocodeQuery.setCity(cityCode); - mIMogoGeoSearch.getFromLocationNameAsyn(geocodeQuery); + + String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); + MogoPoiSearchQuery poiSearchQuery = new MogoPoiSearchQuery(keywords, "", cityCode); + IMogoPoiSearch poiSearch = mMogoMapService.getPoiSearch(getContext(), poiSearchQuery); + poiSearch.setPoiSearchListener(this); + poiSearch.searchPOIAsyn(); } /** @@ -883,9 +890,38 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; } } + /** + * poi + * @param p0 + * @param p1 + */ @Override - public void onPoiSearched(MogoPoiResult result, int errorCode) { - + public void onPoiSearched(MogoPoiResult p0, int p1) { + if (p1 == 1000) { + if (p0.getPois() != null && p0.getPois().size() != 0) { + MogoPoiItem poi = p0.getPois().get(0); + MogoLatLng latLon = poi.getPoint(); + Double longit; //经度 + Double lat; //维度 + if (mKeywords.equals("附近")) { + Logger.d(TAG, "附近 ----2---"); + longit = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); + lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); + } else { + Logger.d(TAG, "其他 --2----"); + longit = latLon.lng; + lat = latLon.lat; + } + getVoiceControlRoadData(mKeywords, lat, longit); + Log.d(TAG, "setOnPoiSearchListener keywords =" + mKeywords + ">>longitude= " + longit + "--latitude" + lat); + } else { + Logger.e(TAG, "poi == null"); + speakFailVoice(searchfaileVoiceStrings[2]); + } + } else { + Logger.e(TAG, "poi search result p1 = " + p1); + speakFailVoice(searchfaileVoiceStrings[2]); + } } @Override diff --git a/modules/mogo-module-tanlu/src/main/res/values/strings.xml b/modules/mogo-module-tanlu/src/main/res/values/strings.xml index 2eb49abe1e..eb1d1412c1 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/strings.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/strings.xml @@ -17,8 +17,8 @@ 共享计划 上一条 下一条 - 分享成功 - 分享失败 + 上传成功 + 上传失败 将为您播放 From 1e906ccb3186344b7aabe092c0a52e09d37e92fd Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Sun, 16 Feb 2020 16:26:45 +0800 Subject: [PATCH 6/9] =?UTF-8?q?UI=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/styles.xml | 14 ++++++ .../navi/ui/search/CategorySearchFragment.kt | 6 +-- .../navi/ui/search/ChoosePathFragment.kt | 25 ++++++---- .../mogo/module/navi/uitls/BitmapUtils.java | 26 +++++++---- .../res/layout/fragment_search_category.xml | 44 +++++++++++++++++- .../icon_search_category_checked.png | Bin 3751 -> 1568 bytes .../icon_search_category_unchecked.png | Bin 2264 -> 1213 bytes .../src/main/res/values/styles.xml | 2 +- 8 files changed, 92 insertions(+), 25 deletions(-) diff --git a/modules/mogo-module-main/src/main/res/values/styles.xml b/modules/mogo-module-main/src/main/res/values/styles.xml index 4b9d268b74..7b786720a0 100644 --- a/modules/mogo-module-main/src/main/res/values/styles.xml +++ b/modules/mogo-module-main/src/main/res/values/styles.xml @@ -10,6 +10,8 @@ @color/module_main_window_background_color false @style/MainAnimation + @style/noCheckboxStyle + @style/noCheckboxStyle + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt index 3c5b6b13e5..8e59791dd0 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt @@ -18,10 +18,10 @@ import com.mogo.module.navi.ui.adapter.SearchCategoryAdapter import com.mogo.module.navi.ui.base.BaseFragment import com.mogo.module.navi.uitls.BitmapUtils import kotlinx.android.synthetic.main.fragment_search_category.cv_search_result +import kotlinx.android.synthetic.main.fragment_search_category.et_navi_search +import kotlinx.android.synthetic.main.fragment_search_category.iv_navi_back import kotlinx.android.synthetic.main.fragment_search_category.rv_search_result import kotlinx.android.synthetic.main.fragment_search_category.tv_navi_navi -import kotlinx.android.synthetic.main.include_search_bar.et_navi_search -import kotlinx.android.synthetic.main.include_search_bar.iv_navi_back /** * @author zyz @@ -134,7 +134,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView { BitmapUtils.createWaterMask( context, decodeResource, (index+1).toString(), R.color.white, 18 ) - return createWaterMask + return decodeResource } override fun onActivityCreated(savedInstanceState: Bundle?) { diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt index ed6910f43c..d8ef97cacd 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt @@ -15,6 +15,7 @@ import com.mogo.map.navi.MogoNaviInfo import com.mogo.map.navi.MogoTraffic import com.mogo.map.search.inputtips.MogoTip import com.mogo.module.common.MogoModulePaths +import com.mogo.module.navi.BuildConfig import com.mogo.module.navi.R import com.mogo.module.navi.constants.AMapConstants import com.mogo.module.navi.constants.SearchServiceHolder @@ -123,15 +124,6 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT, true ) - AIAssist.getInstance(context) - .registerUnWakeupCommand("firstPath", arrayOf(firstPath), this) - AIAssist.getInstance(context) - .registerUnWakeupCommand("secondPath", arrayOf(secondPath), this) - AIAssist.getInstance(context) - .registerUnWakeupCommand("thirdPath", arrayOf(thirdPath), this) - AIAssist.getInstance(context) - .registerUnWakeupCommand("startNavi", arrayOf(startNavi), this) - } // 是否开启导航 @@ -182,11 +174,24 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB SearchServiceHolder.getMarkerManger() .removeMarkers() + + + + AIAssist.getInstance(context) + .registerUnWakeupCommand("firstPath", arrayOf(firstPath), this) + AIAssist.getInstance(context) + .registerUnWakeupCommand("secondPath", arrayOf(secondPath), this) + AIAssist.getInstance(context) + .registerUnWakeupCommand("thirdPath", arrayOf(thirdPath), this) + AIAssist.getInstance(context) + .registerUnWakeupCommand("startNavi", arrayOf(startNavi), this) + + } private fun startNavi() { SearchServiceHolder.getNavi() - .startNavi(false) + .startNavi(!BuildConfig.DEBUG) SearchServiceHolder.getMapUIController() .recoverLockMode() isStartedNavi = true diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java index 7baf31fd2e..c34491e890 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java @@ -22,19 +22,27 @@ public class BitmapUtils { //创建一个bitmap Rect bounds = new Rect(); paint.getTextBounds(text, 0, text.length(), bounds); - // 创建一个新的和SRC长度宽度一样的位图 - Bitmap newb = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - //将该图片作为画布 - Canvas canvas = new Canvas(newb); - //在画布 0，0坐标上开始绘制原始图片 - canvas.drawBitmap(src, 0, 0, null); + //// 创建一个新的和SRC长度宽度一样的位图 + //Bitmap newb = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); + ////将该图片作为画布 + //Canvas canvas = new Canvas(newb); + ////在画布 0，0坐标上开始绘制原始图片 + //canvas.drawBitmap(src, 0, 0, null); // 绘制文字 + + + + Bitmap ret = src.copy(src.getConfig(), true); + //Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); + Canvas canvas = new Canvas(ret); + + + canvas.drawText(text, (width-bounds.width())/2.0F, (float) ( bounds.height()*1.8), paint); // 保存 - canvas.save(); + //canvas.save(); // 存储 - canvas.restore(); - return newb; + return ret; } public static int dp2px(Context context, float dp) { diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml index 81dc1ca8a0..bb230c92de 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml @@ -13,6 +13,7 @@ - - + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_search_category_checked.png b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_search_category_checked.png index a89d92e306dfae4ff20724d87842686385be967a..250128bb4b305669fddf5138982c15254758c825 100755 GIT binary patch literal 1568 zcmV+*2H*LKP)Px)+DSw~R9FeESX*lqR}`K-XJRmvQmxd)sxh_L(n=|%_*5#1k*11D5J`RMPw*u# zLA*pQRs^B=?1S_r6_KDpYVi`PFGZx3(w4T=s?mC>wvp0Q%sDf=-?z?Q<34j{&N0Ca zGi&X2`PR4B-ZOI&6U<=P!-t;_CMVY-<-@?**8*eOA=@E|au@nt=)XY!GMG2-tl75h zA3C092tu&;m}ryVR!B72Z7Jgf#-^n;X?xq8j$v+CRBZtxc;@q zd>rlFJ6aRuCUryrYAQQ-?lDQSgN^o+SdIoQt9lybIw0G_L~pA&MVz%^_(`;H-)<07 z7`lRz+`Ze5a(QnO$2&=g=AzZAPspI4#;GI;)hV5Bu+^*W_;|SQ(xq{)Z0(944-E|< z;|o9FS?YdA(UFf@4;(nA_-R)kZ{NN$D3>oIc&FI+$iPWwNB#CjT43Y%w07=QAI%Uq__VD1kZJHaRCc@S+R5Bh74!#fP z*EzYhCKdo#dKhcHPkfAdngKi@uAY17&_(G8NDMocjnlP&%Dm`CzHB^WjTwfy$JoKa z1^>nIJrD_HrB!D&MfI70XN&psY)65M7hTd8h6|&qN@bmpU_z5U=RUIOlpLz-Ml|!+ z;S(cC!l^J^7eVQ(*%p8GsynF#RVo=u4z;WFZ4w}cCtf|cczO0kHjcaW@R5)@(?nm% zw$}IM=*>EWCdk20lB6qw+L1nf0ITUv2Hb!s*F(u6x|3qa+;r_K>GpLYN-SeKB7nAQ z@w$#=Iv{bdX*|1!52JKZi)a@(SDlh04_|Cy*dF1#G6hbp)zI3GWIN!{G_*vMunX9f7VSB!wNI;)=^QWVe=N!VpA~4Y zbHPv&;#WqAVR_Y}lo&$FE3Bln(V@{nM!ug$@-+=jjCdw+Dq%KKLDwr>`z=Gi|gnqU8v5J8L+}8W#5aI_d?8y;2 z{Z&xUURhviJ&Uw$C6g zrewU;u!s}|kjgw@^%ceYemqwfT}_sM^5k)Hd+XK(K^$Mk+pmjruH3zFI8AlhIO_bg z;i`HWks0psM*g)R3|B208F`=)bvbtj23A&*Qk`2hn_lY|#afS?G5_pOC^6 zW6V8}=;=Ip@~0H6Kxx_$&AYZ?!|QmfT|m(ewWXwT4l{u7;1TWV8XNmLjc=elH4$Q5 z?eAX^Oi!~jFE_yCx%nfQGpA?y=xE_TX0rJ+BEsaG8#liCxLh6wnZPx@VM#<|DWHkZ0h}fSv(84SF0p$HD(8yZY)QosAnmA7>3?0Wg2=xg`K%Er5Ci z#eWkJb*n&Nf|$>gsCZ9%0P@c`4&m6}dHU%SRenY#S6-v?U--=r9GJ-7fB*Y=ulFMe zzn!zQFgl$Mu*{8`AUcJBMN@Ve0t{b&fTN#fx8MG1XZ7k!Dg9x~Mh;-UZ5zAmhX82{ zj$4LaK(qi{jBdC4A>!=7@ypJ(ZM|W~4E>E1!2H=~@9kZ@_zMJF#=KU)X{+5yWPpjCp*tP^NwW0rXv9mUH6qyj#(Aub_lw%q=ds4v@O}xZXN_&39clt^tT2 z#6AYO9x8zO)~)yB&i!kEcg-M4O=Vl^U?@wLveO(Xj!$tzUeVdU{YXl8Ix_kl%DA|7 z>q_xgrgD6DCfuU4~kIl9*~FQVorirF3D-7JkC`JxVIsbK_7*ni`suA&Xa6 znSQk8O8QWetdai)`cTOyCMWNkvtvi=Pb{hM-I-Jvvrvmc%28UN ziu|B`Z0`K|cenlQ+~N?SFw!3f-e2!zZN)@GrWJtpl~k5((Y=K+lz<9jk|y&BTOWWY<-s{o>4}=Hb85E$ zR~l?6)1Y4t@87P#lZJdTFFoq;;Js1QgKhOVy)C{*3(@4%3czzmk3NQAOTvOJ2!s1! zbKosWCR%gQOg6@|D9Tu9>YzW$yGe~x^CQo zm-ufO48|d9tdrU5LLO7BD*=G~h|0GG@o^-RPDmTYcmLQWms3*hq$!o~?ziB- zpM3IfKru0;VrnwlQU;7<)E7_6LBJ(*lK!*iq~AYVwvY4)X1L|!TMA=$@NLakue`lWC(4Jp1v-_X#{Ez@b$YZ$dAZ%yjgC@i*;08GYd}pAlc_-{0`{&?!;oz*wXq z@8cU_;7R?G6%-=bPOxTP*NsL1;u&?95~V}(8df}I0>bl}ucPu+_@^KGZwRRAF^Jc% zqgpKG8&l^BuQaH+E_cpPHc>*5rLOO=YAg^&q#VY3>I9Hz+fX2$l!JDX@tQmV^Yhe_ zPfoKyllgeDy=_N!l(#4NlF?p#G2g_W%W)~~>qa90k#qqd9kRf1#Mf4&6vDz|8Ly*x z`4Tl1*@?==%$+8I)=2SvGAW9tY*DkOr=pDj#OK6CzJH4DP`b9lNT6?p(G6k3Qza13 z4eD=Dd*y@r7KxvVHUbdf%?F6)hd}ZUSODtf1z-d(*pk*^++JE`@uVD-OU6qtbJ5(q zWSlAu*?NEc0)Zgf7YR_dd=W$W7O}j3$)6WMpFeJ@9gP44AoDG7tvdh^-Gj_T;K@F` z7GFWFqr6X=bD`8_eZIYYTm2HC^y3y~cmN_%?n$4o3!sjpl&kAz8QZNsX>xc!@@G1d z@#1m;ZpzE#-(3b*E%oCCh#!guUburSi|SLe4$Slaz{RzeJWdKKw?R49A*L6CBE=Mq z07!Na?6hDpz@>r}S2T)gi;X!gFLMtY!2HvOzej8^ngN(){DGqZXubo-aRN$42?naw zY*4I#5{=`TlR!TxIO#vmFXgYV0ia+t@JF2uMk4^>=QIjhobqQK!xi;gmW4}3{TR@= zAn8`wr((8|#r_Gn#qx_VMLwsS#A)l!1@)naYBrn_( z%TZo3K~FhNJL|&GCgKee$s&I&*1AZAah|;I_=4BG3(B*NR0kG0Lqm0mnh|s9bS^iI zbCo3M0(+X@E&vD-LAlO4o@)j{A59uI=}0y63P zdFTD|+2Ui4l*1MTe6a}Rwa9*6dZh7!QUp&utC<%yLv_}uW!b;ht$P>2?x+- z#fzFO=w@}QDCcn>KSbJOl(uA*(IxyHhCQtiTr}1GeKI8~O6TH9amW`b4;CV-qC``< zX^zzRfYN^`3v~-$(6K@45B#ose=%RfsIzO--1I*mfBYz%f6D>|_b}af8#$>_inkPt zmMm$?JXm-|KC&g{sP)(F9=+kEm+nc%N(dWwAZ>g2BNpC}nS@c^oH6VsZQS4|JuOK? zzVJ-2I7m~6=1j=}=0v_5&D8q{c&iEix_SO{Z`z2o0`P|A%U?m#ADQP=@{k#rp7w!F zndG8ejOd{6a6!ZudVZb|*g<>Az!Oxn0X06LsrWFx9Iw;)=xeO8#b^Z}|9lEtVW*0+ z;7kxhD=6NC?!vLY5WDa;g-*z5&g+|Z@CFj~JWpzem&rxgwZ=nFG^HQP@bK8#_D{rG z0mvk;U$J60KzvUL6F3e5IBaU4Y!HJqPLke6O4BVWYwIhbw2FKcSseRSU%KpI`Y zfBz9Y(_ZXLjuRLvP6gFczX-a=nGfE}{3!XW)AzRWXYpkN;P@=2jMSdXBc4AWuV{b9PXfeAUogg}(VT7cQ1|i*^ue zxN**$%~kH}%g!SiANcDDIC)azUZPLiBD%q4+r^Yj^xLHz~xU*Ly6-&=U# z!0$r;ZF$w%)~-+g)S5M`@PvFBojC1VLZ8DSUZBgcNpPR@JAgd?^tIRN_0}vrc<|Lh zLk$H$CUI)jswY79#305U7jIb=N17Tb03@S+$$#V|=s24pc!;(Brh^CfMXJ-f92$U( zP7vX64>Ih^aUDRVtn2P+u|W%c0MBoBhXx)~QJryG)4nE%cna@(t@mh1F93_2#hpjLY@D$GikK%L^orn(UyC;q!PL)sH z^A?Yw^AvMr9jE{&AAZ=jGk|pW#CVHEFUoZtRhoxCZF|NH_#TQ|zxdFheadANbmRas z>60s0^6%?*qqyXQrLV9EU;#qPQQD$?##F$M#O=G^&d9-I==y@<1gCMm`0(MqC~AXk zsmNZykQyIQ2-s5n2kj}V8hOsn+c4_RQ+O`u6&rtFzI+|N`PhxuoUT1B5t*Rz6-Gdc zCv7wcrtexVP~PosxETx9$aV-y4YM3VB=3SCqTt;?EZP0+EhbgfW13Uq(uYreIl1BH z*I&P4;ISm-LH>#j1F`8nG0IAS31BOL?|Im^R~kH~HWmOGm>^=?);?I`Egf%p{HGE8 zgfSNI#tI;VpLpn@bpU8LzT5;3el3H08g)_~CmC#dxTlT{JmxpH4rFi+0}Px(cS%G+R9Fecm|19DRTPHTTKmS7qREpeN}O;YXfUP*L(&@?6r=^86j}!iN{Ltt z+USFV#%mPpQ;Xn42#O$To&^U`Q=6u=M5_{|IH02RL8MB>lxT9+@?Xb$uIHwAEXnD4 zIA@RR`}f}K?1`y~XLG^YPBLvZjqWC0etcNU`gLCbM`a|hLs~yHL^}+ccBM!YY1wP{T zOFa@yr-I1rT8oIGXsENCnKUvMGFY%J7`027^!X%Xt-sE4rn6&l{zBp_@aFe5qJP#} zKw{rn&UALHA^*6YORf4VhGZ)eFimIrtb@Ny(cf}jj$3sY>%;LgAi`U`h}q;gI${{h z0c|6-*mE=Oiv$L?Yk;#_hcSPXq-Xv8k8K?gB5i>GlC^*o4{T}k9%&V_pHdl_208L= z1TQe#bViBU5?`=4{u1q2a^Wv}{P_ zWg2vLtl=z@Nn^uC_{==cb`7$T=wnC-YTTK%lp-^@hIl`6V`2F%bk6{*J(#5!6Mhl? zG5bj&cZdHq6fK4wP;>#-;qL5&aJMs^?aWxnf!+KE_5v>U?uXQl0y3GocyRR;=#5ObTdl$|}&6`KvmwqVn35M7AgMH;|mC7`lW+eCGuzo9(#3470TW_R#5M%l-DNQyC zE-NRr9h>AWI6m}$G{$pfd8tTEAzsc8UP5|^j6Wb8%2Rdg2XW{owp)~>FF8n6t5jEr zR~#C*Ya`P+wCqEQ^yO;C%F=^8fS$ZLu=Gxk@t0+J6(S7@@p`zX=pv0iqll()OY}ko zTcso{?K^QnGDH$Kz%l1b88re83vnC8i<=|v#H?KLRA^!kxl`g|rl;1$%t}p73GvE< zPgp1AqA%dQv#7i`Z4g_&U05atXgPH6f0mD?^Xi39nMdkXa6k)%E*9#?H2r8&-ou{e zdCiJ&8%_5}0>(UZxtY%6;-z@4z&*^;g?Zxpq)ap4(-z_o4AZ655*?0#OW_9e#E;Fu b(`Ek!g*LP#?#CIA00000NkvXXu0mjfZe&K0 literal 2264 zcmV;}2q*W6P)Px-l1W5CRCodHoJ))y#TACnsh)w@LU9Z+j|D_P1OWsRQIZu88?v)I6aI7;JWR0x~1tIUi1n8SuNhG z>2PWQzR!t0sY&viU3clfM-8)@@CqugeAJQ;|K)G=-lomu*u@Zv_GC8a)V+&__Kr&O zy7&IA#Oz~W-OqZ!v?^6y?VLN=B>grT=1JcCiK@Cn>`VBn^1gFA^Ud$LKRmDN)_5zsH3pp& zgVjcK>1T$OV`u;`+Gf|_e)o`JN`m7fOf7!yy?i_@p>^UoC#x}K`W-IpF^Z`V?u*ww zKcx@XiJ6}}6o3Jq2Rsh1=H8an-`4cKE;kVS$$O(D?tWGOEnHwr+;AY)1{k`n_@_h5 z6MYR`c2lgWvD8!j6=vUOa&SRQ+)%eW*8<1^Lnr*pyyvmyIq|oQ1xm@JUfk~&T4HK_ zcXpkDr7}QHRo)Z-AC9)X=lOZNzHQz1a9p#gj_%++k)!i*;!dbK#mOGl50`1c_nhYu z9!Fc7w_kJx9xYKTHB&o1yr=2o1FQ}#ssxZv7@Q-<08bVB24-ntAvIGwJ&5UL z^i)M=X@GpT#dPHnTsbZ_anP8plDHM;P51OT>MDK0ZYP@n4fhU7C%wC;Y{ItH z4<6u!o`ScM0!snpl2q#bR_0L8Rg|>SDoRO>jaH`zdSMcJqsKA{O96cU6@LS+6qcm4 z?^E4TCQ+N~W?sU8vLbjaA+{7ian=j5&GvR_)Ggu>yueeamwPNaX`wtC;QF4O#+77_ zT3BrROJw}cRHG+)qeps;6&?-n3rX)_P_878dTA=wOr3i46jsR*B=;HZ*nYS;!7H5kB$e$iD={!0-fcrFzSjC~cS0kY}E&{_VJ;ykR0yw9#AzP}l zxuw{Bb5QgKpL6s|&-wR*KBEANr9Wg4{`5E~*itB4^tj-;$Ws(R>odE?@At=()g56u^li}dLJ7SK+>=htF_cdQOP1#g%^=U$5)L<8L0)7S7G#)oX;*cWp{ap-QerS@)aJVM zLQnKYk7cx$0?5~=@Tl|akU;J7r7)!l9^i$Z=&kH4Vx<5w$(l3Vc3i1XaKoL@Nw=Bb zb@|9VzzaOlTUjrq0rCprrN6702s;zc!CMXIl}*}~`qWMj)I(2YTOZHEZ^+e-3w!-% z@M!WQOgrbDx9brFt+G?cH@wpwm^4q~{`dFYy@^Yzs4v|D^CWmJ^~V_U`Ghiw%eOE` z%u74)3C)>yc%YYxM`eJsJ^frXIUidgyqRBvt9f5V4I@8|TB(`Z=^=QjsG>4J=G!x+ zFJsl>Cw%hKDfE2KI>WDw#Ev3z2$;`a3+~P9f*_a(J`Tli9<-5QGe+1?D;^EN_XK z;1+b}?3U69Jo+AL3(P@&wIyPZc~QJCJ;Tpq)%rZB+YYnk<+>UH$lzm#I0AU|*%-jF zLL3pi#sQ86;t1i51YicyFgp7%IyZVx95K9+0UQa$1K_#Mv(q}XsS5QU?r8KLcyQ9S zGYz%GF~Ot1kpg7G10affLClx>4T3QaIMi*$PP89nljPC0yj;V`0W$H>AdVRxy^ICm zP$0Gd-dF+Fg4hyxV+U9XVvFFl0$?eKErZt@fKd=z2(MKD2SRKqyw(9cBt(2U&Uqd+ z4LZg)jTs~=%o7dI&fG1<13zToHPn$ko(QslaA>CO1>NWxF0F0tEpO(lOk mSp4$8mkBHrSSC=D!2bc+5DcctbmAod0000 @dimen/module_search_180dp - @null + @color/translate center @dimen/sp_40 @color/selector_white_gray From a2c49ed5e12e4dcc5b119c994a14447fd55a50ed Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Feb 2020 18:06:06 +0800 Subject: [PATCH 7/9] opt share recevier --- .../java/com/mogo/module/share/dialog/LaucherShareDialog.java | 1 + .../com/mogo/module/tanlu/fragment/TanluCardViewFragment.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index defdf2e8be..46978a36f2 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -107,6 +107,7 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { Logger.d("LaucherShareDialog", "LaucherShareDialog sendShareReceiver ---->"); Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra("type", type); mContext.sendBroadcast(intent); } 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 392f8dcdd4..0a1852d3cf 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 @@ -551,6 +551,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; Logger.d(TAG, "TanluCardViewFragment sendShareReceiver ---->"); Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra("type", type); getContext().sendBroadcast(intent); } From bdfc56049ded47c46ef6eb54aa119c844969b33a Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Feb 2020 18:30:01 +0800 Subject: [PATCH 8/9] fixed bug UI-312 and UI-313 --- .../module/tanlu/fragment/TanluCardViewFragment.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 0a1852d3cf..bb0ce26c4e 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 @@ -1320,6 +1320,15 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; * 将探路的数据结构转换成 MarkerExploreWay的列表 */ private void convertData(List informations) { + + if (informations.size() == 1) { + mPreviousTv.setVisibility(View.GONE); + mNextTv.setVisibility(View.GONE); + } else { + mPreviousTv.setVisibility(View.VISIBLE); + mNextTv.setVisibility(View.VISIBLE); + } + for (int i = 0; i < informations.size(); i++) { MarkerExploreWay markerExploreWay = new MarkerExploreWay(); markerExploreWay.setAddr(informations.get(i).addr); From 5079054f9dc84e0e4cfc9f2d65fad67ee27ccbc5 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Feb 2020 20:54:25 +0800 Subject: [PATCH 9/9] opt --- .../java/com/mogo/module/share/dialog/LaucherShareDialog.java | 1 + .../com/mogo/module/tanlu/fragment/TanluCardViewFragment.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 46978a36f2..3f35c59067 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -108,6 +108,7 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES); intent.putExtra("type", type); mContext.sendBroadcast(intent); } 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 bb0ce26c4e..9cd3bec6d1 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 @@ -552,6 +552,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES); intent.putExtra("type", type); getContext().sendBroadcast(intent); }