From 590bb96ed2402b05636ddf049eea7cfde35d50d2 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Mon, 2 Mar 2020 14:07:27 +0800
Subject: [PATCH] update modules to 1.0.2

---
 foudations/mogo-commons/build.gradle          |  2 --
 .../mogo/commons/network/LocationHelper.java  | 13 +++----
 .../com/mogo/commons/network/ParamsUtil.java  |  8 ++---
 gradle.properties                             | 36 +++++++++----------
 4 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index 1591dbe34d..682617dd4d 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -45,10 +45,8 @@ dependencies {
     implementation rootProject.ext.dependencies.accountsdk
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
-        compileOnly rootProject.ext.dependencies.mogomapapi
     } else {
         implementation project(":foudations:mogo-utils")
-        compileOnly project(":libraries:mogo-map-api")
     }
     api 'org.greenrobot:eventbus:3.1.1'
 
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/LocationHelper.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/LocationHelper.java
index 0e7cebcdff..87aea86ff0 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/LocationHelper.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/LocationHelper.java
@@ -1,6 +1,7 @@
 package com.mogo.commons.network;
 
-import com.mogo.map.location.MogoLocation;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author congtaowang
@@ -30,13 +31,9 @@ public class LocationHelper {
         sInstance = null;
     }
 
-    private MogoLocation mMogoLocation;
+    private Map< String, Object > mLocationProperties = new HashMap<>();
 
-    public MogoLocation getMogoLocation() {
-        return mMogoLocation;
-    }
-
-    public void setMogoLocation( MogoLocation mogoLocation ) {
-        this.mMogoLocation = mogoLocation;
+    public synchronized Map< String, Object > getLocationProperties() {
+        return mLocationProperties;
     }
 }
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
index 73ca6ac8a3..4eb76d1be3 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
@@ -9,7 +9,6 @@ import androidx.collection.ArrayMap;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.storage.SpStorage;
-import com.mogo.map.location.MogoLocation;
 import com.mogo.utils.CommonUtils;
 import com.mogo.utils.DeviceIdUtils;
 import com.mogo.utils.WindowUtils;
@@ -31,12 +30,9 @@ public class ParamsUtil {
     public static Map< String, Object > getDynamicParams() {
         Map< String, Object > params = new ArrayMap();
 
-        final MogoLocation location = LocationHelper.getInstance().getMogoLocation();
+        final Map<String,Object> location = LocationHelper.getInstance().getLocationProperties();
         if ( location != null ) {
-            params.put( ServerParam.CITY_CODE, location.getCityCode() );
-            params.put( ServerParam.AD_CODE, location.getAdCode() );
-            params.put( ServerParam.LAT, location.getLatitude() );
-            params.put( ServerParam.LNG, location.getLongitude() );
+            params.putAll( location );
         }
         params.put( ServerParam.NET_TYPE, CommonUtils.getNetworkType( AbsMogoApplication.getApp() ) );
         params.put( ServerParam.CELL_ID, Utils.getCellId( AbsMogoApplication.getApp() ) );
diff --git a/gradle.properties b/gradle.properties
index 531f7096db..ff9b00e3aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,24 +27,24 @@ PASSWORD=xintai2018
 RELEASE=false
 # 模块版本
 ## 工程内模块
-MOGO_MODULE_SHARE_VERSION=1.0.0-SNAPSHOT
-MOGO_COMMONS_VERSION=1.0.0-SNAPSHOT
-MOGO_UTILS_VERSION=1.0.0-SNAPSHOT
-MAP_AMAP_VERSION=1.0.0-SNAPSHOT
-MOGO_MAP_VERSION=1.0.0-SNAPSHOT
-MOGO_MAP_API_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_COMMON_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_MAIN_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_MAP_VERSION=1.0.0-SNAPSHOT
-MOGO_SERVICE_VERSION=1.0.0-SNAPSHOT
-MOGO_SERVICE_API_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_APPS_VERSION=1.0.0-SNAPSHOT
-MOGO_CONNECTION_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_NAVI_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_SERVICE_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_EXTENSIONS_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_SEARCH_VERSION=1.0.0-SNAPSHOT
-MOGO_MODULE_BACK_VERSION=1.0.0-SNAPSHOT
+MOGO_MODULE_SHARE_VERSION=1.0.2-SNAPSHOT
+MOGO_COMMONS_VERSION=1.0.2-SNAPSHOT
+MOGO_UTILS_VERSION=1.0.2-SNAPSHOT
+MAP_AMAP_VERSION=1.0.2-SNAPSHOT
+MOGO_MAP_VERSION=1.0.2-SNAPSHOT
+MOGO_MAP_API_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_COMMON_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_MAIN_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_MAP_VERSION=1.0.2-SNAPSHOT
+MOGO_SERVICE_VERSION=1.0.2-SNAPSHOT
+MOGO_SERVICE_API_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_APPS_VERSION=1.0.2-SNAPSHOT
+MOGO_CONNECTION_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_NAVI_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_SERVICE_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_EXTENSIONS_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_SEARCH_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_BACK_VERSION=1.0.2-SNAPSHOT
 
 ## 工程外部模块
 # 探路