rc

2020-02-11 21:54:54 +08:00
parent 19156517ac 5d672686f3
commit 4eeea9e5d1
12 changed files with 69 additions and 41 deletions
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,6 +16,7 @@
        <item name="android:windowContentOverlay">@null</item>
        <item name="android:windowBackground">@color/app_window_background</item>
        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowFullscreen">true</item>
        <item name="android:windowAnimationStyle">@style/Animation</item>
    </style>

--- 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",
+
    ]
 }
--- 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));
    }
 }
--- 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() {

--- 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<MarkerShareMusic> shareMusicList = markerCardResult.getShareMusic();
            List<MarkerNoveltyInfo> 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;
--- 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()
--- 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<IView, Presenter<IView>>
        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();
--- 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
        }
--- 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
    }

--- 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 @@
    <item android:id="@android:id/background">
        <shape>
            <solid android:color="#59000000"/>
+            <corners android:radius="4dp" />
        </shape>
    </item>
    <item android:id="@android:id/secondaryProgress">
@@ -18,9 +19,9 @@
                <solid android:color="#FF0000"/>
                <corners android:radius="5dp" />
                <!--在gradient这里设置不同的颜色就会产生渐变的效果-->
-<!--                <gradient-->
-<!--                    android:startColor="#1AFFFFFF"-->
-<!--                    android:endColor="#CCFFFFFF"/>-->
+                <gradient
+                    android:startColor="#1AFFFFFF"
+                    android:endColor="#CCFFFFFF"/>
            </shape>
        </clip>
    </item>
--- 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 @@
    <dimen name="tanlu_module_full_loading_height">96px</dimen>
    <dimen name="tanlu_module_full_bottom_height">100px</dimen>
    <dimen name="tanlu_module_full_bottom_width">700px</dimen>
-    <dimen name="tanlu_module_full_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">7px</dimen>

    <dimen name="tanlu_module_full_top_height">135px</dimen>
    <dimen name="tanlu_module_full_back_width">50px</dimen>
--- 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 @@
    <dimen name="tanlu_module_full_loading_height">96px</dimen>
    <dimen name="tanlu_module_full_bottom_height">144px</dimen>
    <dimen name="tanlu_module_full_bottom_width">760px</dimen>
-    <dimen name="tanlu_module_full_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">7px</dimen>

    <dimen name="tanlu_module_full_top_height">135px</dimen>
    <dimen name="tanlu_module_full_back_width">50px</dimen>