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

Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

Browse Source 
# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
This commit is contained in:
wangcongtao
2021-01-05 19:27:13 +08:00
parent 40afbccfcc 8be440d6b2
commit e6600df3a3
570 changed files with 644 additions and 10499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/mogo-module-service/consumer-rules.pro
View File

@@ -1,13 +1,17 @@
#-----ServiceModule-----
-keep class com.mogo.module.service.carinfo.CarStateInfo.*{*;}
-keep class com.mogo.module.service.network.RefreshBody.*{*;}
-keep class com.mogo.module.service.network.bean.DemoUserInfoEntity.*{*;}
-keep interface com.mogo.module.service.intent.IntentHandler
-keep interface com.mogo.module.service.marker.IMarkerView
-keep interface com.mogo.module.service.network.RefreshApiService
-keep interface com.mogo.module.service.network.RefreshCallback
-keep interface com.mogo.module.service.network.bean.DemoUserInfoEntity
-keep class com.mogo.module.service.carinfo.CarStateInfo{*;}
-keep class com.mogo.module.service.launchercard.LauncherCardRefreshType{*;}
-keep class com.mogo.module.service.network.bean.*{*;}
-keep class com.mogo.module.service.network.RefreshBody{*;}
-keep class com.mogo.module.service.onlinecar.panel.NavigationTargetInfo{*;}
-keep class com.mogo.module.service.onlinecar.panel.OnlineCarStrategy{*;}
-keep class com.mogo.module.service.websocket.*{*;}
-keep interface com.mogo.module.service.intent.IntentHandler{*;}
-keep interface com.mogo.module.service.network.RefreshApiService{*;}
-keep interface com.mogo.module.service.network.RefreshCallback{*;}
-keep interface com.mogo.module.service.network.bean.DemoUserInfoEntity{*;}
-keep interface com.mogo.module.service.ttsConfig.TtsConfigApiService{*;}
-keep class com.mogo.module.service.strategy.CarIconDisplayStrategy{
public static final <fields>;
}
-keep class com.mogo.module.service.ServiceConst
-keep class com.mogo.module.service.ServiceConst{*;}

0
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
View File