fix bug

Author: git-xuhao

.idea/caches/build_file_checksums.ser

@@ -13,9 +13,11 @@
 
 ![这里写图片描述](http://oyp2zrwnm.bkt.clouddn.com/ic_launcher.png)
 
-GitHub地址：[https://github.com/git-xuhao/KotlinMvp](https://github.com/git-xuhao/KotlinMvp)
+- **GitHub地址：** [https://github.com/git-xuhao/KotlinMvp](https://github.com/git-xuhao/KotlinMvp)
 
-（开源不易，如果喜欢的话希望给个 Star 或者 Fork，谢谢！）
+- **(附上 Java 版本的MVP基础框架)** [https://github.com/git-xuhao/Android-MVP-Architecture](https://github.com/git-xuhao/Android-MVP-Architecture)
+
+**（开源不易，如果喜欢的话希望给个小星星，谢谢~）**
 
 《KotlinMvp》 是仿着“开眼Eyepetizer”之前版本并加上自己的想法，开发的一款的短视频小应用，每日为你推荐精选视频，让你大开眼界。本项目采用 Kotlin 语言编写，结合 MVP+RxJava2+Retrofit2+Glide等的架构设计，学习 Kotlin 利用空余时间开发的一款小项目，代码结构清晰有详细注释，如有任何疑问和建议请提 Issue或联系[![](https://img.shields.io/badge/Gmail:[email protected])]()
 

README.md

@@ -14,7 +14,7 @@ import java.net.URL
  */
 
 fun Fragment.showToast(content: String): Toast {
-    val toast = Toast.makeText(this.activity.applicationContext, content, Toast.LENGTH_SHORT)
+    val toast = Toast.makeText(this.activity?.applicationContext, content, Toast.LENGTH_SHORT)
     toast.show()
     return toast
 }

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

@@ -3,7 +3,7 @@ package com.hazz.kotlinmvp.api
 /**
  * Created by xuhao on 2017/11/16.
  */
-object UriConstant{
-    val BASE_URL = "http://baobab.kaiyanapp.com/api/"
+object UrlConstant{
+    const val BASE_URL = "http://baobab.kaiyanapp.com/api/"
 
 }

app/src/main/java/com/hazz/kotlinmvp/api/UriConstant.kt

@@ -11,7 +11,7 @@ http://baobab.kaiyanapp.com/api/v4/video/related?id=xxx
 http://baobab.kaiyanapp.com/api/v4/categories
 
 //获取分类详情List
-http://baobab.kaiyanapp.com/api/v4/categories/videoList?id=xxx
+http://baobab.kaiyanapp.com/api/v4/categories/videoList?id=xxx&udid=xxx
 
 //获取排行榜的 Info
 http://baobab.kaiyanapp.com/api/v4/rankList

app/src/main/java/com/hazz/kotlinmvp/api/api

@@ -8,7 +8,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.classic.common.MultipleStatusView
 import com.hazz.kotlinmvp.MyApplication
-import com.hazz.kotlinmvp.showToast
 
 /**
  * @author Xuhao
@@ -31,8 +30,8 @@ import com.hazz.kotlinmvp.showToast
      */
     protected var mLayoutStatusView: MultipleStatusView? = null
 
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(getLayoutId(),null)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(getLayoutId(),null)
     }
 
 
@@ -44,7 +43,7 @@ import com.hazz.kotlinmvp.showToast
         }
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         isViewPrepare = true
         initView()
@@ -83,6 +82,6 @@ import com.hazz.kotlinmvp.showToast
 
     override fun onDestroy() {
         super.onDestroy()
-        MyApplication.getRefWatcher(activity)?.watch(activity)
+        activity?.let { MyApplication.getRefWatcher(it)?.watch(activity) }
     }
 }

app/src/main/java/com/hazz/kotlinmvp/base/BaseFragment.kt

@@ -33,10 +33,10 @@ class BaseFragmentAdapter : FragmentPagerAdapter {
         this.mTitles = mTitles
         if (this.fragmentList != null) {
             val ft = fm.beginTransaction()
-            for (f in this.fragmentList!!) {
-                ft!!.remove(f)
+            fragmentList?.forEach {
+                ft.remove(it)
             }
-            ft!!.commitAllowingStateLoss()
+            ft?.commitAllowingStateLoss()
             fm.executePendingTransactions()
         }
         this.fragmentList = fragments

app/src/main/java/com/hazz/kotlinmvp/base/BaseFragmentAdapter.kt

@@ -24,10 +24,10 @@ class CustomAppGlideModule : AppGlideModule() {
      * @param context
      * @param builder
      */
-    override fun applyOptions(context: Context?, builder: GlideBuilder?) {
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
 
         //重新设置内存限制
-        builder!!.setMemoryCache(LruResourceCache(10 * 1024 * 1024))
+        builder.setMemoryCache(LruResourceCache(10 * 1024 * 1024))
 
     }
 
@@ -51,7 +51,7 @@ class CustomAppGlideModule : AppGlideModule() {
      * @param glide
      * @param registry
      */
-    override fun registerComponents(context: Context?, glide: Glide?, registry: Registry?) {
-        registry!!.append(String::class.java, InputStream::class.java, CustomBaseGlideUrlLoader.Factory())
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+        registry.append(String::class.java, InputStream::class.java, CustomBaseGlideUrlLoader.Factory())
     }
 }

app/src/main/java/com/hazz/kotlinmvp/glide/CustomAppGlideModule.kt

@@ -2,7 +2,6 @@
 
 package com.hazz.kotlinmvp.glide
 
-import android.content.Context
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.BitmapShader
@@ -13,7 +12,6 @@ import android.graphics.Shader
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import com.hazz.kotlinmvp.MyApplication
 
 import java.security.MessageDigest
 
@@ -27,7 +25,7 @@ import java.security.MessageDigest
  *
  */
 
-class GlideRoundTransform @JvmOverloads constructor(context: Context = MyApplication.context, dp: Int = 4) : BitmapTransformation(context) {
+class GlideRoundTransform @JvmOverloads constructor(dp: Int = 4) : BitmapTransformation() {
 
     private var radius = 0f
 

app/src/main/java/com/hazz/kotlinmvp/glide/GlideRoundTransform.kt

@@ -4,6 +4,7 @@ import com.hazz.kotlinmvp.mvp.model.bean.HomeBean
 import com.hazz.kotlinmvp.net.RetrofitManager
 import com.hazz.kotlinmvp.rx.scheduler.SchedulerUtils
 import io.reactivex.Observable
+import java.util.*
 
 /**
  * Created by xuhao on 2017/11/30.
@@ -14,7 +15,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())
     }