diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java index 679c163ace..725d63cc72 100644 --- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java @@ -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); } diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java index c2c979db8d..dd25cecb0b 100644 --- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java @@ -14,6 +14,10 @@ public @Keep class MogoHttpDnsHandler { + private MogoHttpDnsHandler(){ + + } + private static IMogoHttpDns sHttpDns; public static IMogoHttpDns getHttpDnsApi() { diff --git a/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java b/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java index 1629e24a04..ea659d4f4b 100644 --- a/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java +++ b/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java @@ -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 ) { diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java index 5d4c38a17a..927c8ef250 100644 --- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java +++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java @@ -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"; } diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java index 5a9c740370..183e633722 100644 --- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java +++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java @@ -16,7 +16,7 @@ import com.zhidao.tcloginsdk.model.TokenData; import com.zhidao.tcloginsdk.network.LoginCallback; public -/** +/* * @author congtaowang * @since 2020/7/16 * diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java index 4a1454a060..fc97fc9fb4 100644 --- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java +++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java @@ -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 ); } diff --git a/foudations/mogo-base-websocket-sdk/consumer-rules.pro b/foudations/mogo-base-websocket-sdk/consumer-rules.pro index e69de29bb2..54ff53d0c7 100644 --- a/foudations/mogo-base-websocket-sdk/consumer-rules.pro +++ b/foudations/mogo-base-websocket-sdk/consumer-rules.pro @@ -0,0 +1,2 @@ +-keep class com.mogo.base.websocket.WebSocketData{*;} +-keep class com.mogo.base.websocket.WebSocketShakeHandsData{*;} \ No newline at end of file diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java index 46e9f5dcb9..f0e5ec13b7 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java @@ -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() { diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index 3ce7ad20a8..5e110bb8ea 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -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 { diff --git a/foudations/mogo-commons/consumer-rules.pro b/foudations/mogo-commons/consumer-rules.pro index e4e113ccaf..4a2c88a6b9 100644 --- a/foudations/mogo-commons/consumer-rules.pro +++ b/foudations/mogo-commons/consumer-rules.pro @@ -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 diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java index e457421552..b1f3cdafc5 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java @@ -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秒上报一次。 diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 377804e0b4..bc98d7bbf5 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -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' } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 1a4e6f9297..aec9e0f31a 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -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; diff --git a/modules/mogo-module-authorize/consumer-rules.pro b/modules/mogo-module-authorize/consumer-rules.pro index 5668c1b3ca..551d2e9258 100644 --- a/modules/mogo-module-authorize/consumer-rules.pro +++ b/modules/mogo-module-authorize/consumer-rules.pro @@ -1,2 +1,2 @@ #-----AuthorizeModule----- --keep class com.mogo.module.authorize.module.bean.**{*;} \ No newline at end of file +-keep class com.mogo.module.authorize.module.bean.*{*;} \ No newline at end of file