update kotlin version and android libs

Author: git-xuhao

.idea/caches/build_file_checksums.ser

@@ -15,13 +15,13 @@ android {
             storePassword 'ktmp123456'
         }
     }
-    compileSdkVersion 26
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
     defaultConfig {
         applicationId "com.hazz.kotlinmvp"
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode 5
-        versionName "1.2.2"
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -70,17 +70,19 @@ android {
     }
 
 
-
     dexOptions {
         jumboMode true
     }
 }
 
+kapt {
+    generateStubs = true
+}
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
@@ -94,13 +96,12 @@ dependencies {
     // APT dependencies(Kotlin内置的注解处理器)
     kapt rootProject.ext.annotationProcessorLibs
 
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     // 底部菜单
     implementation('com.flyco.tablayout:FlycoTabLayout_Lib:2.1.0@aar') {
         exclude group: 'com.android.support', module: 'support-v4'
     }
     //kotlin 支持库
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //GlideOkHttp
     implementation(rootProject.ext.glideOkhttp) {
         exclude group: 'glide-parent'
@@ -109,7 +110,7 @@ dependencies {
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
     implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
     //Banner
-    implementation 'cn.bingoogolapple:bga-banner:2.1.8@aar'
+    implementation 'cn.bingoogolapple:bga-banner:2.2.4@aar'
     // 视屏播放器
     implementation 'com.shuyu:GSYVideoPlayer:2.1.1'
     //Logger

.idea/codeStyles/Project.xml

@@ -41,7 +41,7 @@ class MyApplication : Application(){
     override fun onCreate() {
         super.onCreate()
         context = applicationContext
-        refWatcher = setupLeakCanary()
+//        refWatcher = setupLeakCanary()
         initConfig()
         DisplayManager.init(this)
         registerActivityLifecycleCallbacks(mActivityLifecycleCallbacks)

.idea/inspectionProfiles/Project_Default.xml

@@ -14,7 +14,7 @@ class CategoryDetailModel {
     /**
      * 获取分类下的 List 数据
      */
-    fun getCategoryDetailList(id: Long): Observable<HomeBean.Issue> {
+    fun  getCategoryDetailList(id: Long): Observable<HomeBean.Issue> {
         return RetrofitManager.service.getCategoryDetailList(id)
                 .compose(SchedulerUtils.ioToMain())
     }

.idea/misc.xml

@@ -44,16 +44,16 @@ class WatchHistoryActivity : BaseActivity() {
         mRecyclerView.layoutManager = LinearLayoutManager(this)
         mRecyclerView.adapter = mAdapter
 
-        if(itemListData.size>1){
+        if (itemListData.size > 0) {
             multipleStatusView.showContent()
-        }else{
+        } else {
             multipleStatusView.showEmpty()
         }
 
         //状态栏透明和间距处理
         StatusBarUtil.darkMode(this)
         StatusBarUtil.setPaddingSmart(this, toolbar)
-        StatusBarUtil.setPaddingSmart(this,mRecyclerView)
+        StatusBarUtil.setPaddingSmart(this, mRecyclerView)
 
     }
 
@@ -64,9 +64,9 @@ class WatchHistoryActivity : BaseActivity() {
     /**
      * 查询观看的历史记录
      */
-    private fun queryWatchHistory():ArrayList<HomeBean.Issue.Item> {
+    private fun queryWatchHistory(): ArrayList<HomeBean.Issue.Item> {
         val watchList = ArrayList<HomeBean.Issue.Item>()
-        val hisAll = WatchHistoryUtils.getAll(Constants.FILE_WATCH_HISTORY_NAME,MyApplication.context) as Map<*, *>
+        val hisAll = WatchHistoryUtils.getAll(Constants.FILE_WATCH_HISTORY_NAME, MyApplication.context) as Map<*, *>
         //将key排序升序
         val keys = hisAll.keys.toTypedArray()
         Arrays.sort(keys)
@@ -75,7 +75,7 @@ class WatchHistoryActivity : BaseActivity() {
         val hisLength = if (keyLength > HISTORY_MAX) HISTORY_MAX else keyLength
         // 反序列化和遍历 添加观看的历史记录
         (1..hisLength).mapTo(watchList) {
-            WatchHistoryUtils.getObject(Constants.FILE_WATCH_HISTORY_NAME,MyApplication.context,
+            WatchHistoryUtils.getObject(Constants.FILE_WATCH_HISTORY_NAME, MyApplication.context,
                     keys[keyLength - it] as String) as HomeBean.Issue.Item
         }
 

app/build.gradle

@@ -277,7 +277,7 @@ class WatchHistoryUtils {
                 return editor.commit()
             }
             val baos = ByteArrayOutputStream()
-            var oos: ObjectOutputStream? = null
+            var oos: ObjectOutputStream?
             try {
                 oos = ObjectOutputStream(baos)
                 oos.writeObject(`object`)

app/src/main/java/com/hazz/kotlinmvp/MyApplication.kt

@@ -10,10 +10,11 @@
         android:layout_width="match_parent"
         android:layout_height="230dp"
         android:scaleType="fitXY"
-        app:banner_indicatorGravity="bottom|right"
+        app:banner_indicatorGravity="bottom|center_horizontal"
         app:banner_placeholderDrawable="@drawable/placeholder_banner"
-        app:banner_tipTextSize="@dimen/textSize_titleSmall"
+        app:banner_pointAutoPlayInterval="3000"
         app:banner_tipTextColor="@color/color_title_bg"
-        app:banner_transitionEffect="alpha"/>
+        app:banner_tipTextSize="@dimen/textSize_titleSmall"
+        app:banner_transitionEffect="alpha" />
 
 </LinearLayout>