diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2eead786b7..c97f8ce3ec 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -16,6 +16,7 @@ @null @color/app_window_background false + true @style/Animation diff --git a/config.gradle b/config.gradle index c15381b4a0..cf46b9673d 100644 --- a/config.gradle +++ b/config.gradle @@ -124,5 +124,12 @@ ext { // crash crashSdk : "com.zhidaoauto.crash.log:library:1.0.5", kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7", + + //探路 + videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2", + videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2", + videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2", + eventbus : "org.greenrobot:eventbus:3.1.1", + ] } \ No newline at end of file diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java index b77e27d37f..33f5bc5563 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java @@ -1,6 +1,7 @@ package com.mogo.utils.glide; import android.content.Context; +import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -12,6 +13,7 @@ import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFactory; import com.bumptech.glide.load.engine.cache.LruResourceCache; import com.bumptech.glide.load.engine.cache.MemoryCache; +import com.bumptech.glide.load.engine.executor.GlideExecutor; import com.bumptech.glide.module.AppGlideModule; /** @@ -32,7 +34,9 @@ public class BaseGlideModule extends AppGlideModule { * * 是在sdcard/Android/data/包名/cache/DISK_CACHE_NAME目录当中 */ + builder.setLogLevel(Log.VERBOSE); builder.setMemoryCache( new LruResourceCache( MEMORY_CACHE_SIZE ) ); builder.setDiskCache( new ExternalPreferredCacheDiskCacheFactory( context, DISK_CACHE_NAME, DISK_CACHE_SIZE ) ); + builder.setDiskCacheExecutor(GlideExecutor.newDiskCacheExecutor(GlideExecutor.UncaughtThrowableStrategy.DEFAULT)); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index b746efc98d..4c3a8a2525 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -523,6 +523,7 @@ public class MogoServiceProvider implements IMogoModuleProvider, @Override public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) { + Logger.d(TAG, "状态发生改变---descriptor---" + descriptor + "----isTrue---" + isTrue); switch ( descriptor ) { case USER_INTERACTED: if ( isTrue && !mRefreshRemainingTimeStatus ) { @@ -532,7 +533,6 @@ public class MogoServiceProvider implements IMogoModuleProvider, } break; case SEARCH_UI: - case V2X_UI: if ( isTrue ) { // 搜索时，不在自动刷新打点策略 stopAutoRefreshStrategy(); @@ -543,9 +543,33 @@ public class MogoServiceProvider implements IMogoModuleProvider, } } break; + case V2X_UI: + try { + if ( isTrue ) { + // V2X_UI时，不在自动刷新打点策略 + stopAutoRefreshStrategy(); + } else { + // 主动刷新 + refreshStrategy(); + // V2X_UI后，打开打点策略 + if ( mAutoRefreshCallback != null ) { + mAutoRefreshCallback.onSuccess(); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + break; } } + public void refreshStrategy(){ + Logger.d( TAG, "move to center and refresh data." ); + mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, false ); + mUiController.moveToCenter(mLastAutoRefreshLocation); + notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback ); + } + @Override public void onCalculateSuccess() { 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 98c8e1d520..1c255e42b3 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 @@ -258,20 +258,20 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag List shareMusicList = markerCardResult.getShareMusic(); List noveltyInfoList = markerCardResult.getNoveltyInfo(); - if (carChatList != null) { - for (MarkerCarChat markerCarChat : carChatList) { - MarkerLocation markerLocation = markerCarChat.getLocation(); - - MarkerShowEntity markerShowEntity = new MarkerShowEntity(); - markerShowEntity.setBindObj(markerCarChat); - markerShowEntity.setMarkerLocation(markerLocation); - markerShowEntity.setMarkerType(markerCarChat.getType()); - markerShowEntity.setTextContent(markerCarChat.getUserInfo().getUserName()); - markerShowEntity.setIconUrl(markerCarChat.getUserInfo().getUserHead()); - - drawMapMarker(markerShowEntity); - } - } +// if (carChatList != null) { +// for (MarkerCarChat markerCarChat : carChatList) { +// MarkerLocation markerLocation = markerCarChat.getLocation(); +// +// MarkerShowEntity markerShowEntity = new MarkerShowEntity(); +// markerShowEntity.setBindObj(markerCarChat); +// markerShowEntity.setMarkerLocation(markerLocation); +// markerShowEntity.setMarkerType(markerCarChat.getType()); +// markerShowEntity.setTextContent(markerCarChat.getUserInfo().getUserName()); +// markerShowEntity.setIconUrl(markerCarChat.getUserInfo().getUserHead()); +// +// drawMapMarker(markerShowEntity); +// } +// } if (onlineCarList != null) { IMogoMarker nearlyMogoMarker = null; diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle index 0b8129adce..8a280b205d 100644 --- a/modules/mogo-module-tanlu/build.gradle +++ b/modules/mogo-module-tanlu/build.gradle @@ -64,10 +64,10 @@ dependencies { implementation project(':modules:mogo-module-share') } - implementation 'com.shuyu:gsyVideoPlayer-armv7a:7.1.1' - implementation 'com.shuyu:gsyVideoPlayer-arm64:7.1.1' - implementation 'com.shuyu:gsyVideoPlayer-java:7.1.1' - implementation 'org.greenrobot:eventbus:3.1.1' + implementation rootProject.ext.dependencies.videoarmv7 + implementation rootProject.ext.dependencies.videoarm64 + implementation rootProject.ext.dependencies.videojava + implementation rootProject.ext.dependencies.eventbus } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() 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 6a8b41add6..92dd6cd3ea 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 @@ -472,7 +472,8 @@ public class TanluCardViewFragment extends MvpFragment> public void onCmdSelected(String cmd) { Log.d(TAG, "mogoVoiceListener cmd = " + cmd); if (cmd.equals(TanluConstants.PLAY_VIDEO)) { //播放路况 --ok - AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_prepare_play), null); + //语音会中断播放 +// AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_prepare_play), null); gsyVideoOptionBuilder.setUrl(mVideoUrl).setCacheWithPlay(false).setPlayTag(TAG) .build(simpleCoverVideoPlayer); simpleCoverVideoPlayer.getStartButton().performClick(); diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt index b07cd17667..6beb5337d1 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt @@ -66,13 +66,8 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { return GSYVideoManager.instance() } - override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int - ) { - super.setProgressAndTime(progress, secProgress, currentTime, totalTime) + override fun setProgressAndTime(progress: Int, secProgress: Int, currentTime: Int, totalTime: Int, forceChange: Boolean) { + super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) if (progress != 0) { mProgressBar.progress = progress } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt index 0a4ce844fd..ffce64b4e6 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt @@ -45,14 +45,9 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { return GSYVideoManager.instance() } - override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int - ) { - super.setProgressAndTime(progress, secProgress, currentTime, totalTime) - Log.e("liyz", "setProgressAndTime progress = $progress --->currentTime = $currentTime --->totalTime = $totalTime") + override fun setProgressAndTime(progress: Int, secProgress: Int, currentTime: Int, totalTime: Int, forceChange: Boolean) { + super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) +// Log.e("liyz", "setProgressAndTime progress = $progress --->currentTime = $currentTime --->totalTime = $totalTime") if (progress != 0) { mProgressBar.progress = progress } @@ -79,12 +74,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToCompleteShow() { super.changeUiToCompleteShow() // setViewShowState(mBottomContainer, View.INVISIBLE) + mBottomContainer.visibility = View.INVISIBLE Log.d("liyz", "changeUiToCompleteShow ------------>") } override fun hideAllWidget() { super.hideAllWidget() - Log.d("liyz", "hideAllWidget ------------>") mBottomContainer.visibility = View.VISIBLE } diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml b/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml index 16019e83b2..c48724bdd8 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml @@ -3,6 +3,7 @@ + @@ -18,9 +19,9 @@ - - - + diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index f198f8152e..c0a49c55c2 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -15,7 +15,7 @@ 96px 100px 700px - 5px + 7px 135px 50px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index a2953cf57c..438de99179 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -15,7 +15,7 @@ 96px 144px 760px - 5px + 7px 135px 50px