From 42dc6da4d60f7b5378235801cf3d41667d4edea0 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 4 Aug 2022 15:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E7=9A=84tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apm/ApmCrashReportProvider.java           | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
index bd6da83424..a1a63fe05c 100644
--- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
+++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
@@ -38,6 +38,10 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
 
     private static final String TAG = "ApmCrashReportProvider";
     private static final String MAP_SDK_VERSION = "MAP_SDK_VERSION";
+    private CarInfo mInfo = null;
+    private String mCityCode;
+    private String mLat;
+    private String mLogt;
 
     @Override
     public void init(Context context) {
@@ -54,27 +58,28 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
                         HashMap<String, String> map = new HashMap<>();
                         //车辆信息
                         String carInfoString = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO);
-                        CarInfo info = null;
+
                         if (carInfoString != null && !carInfoString.isEmpty()) {
-                            info = GsonUtils.fromJson(carInfoString, CarInfo.class);
+                            mInfo = GsonUtils.fromJson(carInfoString, CarInfo.class);
                         }
 
                         //车辆所在位置
-                        String cityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE);
-                        String lat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE);
-                        String logt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE);
-//                        Log.d("liyz", "cityCode = " + cityCode + " --lat = " +lat + " --logt = " + logt);
+                        mCityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE);
+                        mLat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE);
+                        mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE);
+                        Log.d("liyz", "cityCode = " + mCityCode + " --lat = " +mLat + " --logt = " + mLogt);
                         //地图版本
                         String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context);
                         map.put("MAP_SDK_VERSION", mapSDKVersion);
-                        if (info != null) {
-                            CallerLogger.INSTANCE.d(TAG, "nuber = " + info.getNumber_plate() + "--brand = " + info.getBrand() + "--modle = " + info.getModel());
-                            map.put("PLATE_NUMBER", info.getNumber_plate());
-                            map.put("BRAND", info.getBrand());
-                            map.put("MODEL", info.getModel());
-                            map.put("CITYCODE", cityCode);
-                            map.put("LATITUDE", lat);
-                            map.put("LONGITUTE", logt);
+                        map.put("CITYCODE", mCityCode);
+                        map.put("LATITUDE", mLat);
+                        map.put("LONGITUTE", mLogt);
+
+                        if (mInfo != null) {
+                            CallerLogger.INSTANCE.d(TAG, "nuber = " + mInfo.getNumber_plate() + "--brand = " + mInfo.getBrand() + "--modle = " + mInfo.getModel());
+                            map.put("PLATE_NUMBER", mInfo.getNumber_plate());
+                            map.put("BRAND", mInfo.getBrand());
+                            map.put("MODEL", mInfo.getModel());
                         }
                         return map;
                     }
@@ -89,6 +94,10 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
             crash.config().setDeviceId(DeviceIdUtils.getDeviceId(context));
         }
         crash.addTags(MAP_SDK_VERSION, mapSDKVersion);
+        crash.addTags("CITYCODE", mCityCode);
+        crash.addTags("LATITUDE", mLat);
+        crash.addTags("LONGITUTE", mLogt);
+
 //        crash.setReportUrl("www.xxx.com"); // 私有化部署：私有化部署才配置上报地址
 //        crash.addTags("key", "value"); // 自定义筛选tag, 按需添加、可多次覆盖
 
@@ -98,6 +107,15 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
         dimension.put("Devices_SN_WidevineID_MD5", sn + "__" + DeviceIdUtils.getWidevineIDWithMd5(context));
         dimension.put("Devices_SN_WidevineID", sn + "__" + DeviceIdUtils.getWidevineID(context));
         dimension.put(MAP_SDK_VERSION, mapSDKVersion);
+        dimension.put("CITYCODE", mCityCode);
+        dimension.put("LATITUDE", mLat);
+        dimension.put("LONGITUTE", mLogt);
+        if (mInfo != null) {
+            dimension.put("PLATE_NUMBER", mInfo.getNumber_plate());
+            dimension.put("BRAND", mInfo.getBrand());
+            dimension.put("MODEL", mInfo.getModel());
+        }
+
         HashMap<String, Double> metric = new HashMap<>();
         //指标值
         //metric.put("Devices_ID_metric", (double) 100);