清理第三方依赖库2

app/build.gradle

@@ -130,11 +130,31 @@ repositories {
     }
     google()
 }
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        def requested = details.requested
+        if (requested.group == 'com.android.support') {
+            if (!requested.name.startsWith("multidex")) {
+                details.useVersion "$supportLibVersion"
+            }
+        }
+    }
+}
 
 dependencies {
     //noinspection GradleCompatible
     implementation "com.android.support:cardview-v7:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
+    implementation ("com.android.support:design:$supportLibVersion") {
+        exclude group: 'com.android.support', module: 'support-annotations'
+        exclude group: 'com.android.support', module: 'support-compat'
+        exclude group: 'com.android.support', module: 'support-core-ui'
+        exclude group: 'com.android.support', module: 'support-core-utils'
+        exclude group: 'com.android.support', module: 'support-fragment'
+        exclude group: 'com.android.support', module: 'transition'
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'cardview-v7'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
 //    implementation 'com.google.code.gson:gson:2.8.2'
@@ -197,26 +217,41 @@ dependencies {
     //    implementation 'com.google.dagger:dagger:+'
 
     //    implementation 'com.google.dagger:dagger-compiler:+'
-    compileOnly 'org.glassfish:javax.annotation:10.0-b28'//javax.annotation » jsr250-api
-    implementation 'com.google.dagger:dagger:2.12'//javax.inject » javax.inject
+    compileOnly 'org.glassfish:javax.annotation:10.0-b28'//javax.annotation', module: 'jsr250-api
+    implementation 'com.google.dagger:dagger:2.12'//javax.inject', module: 'javax.inject
     annotationProcessor 'com.google.dagger:dagger-compiler:2.12'
 
     //retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation ('com.squareup.retrofit2:retrofit:2.4.0') {
+        exclude group: 'com.google.android', module: 'android'
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+        exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
+    }
 
 //    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation 'org.ligboy.retrofit2:converter-fastjson-android:2.1.0'
+    implementation ('org.ligboy.retrofit2:converter-fastjson-android:2.1.0') {
+        exclude group: 'com.alibaba', module: 'fastjson'
+        exclude group: 'com.squareup.retrofit2', module: 'retrofit'
+    }
 //    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 
     //    implementation 'com.squareup.retrofit2:adapter-rxjava2:+'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    implementation ('com.squareup.retrofit2:adapter-rxjava:2.1.0') {
+        exclude group: 'com.squareup.retrofit2', module: 'retrofit'
+    }
 
     //rxjava
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation ('io.reactivex.rxjava2:rxandroid:2.1.0') {
+        exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
+    }
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
 
     //获取动态权限三方库
-    implementation 'pub.devrel:easypermissions:1.2.0'
+    implementation ('pub.devrel:easypermissions:1.2.0') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'support-compat'
+        exclude group: 'com.android.support', module: 'support-fragment'
+    }
 //    implementation 'net.danlew:android.joda:2.9.3'
 //    implementation 'com.orhanobut:logger:1.15'
 
@@ -226,7 +261,7 @@ dependencies {
     //implementation 'com.umeng.sdk:analytics:latest.integration'
 
     //fast json
-    implementation 'com.alibaba:fastjson:1.2.48'
+    implementation 'com.alibaba:fastjson:1.2.52'
 
     //添加半袋米相关
     implementation(name: 'appstoreutils-201810101432', ext: 'aar')
@@ -245,7 +280,9 @@ dependencies {
     implementation files('libs/umeng_shareboard_widget.jar')
     implementation files('libs/SocialSDK_WeiXin_Full.jar')
     implementation files('libs/SocialSDK_QQ_Full.jar')
-    implementation 'com.zhy:okhttputils:2.6.2'
+    implementation ('com.zhy:okhttputils:2.6.2') {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
 
     //    implementation 'com.kf.framework:kf-utils:latest.integration@aar'
 //    implementation 'com.kf.framework:kf-utils:1.4.5@aar'
@@ -253,22 +290,35 @@ dependencies {
     //    implementation 'com.kf.framework:volleyplus:latest.integration@aar'
 //    implementation 'com.kf.framework:volleyplus:1.4.5@aar'
     implementation "com.android.support:support-annotations:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation ("com.android.support:recyclerview-v7:$supportLibVersion") {
+        exclude group: 'com.android.support', module: 'support-annotations'
+        exclude group: 'com.android.support', module: 'support-compat'
+        exclude group: 'com.android.support', module: 'support-core-ui'
+    }
 //    implementation project(':datashare')
 //    implementation files('libs/jackson-core-2.2.1.jar')
 //    implementation files('libs/jackson-dataformat-xml-2.1.2.jar')
-    implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'com.github.ithedan:TextViewDrawable:v1.0'
+//    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation ('com.github.ithedan:TextViewDrawable:v1.0') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
 //    implementation 'com.github.zhangkexpz:LayoutScroll:v1.0'
 //    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
     implementation(name: 'PhotoPicker-release-201810081154', ext: 'aar')
-    implementation 'com.github.bumptech.glide:glide:4.1.1'
+    implementation ('com.github.bumptech.glide:glide:4.1.1') {
+        exclude group: 'com.android.support', module: 'support-fragment'
+//        exclude group: 'com.github.bumptech.glide', module: 'gifdecoder'
+//        exclude group: 'com.github.bumptech.glide', module: 'disklrucache'
+//        exclude group: 'com.github.bumptech.glide', module: 'annotations'
+    }
 
     //    implementation 'com.github.yalantis:ucrop:2.2.1-native'
 
     //    implementation 'com.google.zxing:core:3.3.0'
     implementation project(':ucrop')
-    implementation 'com.sunfusheng:marqueeview:1.3.3'
+    implementation ('com.sunfusheng:marqueeview:1.3.3') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
     implementation files('libs/alipaySdk-20170922.jar')
     //极光
     implementation files('libs/jcore-android-1.2.0.jar')
@@ -286,11 +336,14 @@ dependencies {
 //    implementation 'com.github.nanchen2251:CompressHelper:1.0.5'
 //    implementation(name: 'compresshelper-release', ext: 'aar')
     implementation files('libs/compresshelper-release.jar')
-    implementation 'com.haibin:calendarview:3.4.4'
+    implementation ('com.haibin:calendarview:3.4.4') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }
 
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-14'
 
-    implementation 'org.greenrobot:greendao:3.2.2'
+    implementation 'org.greenrobot:greendao:3.2.2'//org.greenrobot', module: 'greendao-api
     //okDownload
     // core
     implementation "com.liulishuo.okdownload:okdownload:1.0.5"
@@ -299,11 +352,15 @@ dependencies {
     // provide okhttp to connect to backend
     implementation "com.liulishuo.okdownload:okhttp:1.0.5"
 
-    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.2'
+    implementation ('com.trello.rxlifecycle2:rxlifecycle-components:2.2.2') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        com.trello.rxlifecycle2', module: 'rxlifecycle-android
+        exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
+    }
 //
 //    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
 
-    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
+    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.34'
     //有米科技
     implementation(name: 'YoumiSdk_v8.3.0_2018-09-20', ext: 'aar')
     implementation project(':WaterWaveProgress')

app/src/main/res/drawable/shape_main_search_bar_radius.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="15dp" />
-    <solid android:color="#33ffffff" />
+    <solid android:color="#d8ffffff" />
 </shape>

app/src/main/res/layout/fgt_game_center.xml

@@ -7,7 +7,10 @@
     tools:context="com.sheep.gamegroup.view.activity.ActGameCenter">
 
     <include layout="@layout/title" />
-
+    <View
+        android:id="@+id/fgt_game_center_top"
+        android:layout_width="match_parent"
+        android:layout_height="20dp" />
     <android.support.v4.view.ViewPager
         android:id="@+id/act_game_center_vp"
         android:layout_width="match_parent"

ucrop/build.gradle

@@ -37,5 +37,5 @@ android {
 
 dependencies {
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation 'com.squareup.okhttp3:okhttp:3.8.1'
+    compileOnly 'com.squareup.okhttp3:okhttp:3.11.0'
 }