opt

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

config.gradle

@@ -2,12 +2,12 @@ ext {
     android = [
 //            applicationId       : "com.mogo.launcher",
 //            zhidadoApplicationId: "com.zhidao.launcher",
-            launcherApplicationId: "com.mogo.launcher",
-            independentApplicationId: "com.mogo.launcher.app",
-            compileSdkVersion   : 28,
-            buildToolsVersion   : "29.0.2",
-            minSdkVersion       : 19,
-            targetSdkVersion    : 22,
+launcherApplicationId   : "com.mogo.launcher",
+independentApplicationId: "com.mogo.launcher.app",
+compileSdkVersion       : 28,
+buildToolsVersion       : "29.0.2",
+minSdkVersion           : 19,
+targetSdkVersion        : 22,
     ]
 
     dependencies = [
@@ -151,5 +151,6 @@ ext {
 
             // 个人中心的SDK
             personalsdk              : "com.zhidaoauto.person.info:data:1.0.1",
+            tanluupload              : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}",
     ]
 }

gradle.properties

@@ -77,6 +77,8 @@ MOGO_MODULE_MEDIA_VERSION=1.0.4.11
 MOGO_MODULE_PUSH_VERSION=1.0.1
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
+# 探路上报和分享模块
+TANLULIB_VERSION=1.0.2-SNAPSHOT
 
 ## 产品库必备配置
 applicationId=com.mogo.launcer

modules/mogo-module-main/build.gradle

@@ -39,6 +39,7 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
     implementation rootProject.ext.dependencies.arouter
+    implementation rootProject.ext.dependencies.tanluupload
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.mogoutils

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -213,16 +213,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     @Override
     public boolean onMarkerClicked( IMogoMarker marker ) {
         EventDispatchCenter.getInstance().onMarkerClicked( marker );
-        if ( !mMogoStatusManager.isADASShow() ) {
-            switch2Card( marker.getOwner(), false );
-        }
         return false;
     }
 
-    @Override
-    public void switch2Card( String cardType, boolean lockCar ) {
-    }
-
     @Override
     protected void onResume() {
         super.onResume();

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java

@@ -16,6 +16,7 @@ import com.mogo.module.main.livedata.CardSwitchLiveData;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.module.IMogoModuleProvider;
+import com.zhidao.roadcondition.service.MainService;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -28,9 +29,6 @@ import java.util.Map;
  */
 public class MainPresenter extends Presenter< MainView > {
 
-    // 埋点接口
-    private IMogoAnalytics mAnalytics;
-
     private Handler mMsgHandler = new Handler( Looper.getMainLooper() ) {
         @Override
         public void handleMessage( Message msg ) {
@@ -57,13 +55,6 @@ public class MainPresenter extends Presenter< MainView > {
     @Override
     public void onCreate( @NonNull LifecycleOwner owner ) {
         super.onCreate( owner );
-        CardSwitchLiveData.getInstance().observeForever( cardInfo -> {
-            if ( TextUtils.isEmpty( cardInfo.mCardName ) ) {
-                return;
-            }
-            mView.switch2Card( cardInfo.mCardName, cardInfo.mLockCar );
-        } );
-        mAnalytics = ( IMogoAnalytics ) ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_ANALYTICS ).navigation( getContext() );
     }
 
     /**

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java

@@ -11,13 +11,6 @@ import com.mogo.service.IMogoServiceApis;
  */
 public interface MainView extends IView {
 
-    /**
-     * 切换卡片
-     *
-     * @param cardType
-     */
-    void switch2Card( String cardType, boolean lockCar );
-
     /**
      * 加载卡片
      */

services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java

@@ -168,7 +168,9 @@ public class MogoStatusManager implements IMogoStatusManager {
 
     @Override
     public void setMainPageResumeStatus( String tag, boolean resume ) {
+        final long start = System.currentTimeMillis();
         doSetStatus( tag, StatusDescriptor.MAIN_PAGE_RESUME, resume );
+        Logger.i( TAG, "setMainPageResumeStatus " + resume + " cost " + ( System.currentTimeMillis() - start ) + "ms" );
     }
 
     @Override
@@ -191,7 +193,7 @@ public class MogoStatusManager implements IMogoStatusManager {
         doSetStatus( tag, StatusDescriptor.UPLOADING, uploading );
     }
 
-    private void doSetStatus(String tag, StatusDescriptor target, boolean value){
+    private void doSetStatus( String tag, StatusDescriptor target, boolean value ) {
         mStatus.put( target, value );
         invokeStatusChangedListener( target, value );
         recordStatusModifier( tag, target );