From ccd247f105b8c5b4ba2f6e759ab40341778a8424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 5 Feb 2020 18:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=B0=94=E6=B3=A1=E7=9A=84=E6=9B=B4=E6=96=B0=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=BAUI=E7=BA=BF=E7=A8=8B=EF=BC=9B=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E6=97=A5=E5=BF=97=E6=94=B6=E9=9B=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                     |  2 ++
 .../main/java/com/mogo/launcher/MogoApplication.java | 11 +++++++++--
 config.gradle                                        |  2 ++
 .../mogo/module/service/MarkerServiceHandler.java    | 12 ++++++++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1b16d7e907..7967765624 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
+    //Crash日志收集
+    implementation rootProject.ext.dependencies.crashSdk
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.arouter
     implementation rootProject.ext.dependencies.androidxmultidex
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 3808bd13bc..f7a41dd5ee 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -5,14 +5,13 @@ import android.content.Context;
 import androidx.multidex.MultiDex;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.auto.zhidao.logsdk.CrashSystem;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.module.adcard.AdCardConstants;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.media.MediaConstants;
-//import com.mogo.module.onlinecar.OnLineCarConstants;
 import com.mogo.module.onlinecar.OnLineCarConstants;
 import com.mogo.module.push.PushUIConstants;
 import com.mogo.module.tanlu.constant.TanluConstants;
@@ -20,6 +19,8 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.connection.IMogoSocketManager;
 
+//import com.mogo.module.onlinecar.OnLineCarConstants;
+
 /**
  * @author congtaowang
  * @since 2019-12-18
@@ -31,6 +32,12 @@ public class MogoApplication extends AbsMogoApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        // Crash 日志收集
+        CrashSystem crashSystem = CrashSystem.getInstance(this);
+        crashSystem.init();
+        //设置debug模式，日志不上传
+        crashSystem.setDebug(BuildConfig.DEBUG);
+
 //        MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) );
 //        MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) );
         DebugConfig.setNetMode(BuildConfig.NET_ENV);
diff --git a/config.gradle b/config.gradle
index 8d956ff938..9b22bd8d31 100644
--- a/config.gradle
+++ b/config.gradle
@@ -117,5 +117,7 @@ ext {
 
             // 统一登录
             accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.5",
+            // crash
+            crashSdk                 : "com.zhidaoauto.crash.log:library:1.0.5",
     ]
 }
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
index 02824330a0..389f041db5 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
@@ -1,6 +1,8 @@
 package com.mogo.module.service;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -98,11 +100,17 @@ public class MarkerServiceHandler {
             }
 
             @Override
-            public void onMsgReceived(MarkerResponse response) {
+            public void onMsgReceived(final MarkerResponse response) {
                 Logger.e(TAG, "======MarkerResponse：" + response);
                 if (!getMogoStatusManager().isSearchUIShow() && !getMogoStatusManager().isV2XShow()) {
                     isFirstMarker = true;
-                    drawMapMarker(response);
+                    Handler handler = new Handler(Looper.getMainLooper());
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            drawMapMarker(response);
+                        }
+                    });
                 }
             }
         });