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

Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

Browse Source
This commit is contained in:
tongchenfei
2020-12-25 18:35:31 +08:00
parent 36bbe5cf35 72d89cce5c
commit 347d7c5180
14 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java
View File

@@ -42,6 +42,7 @@ interface IMogoHttpDns extends IProvider {
* @param type 类型
* @return
*/
@Keep
String getCachedHttpDnsIps(String host, int type);
//
// /**
@@ -60,6 +61,7 @@ interface IMogoHttpDns extends IProvider {
* @param useCache
* @param callback
*/
@Keep
void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback);
// /**
@@ -76,6 +78,7 @@ interface IMogoHttpDns extends IProvider {
* @param type
* @param callback
*/
@Keep
void addHttpDnsTtlCallback(String host, int type, IHttpDnsTtlCallback callback);
// /**
@@ -90,5 +93,6 @@ interface IMogoHttpDns extends IProvider {
* @param host
* @param type
*/
@Keep
void removeHttpDnsTtlCallback(String host,int type);
}

4
foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java
View File

@@ -14,6 +14,10 @@ public
@Keep
class MogoHttpDnsHandler {
private MogoHttpDnsHandler(){
}
private static IMogoHttpDns sHttpDns;
public static IMogoHttpDns getHttpDnsApi() {

5
foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java
View File

@@ -3,6 +3,8 @@ package com.mogo.httpdns.tencent;
import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.Keep;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.httpdns.HttpDnsConst;
@@ -23,7 +25,7 @@ import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_IM;
import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_WS;
public
/**
/*
* @author congtaowang
* @since 2020/11/18
*
@@ -105,6 +107,7 @@ class TencentHttpDns implements IMogoHttpDns, HttpDns {
HttpDnsIpsCache.removeHttpDnsTtlCallback( host );
}
@Keep
@Override
public void init( Context context ) {
if ( sInited ) {

11
foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java
View File

@@ -1,16 +1,19 @@
package com.mogo.base.services;
public
/**
import androidx.annotation.Keep;
public abstract
/*
* @author congtaowang
* @since 2020/7/23
*
* 描述
*/
interface BaseServicesConstants {
class BaseServicesConstants {
/**
* 建立长链的通道ID
*/
String SOCKET_CHANNEL_ID = "dataCrawler";
@Keep
public static final String SOCKET_CHANNEL_ID = "dataCrawler";
}

2
foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
View File

@@ -16,7 +16,7 @@ import com.zhidao.tcloginsdk.model.TokenData;
import com.zhidao.tcloginsdk.network.LoginCallback;
public
/**
/*
* @author congtaowang
* @since 2020/7/16
*

2
foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
View File

@@ -174,7 +174,7 @@ class SocketManager implements IMogoSocketManager, Callback {
Logger.w( TAG, "msgType %d is exist.", msgType );
}
if ( !mListeners.containsKey( msgType ) ) {
mListeners.put( msgType, new ArrayList< IMogoOnMessageListener >() );
mListeners.put( msgType, new ArrayList<>() );
}
mListeners.get( msgType ).add( listener );
}

2
foudations/mogo-base-websocket-sdk/consumer-rules.pro
View File

@@ -0,0 +1,2 @@
-keep class com.mogo.base.websocket.WebSocketData{*;}
-keep class com.mogo.base.websocket.WebSocketShakeHandsData{*;}

8
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java
View File

@@ -1,22 +1,30 @@
package com.mogo.base.websocket;
import androidx.annotation.Keep;
import com.mogo.commons.debug.DebugConfig;
@Keep
public class WebSocketConstant {
private static final String HOST_DEV = "ws://62.234.196.121";
private static final String HOST_QA = "ws://62.234.196.121";
private static final String HOST_DEMO = "ws://62.234.196.121";
@Keep
private static final String HOST_RELEASE = "ws://62.234.196.121";
// private static final String PORT = ":14001/ws";
@Keep
public static final String PATH = "/ws";
@Keep
public static final String PORT = ":4004"+PATH;
@Keep
public static final String PROTOCOL = "ws://";
private static final String DOMAIN_DEV = "dzt-city.zhidaozhixing.com";
private static final String DOMAIN_QA = "dzt-city.zhidaozhixing.com";
private static final String DOMAIN_DEMO = "dzt-city.zhidaozhixing.com";
@Keep
private static final String DOMAIN_RELEASE = "dzt-city.zhidaozhixing.com";
public static String getSocketServer() {

4
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
View File

@@ -5,8 +5,6 @@ import android.os.SystemClock;
import androidx.annotation.Keep;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.mogo.commons.network.Utils;
import com.mogo.map.location.MogoLocation;
import com.mogo.module.common.MogoApisHandler;
@@ -17,7 +15,6 @@ import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.websocket.ISocketMsgCallBack;
import com.mogo.websocket.ISocketMsgSetting;
import com.mogo.websocket.SocketClient;
import java.util.ArrayList;
import java.util.Iterator;
@@ -28,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap;
import static com.mogo.service.connection.WebSocketMsgType.MSG_TYPE_ACK;
import static com.mogo.service.connection.WebSocketMsgType.MSG_TYPE_DOWNLINK_CAR_DATA;
@Keep
public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSetting,
ISocketMsgCallBack {

2
foudations/mogo-commons/consumer-rules.pro
View File

@@ -1,5 +1,5 @@
#-----Foundation-Commons-----
-keep class com.mogo.commons.data.BaseData.*{*;}
-keep class com.mogo.commons.data.BaseData{*;}
-keep class com.mogo.commons.voice.VoiceIntentTrack
-keep class com.mogo.commons.voice.VoiceTrack
-keep class com.mogo.commons.voice.VoicePreemptType

3
foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java
View File

@@ -2,6 +2,8 @@ package com.mogo.commons.analytics;
import android.content.Context;
import androidx.annotation.Keep;
import com.elegant.analytics.Analytics;
import com.elegant.analytics.AnalyticsConfig;
import com.elegant.analytics.IAnalyticsParamsProvider;
@@ -20,6 +22,7 @@ import java.util.Map;
*/
public class AnalyticsUtils {
@Keep
public static void init( Context context ) {
// 1 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。
// 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。

2
libraries/map-custom/build.gradle
View File

@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.6'
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.7'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.5-log-1'
}

5
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -93,10 +93,15 @@ public class AMapViewWrapper implements IMogoMapView,
if ( DebugConfig.isDebug() ) {
GpsTester.getInstance().init( mMapView );
}
initViews();
initListeners();
this.mIMap = new AMapWrapper( this.mMapView.getMapAutoViewHelper(), this.mMapView, this );
}
private void initViews() {
}
private void initMapView() {
if ( mMapView == null ) {
return;

2
modules/mogo-module-authorize/consumer-rules.pro
View File

@@ -1,2 +1,2 @@
#-----AuthorizeModule-----
-keep class com.mogo.module.authorize.module.bean.**{*;}
-keep class com.mogo.module.authorize.module.bean.*{*;}