yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update modules to 1.0.2

Browse Source
This commit is contained in:
wangcongtao
2020-03-02 14:07:27 +08:00
parent fefccc8ee4
commit 590bb96ed2
4 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
foudations/mogo-commons/build.gradle
View File

@@ -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'

13
foudations/mogo-commons/src/main/java/com/mogo/commons/network/LocationHelper.java
View File

@@ -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;
}
}

8
foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
View File

@@ -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() ) );

36
gradle.properties
View File

@@ -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
## 工程外部模块
# 探路