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

15
modules/mogo-module-extensions/consumer-rules.pro
View File

@@ -1,8 +1,9 @@
#-----ExtensionModule-----
-keep class com.mogo.module.extensions.userinfo.**{*;}
-keep class com.mogo.module.extensions.weather.Phenomena
-keep class com.mogo.module.extensions.weather.WeatherCallback
-keep interface com.mogo.module.extensions.net.UserInfoNetApiServices
-keep class com.mogo.module.extensions.utils.TopViewAnimHelper
-keep class com.mogo.module.extensions.ExtensionsView
-keep class com.mogo.module.extensions.ExtensionsModuleConst
-keep class com.mogo.module.extensions.live.CameraLiveGSYVideoView{*;}
-keep class com.mogo.module.extensions.live.PushCameraLiveWindow{*;}
-keep class com.mogo.module.extensions.navi.*{*;}
-keep class com.mogo.module.extensions.userinfo.*{*;}
-keep class com.mogo.module.extensions.weather.Phenomena{*;}
-keep class com.mogo.module.extensions.weather.StrokeTextView{*;}
-keep class com.mogo.module.extensions.view.*{*;}
-keep class com.mogo.module.extensions.bean.*{*;}

1
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
View File

@@ -1,6 +1,5 @@
package com.mogo.module.extensions.utils;
import android.graphics.Color;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;