解决冲突

.gitignore

@@ -8,3 +8,4 @@
 .externalNativeBuild
 .cxx
 /library_ad/build/
+/shareSdkLib/build/

app/build.gradle

@@ -20,6 +20,10 @@ android {
         //多个dex
         multiDexEnabled true
 
+        //配置so文件
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+        }
     }
 
     buildFeatures{
@@ -73,12 +77,6 @@ dependencies {
 
     testImplementation rootProject.ext.support["junit"]
 
-//    implementation 'androidx.appcompat:appcompat:1.1.0'
-//    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-//    testImplementation 'junit:junit:4.12'
-//    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
     //下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-26'
     implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-alpha-26'
@@ -95,26 +93,25 @@ dependencies {
 
 
     // 三方接入
-    // bugly
-    implementation 'com.tencent.bugly:crashreport:3.3.92'
     // 移动安全联盟
-    compileOnly files('libs\\oaid_sdk_1.0.23.aar')
+    implementation(name: 'oaid_sdk_1.0.23', ext: 'aar')
     // shareSdk
-    api project(':shareSdkLib')
+    implementation project(':shareSdkLib')
     // 应用管理中心分包
-    compileOnly files('libs\\humesdk-1.0.0.aar')
+    implementation(name: 'humesdk-1.0.0', ext: 'aar')
     // umeng
-    compileOnly files('libs\\umeng-asms-armeabi-v1.2.2.aar')
-    compileOnly files('libs\\umeng-apm-armeabi-v1.2.0.aar')
+    implementation(name: 'umeng-asms-armeabi-v1.2.2', ext: 'aar')
+    implementation(name: 'umeng-apm-armeabi-v1.2.0', ext: 'aar')
     // 穿山甲 GroMore
     // mediation_ad_sdk
-    compileOnly files('libs\\mediation_ad_sdk_2.8.1.0.aar')
-    compileOnly files('libs\\gdt_adapter_4.362.1232.0.aar')
-    compileOnly files('libs\\ks_adapter_3.3.10.2.0.aar')
+    implementation(name: 'mediation_ad_sdk_2.8.1.0', ext: 'aar')
+    implementation(name: 'gdt_adapter_4.362.1232.0', ext: 'aar')
+    implementation(name: 'ks_adapter_3.3.10.2.0', ext: 'aar')
     // 快手
-    compileOnly files('libs\\kssdk-ad-3.3.10.2.aar')
+    implementation(name: 'kssdk-ad-3.3.10.2', ext: 'aar')
     // 穿山甲广告
-    compileOnly files('libs\\open_ad_sdk_3.7.0.1.aar')
+    implementation(name: 'open_ad_sdk_3.7.0.1', ext: 'aar')
     // 广点通广告 腾讯
-    compileOnly files('libs\\GDTSDK.unionNormal.4.362.1232.aar')
+    implementation(name: 'GDTSDK.unionNormal.4.362.1232', ext: 'aar')
+
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -58,11 +58,11 @@
         </provider> <!-- 穿山甲广告 -->
         <provider
             android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
-            android:authorities="${applicationId}.TTMultiProvider"
+            android:authorities="com.mints.street.TTMultiProvider"
             android:exported="false" />
         <provider
             android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
-            android:authorities="${applicationId}.TTFileProvider"
+            android:authorities="com.mints.street.TTFileProvider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:replace="android:authorities">
@@ -70,7 +70,8 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths"
                 tools:replace="android:resource" />
-        </provider> <!-- 广点通广告 -->
+        </provider>
+        <!-- 广点通广告 -->
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />

library_base/version.properties

-#Thu Jul 08 19:52:09 CST 2021
-VERSION_BUILD=2613
+#Thu Jul 08 19:44:12 CST 2021
+VERSION_BUILD=2631

mvvmhabit/src/main/java/me/goldze/mvvmhabit/binding/viewadapter/view/ViewAdapter.java

@@ -109,7 +109,7 @@ public class ViewAdapter {
         });
     }
 
-    @BindingAdapter(value = {"viewZ",/*"outline",*/"shadowColor"},requireAll = false)
+    @BindingAdapter(value = {"viewZ",/*"outline",*/"shadowColor2"},requireAll = false)
     public static void setViewZ(View view,int z,int color){
         ViewCompat.setElevation(view,AppUtils.dp2Px(view.getContext(),z));
 

mvvmhabit/src/main/res/values/attrs.xml

@@ -37,7 +37,7 @@
         <attr name="isThrottleFirst" />
         <attr name="currentView" />
         <attr name="viewZ" format="integer" />
-        <attr name="shadowColor" format="integer" />
+        <attr name="shadowColor2" format="integer" />
         <attr name="selected" format="boolean" />
 
     </declare-styleable>