Commit 87119bc343eb4964279858af3fea7abe40b0df52

Authored by YangShuai
1 parent 9ca5a167

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

# Conflicts:
#	app/strike/src/main/AndroidManifest.xml
#	app/strike/src/main/java/com/cnlive/strike/MainActivity.java
#	app/strike/src/main/res/layout/activity_main.xml
core/imageload/src/main/java/com/cnlive/core/imageload/loader/GlideLoader.java
... ... @@ -33,8 +33,6 @@ import com.cnlive.core.imageload.config.ShapeMode;
33 33 import com.cnlive.core.imageload.config.SingleConfig;
34 34 import com.cnlive.core.imageload.util.DownLoadImageService;
35 35 import com.cnlive.core.imageload.util.ImageUtil;
36   -import com.cnlive.libs.base.application.GlideApp;
37   -
38 36 import androidx.annotation.Nullable;
39 37 import jp.wasabeef.glide.transformations.BlurTransformation;
40 38 import jp.wasabeef.glide.transformations.ColorFilterTransformation;
... ...