From 6dc780133a24c0280eb8a50a4c97d8e6d572c36a Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Wed, 9 Jun 2021 20:28:25 +0800
Subject: [PATCH] =?UTF-8?q?bugly=20=E4=B8=8A=E6=8A=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20mapsdkverion=20=E5=8D=87=E7=BA=A7mapversio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                               |  7 +++++++
 app/src/main/AndroidManifest.xml               |  4 ++++
 config.gradle                                  |  2 ++
 gradle.properties                              |  1 +
 libraries/map-custom/build.gradle              |  4 ++--
 .../drawer/AdasRecognizedResultDrawer.java     |  1 +
 .../bugly/BuglyCrashReportProvider.java        | 18 ++++++++++++++++--
 7 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0208e47f03..85cb519b80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,9 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'android-aspectjx'
 
+Properties properties = new Properties();
+properties.load(project.rootProject.file("gradle.properties").newDataInputStream())
+
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     defaultConfig {
@@ -43,6 +46,9 @@ android {
             zipAlignEnabled false
             shrinkResources false
             signingConfig signingConfigs.release
+            manifestPlaceholders =[
+                    MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION")
+            ]
         }
         release {
             minifyEnabled false
@@ -105,6 +111,7 @@ android {
             buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
             // 是否支持目的地导航策略
             buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'false'
+
         }
         // f系列-网约车-出租车
         fochtaxi {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f9b68f4e86..0743954a19 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,10 @@
         <meta-data
             android:name="com.amap.api.v2.apikey"
             android:value="${AMAP_API_VALUE}" />
+
+        <meta-data
+            android:name="MAP_SDK_VERSION"
+            android:value="${MAP_SDK_VERSION}" />
         <!--保活用-->
         <service
             android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
diff --git a/config.gradle b/config.gradle
index 9bcd878a53..4530ec1b0f 100644
--- a/config.gradle
+++ b/config.gradle
@@ -97,6 +97,8 @@ ext {
             mapcustom                  : "com.mogo.map:map-custom:${MAP_CUSTOM_VERSION}",
             mogomap                    : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}",
             mogomapapi                 : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}",
+            mogocustommap              : "com.zhidaoauto.machine:map:${MAP_SDK_VERSION}",
+
             modulecommon               : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}",
             modulemain                 : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}",
             modulemainlauncher         : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}",
diff --git a/gradle.properties b/gradle.properties
index 5b32afb1b0..cdae1eba49 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -187,3 +187,4 @@ applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.7
+MAP_SDK_VERSION=1.0.0-vr-8.5.47
\ No newline at end of file
diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index 7cd3e42aec..51f10f5b16 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -66,8 +66,8 @@ dependencies {
         implementation project(':libraries:mogo-map-api')
         implementation project(':foudations:mogo-commons')
     }
-
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.46'
+    implementation rootProject.ext.dependencies.mogocustommap
+//    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.47'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
index 10f2642c69..68c7eab6c7 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
@@ -275,6 +275,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
 
         final long start = System.currentTimeMillis();
         Log.d("EmArrow", "renderAdasOneFrame uuid :  " + uniqueKey + "  type : " + recognizedListResult.type);
+        Log.d("EmArrow", "renderAdasOneFrame Process.myPid :  " + android.os.Process.myPid());
         ADASRecognizedResult lastPosition = mLastPositions.remove(uniqueKey);
 //        double lastLon = -1;
 //        double lastLat = -1;
diff --git a/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java b/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
index 6e82db9a8b..d285c6fb2e 100644
--- a/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
+++ b/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
@@ -1,11 +1,14 @@
 package com.mogo.test.crashreport.bugly;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.network.Utils;
 import com.mogo.test.crashreport.CrashReportConstants;
 import com.mogo.test.crashreport.ITestCrashReportProvider;
 import com.mogo.utils.logger.Logger;
@@ -28,7 +31,7 @@ class BuglyCrashReportProvider implements ITestCrashReportProvider {
     private static final String TAG = "BuglyCrashReportProvider";
 
     @Override
-    public void init( Context context ) {
+    public void init(final Context context ) {
         Logger.d(TAG, "init");
         String packageName = context.getPackageName();
         String processName = getProcessName( android.os.Process.myPid() );
@@ -36,6 +39,17 @@ class BuglyCrashReportProvider implements ITestCrashReportProvider {
         strategy.setUploadProcess( processName == null || processName.equals( packageName ) );
         CrashReport.initCrashReport( context, "f3f8b0b2f1", true, strategy );
         CrashReport.putUserData( context, "serial", MoGoAiCloudClientConfig.getInstance().getSn() );
+        try {
+            ApplicationInfo  applicationInfo =  context.getPackageManager().getApplicationInfo(context.getPackageName(),PackageManager.GET_META_DATA);
+            Bundle bundle = applicationInfo.metaData;
+            if (bundle != null){
+                String  sdkVersion = bundle.getString("MAP_SDK_VERSION");
+                Log.e("lianglihui", "init: "+sdkVersion);
+                CrashReport.putUserData( context, "MAP_SDK_VERSION",bundle.getString("MAP_SDK_VERSION") );
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     /**