From 17015329c21df16c63075b87fc8778d499517fde Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 2 Nov 2020 15:15:42 +0800 Subject: [PATCH] opt --- .../tanlu/fragment/TanluListWindow.java | 43 ++++++++++++++---- .../res/drawable-xhdpi/tanlu_circle_image.png | Bin 0 -> 6908 bytes 2 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_circle_image.png diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index b4b67cdb13..dbc96cf077 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -3,6 +3,7 @@ package com.mogo.module.tanlu.fragment; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Rect; import android.location.LocationManager; import android.net.Uri; @@ -103,6 +104,7 @@ import com.mogo.service.windowview.IMogoTopViewStatusListener; import com.mogo.utils.NetworkUtils; import com.mogo.utils.TipDrawable; import com.mogo.utils.TipToast; +import com.mogo.utils.UiThreadHandler; import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; //import com.shuyu.gsyvideoplayer.GSYVideoManager; @@ -515,7 +517,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL * 唤醒语音 */ private IMogoIntentListener mogoIntentListener = (intentStr, intent) -> { - AIAssist.getInstance(getContext()).speakTTSVoice(searchingVoiceStrings[mRandom.nextInt(3)] , null); + AIAssist.getInstance(getContext()).speakTTSVoice(searchingVoiceStrings[mRandom.nextInt(3)], null); if (TanluServiceManager.getMogoStatusManager().isMainPageOnResume()) { // 直接执行相关查询操作 Logger.d(TAG, "智慧出行在前台,可直接分享--->"); @@ -1142,21 +1144,46 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); mogoMarker.setClickable(false); - //开启动画 - mogoMarker.startScaleAnimationWithAlpha(0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { + //添加图片动画 + Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_circle_image, null); + MarkerShowEntity markerShowEntityAnimation = new MarkerShowEntity(); + markerShowEntityAnimation.setTextContent(address); + markerShowEntityAnimation.setMarkerType(TanluConstants.MODEL_NAME); + MogoMarkerOptions options = new MogoMarkerOptions() + .object(markerShowEntityAnimation) + .icon(bitmap) + .anchor(0.5f, 0.5f) + .latitude(lat) + .owner(TanluConstants.MODEL_NAME) + .longitude(lon); + + IMogoMarker mogoAnimationMarker = mMarkerManager.addMarker(TanluConstants.MODEL_NAME, options); + mogoAnimationMarker.startScaleAnimation(0, 4f, 0, 4f, 500, new LinearInterpolator(), new OnMarkerAnimationListener() { @Override public void onAnimStart() { - Logger.d(TAG, " onAnimStart ---1----> "); } @Override public void onAnimEnd() { - if (mogoMarker.isDestroyed()) { - return; - } - mogoMarker.startScaleAnimation(1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null); + mogoAnimationMarker.destroy(); } }); + + //开启动画 +// mogoMarker.startScaleAnimationWithAlpha(0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { +// @Override +// public void onAnimStart() { +// Logger.d(TAG, " onAnimStart ---1----> "); +// } +// +// @Override +// public void onAnimEnd() { +// if (mogoMarker.isDestroyed()) { +// return; +// } +// mogoMarker.startScaleAnimation(1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null); +// } +// }); } } else { Logger.e(TAG, "onMarkerInfo share onCompleted poiType = -1 --- else ---->"); diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_circle_image.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_circle_image.png new file mode 100644 index 0000000000000000000000000000000000000000..4b3c40856e5f97208a4244492de41f65811c8e89 GIT binary patch literal 6908 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