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

解决BuildConfig依赖冲突的问题

Browse Source 
Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
This commit is contained in:
chenfufeng
2021-09-24 19:59:30 +08:00
parent 578945f2ee
commit bbb5bc8aa2
8 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mogo-core-function-call/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.eagle.core.function.call.api">
package="com.mogo.eagle.core.function.call">
</manifest>

2
core/mogo-core-res/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.eagle.core.function.call.api">
package="com.mogo.eagle.core.widget">
</manifest>

2
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/CustomCircleImageView.java
View File

@@ -23,8 +23,6 @@ import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import com.mogo.eagle.core.function.call.api.R;
@SuppressLint("AppCompatCustomView")
public class CustomCircleImageView extends ImageView {

2
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/LiveRoundLayout.java
View File

@@ -8,8 +8,6 @@ import android.graphics.RectF;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
import com.mogo.eagle.core.function.call.api.R;
public class LiveRoundLayout extends RelativeLayout {
private float roundLayoutRadius = 14f;

2
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/RoundConstraintLayout.java
View File

@@ -9,8 +9,6 @@ import android.util.AttributeSet;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.eagle.core.function.call.api.R;
/**
* author : donghongyu

2
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/RoundLayout.java
View File

@@ -10,8 +10,6 @@ import android.graphics.RectF;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
import com.mogo.eagle.core.function.call.api.R;
/**
* author : donghongyu

1
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java
View File

@@ -34,7 +34,6 @@ import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.MediaController.MediaPlayerControl;
import com.mogo.eagle.core.function.call.api.R;
import com.mogo.eagle.core.utilcode.util.LogUtils;
import java.io.IOException;

4
foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideRoundedCornersTransform.java
View File

@@ -1,6 +1,5 @@
package com.mogo.utils.glide;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapShader;
import android.graphics.Canvas;
@@ -12,8 +11,7 @@ import androidx.annotation.NonNull;
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.mogo.utils.BuildConfig;
import com.mogo.utils.R;
import com.zhidao.utils.BuildConfig;
import java.security.MessageDigest;