remove baseModel

app/src/main/java/im/fdx/v2ex/MyApp.kt

@@ -8,6 +8,7 @@ import androidx.core.content.edit
 import com.elvishew.xlog.LogLevel
 import com.elvishew.xlog.XLog
 import im.fdx.v2ex.utils.Keys
+import im.fdx.v2ex.utils.extensions.logd
 
 val pref: SharedPreferences by lazy {
     MyApp.get().mPrefs
@@ -56,6 +57,6 @@ class MyApp : Application() {
             else -> LogLevel.NONE
         })
         isLogin = mPrefs.getBoolean(Keys.PREF_KEY_IS_LOGIN, false)
-        XLog.tag("MyApp").d("onCreate\nisLogin:$isLogin")
+        logd("onCreate\nisLogin:$isLogin")
     }
 }

app/src/main/java/im/fdx/v2ex/model/NotificationModel.kt

@@ -16,5 +16,5 @@ class NotificationModel(var time: String? = "",
                         var topic: Topic? = Topic(),
                         var member: Member? = Member(),
                         var content: String? = "",
-                        var id: String? = "") : BaseModel(), Parcelable {
+                        var id: String? = "") : Parcelable {
 }

app/src/main/java/im/fdx/v2ex/ui/BaseActivity.kt

@@ -15,7 +15,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        var textSizeMode = defaultSharedPreferences.getString("pref_text_size", "0").toInt()
+        val textSizeMode = defaultSharedPreferences.getString("pref_text_size", "0").toInt()
         MyApp.get().curTextSize = textSizeMode
         when (textSizeMode) {
             MODE_SMALL -> {

app/src/main/java/im/fdx/v2ex/ui/details/DetailsAdapter.kt

@@ -44,7 +44,6 @@ import java.io.IOException
 /**
  * Created by fdx on 15-9-7.
  * 详情页的Adapter。
- * todo 把 allList 分离
  */
 class DetailsAdapter(private val mContext: Context,
                      private val callback: DetailsAdapter.AdapterCallback

app/src/main/java/im/fdx/v2ex/ui/details/Reply.kt

@@ -1,7 +1,6 @@
 package im.fdx.v2ex.ui.details
 
 import android.os.Parcelable
-import im.fdx.v2ex.model.BaseModel
 import im.fdx.v2ex.ui.member.Member
 import kotlinx.android.parcel.Parcelize
 
@@ -37,7 +36,7 @@ data class Reply(var id: String = "",
                  var isThanked: Boolean = false,
                  var member: Member? = null,
                  var isLouzu: Boolean = false
-) : BaseModel(), Parcelable {
+) : Parcelable {
 
     override fun toString() = "Reply{content='$content_rendered}"
 }

app/src/main/java/im/fdx/v2ex/ui/main/MyDiffCallback.kt

@@ -1,39 +1,26 @@
 package im.fdx.v2ex.ui.main
 
 import android.support.v7.util.DiffUtil
-import im.fdx.v2ex.model.BaseModel
-import im.fdx.v2ex.ui.details.Reply
 
 /**
  * Created by fdx on 2017/7/11.
  * fdx will maintain it
  */
-class MyDiffCallback(private val oldList: List<BaseModel>, private val newList: List<BaseModel>) : DiffUtil.Callback() {
+class MyDiffCallback(private val oldList: List<Topic>, private val newList: List<Topic>) : DiffUtil.Callback() {
 
     override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-
-        if (oldList[oldItemPosition] is Topic && newList[newItemPosition] is Topic) {
-            return (oldList[oldItemPosition] as Topic).id == (newList[newItemPosition] as Topic).id
-        } else if (oldList[oldItemPosition] is Reply && newList[newItemPosition] is Reply)
-            return (oldList[oldItemPosition] as Reply).id == (newList[newItemPosition] as Reply).id
-        else return false
+        return oldList[oldItemPosition].id == newList[newItemPosition].id
     }
 
     override fun getOldListSize() = oldList.size
     override fun getNewListSize() = newList.size
 
-
     /**
      * 有点问题，GoodText不加载图片
      */
     override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        if (oldList[oldItemPosition] is Topic && newList[newItemPosition] is Topic) {
-            return (oldList[oldItemPosition] as Topic).replies == (newList[newItemPosition] as Topic).replies &&
-                    (oldList[oldItemPosition] as Topic).content_rendered == (newList[newItemPosition] as Topic).content_rendered
-        } else if (oldList[oldItemPosition] is Reply && newList[newItemPosition] is Reply)
-            return (oldList[oldItemPosition] as Reply).thanks == (newList[newItemPosition] as Reply).thanks &&
-                    (oldList[oldItemPosition] as Reply).isThanked == (newList[newItemPosition] as Reply).isThanked
-        else return false
+        return oldList[oldItemPosition].replies == newList[newItemPosition].replies &&
+                oldList[oldItemPosition].content_rendered == newList[newItemPosition].content_rendered
     }
 
     override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {

app/src/main/java/im/fdx/v2ex/ui/main/Topic.kt

@@ -2,7 +2,6 @@ package im.fdx.v2ex.ui.main
 
 import android.arch.persistence.room.*
 import android.os.Parcelable
-import im.fdx.v2ex.model.BaseModel
 import im.fdx.v2ex.ui.member.Member
 import im.fdx.v2ex.ui.node.Node
 import kotlinx.android.parcel.Parcelize
@@ -67,7 +66,7 @@ class Topic(
         var last_modified: Long = 0,
         var last_touched: Long = 0,
         @Ignore
-        var comments: MutableList<Comment> = mutableListOf()) : BaseModel(), Parcelable {
+        var comments: MutableList<Comment> = mutableListOf()) : Parcelable {
 
     override fun toString() = "标题：$title,\n内容：$content"
 

app/src/main/java/im/fdx/v2ex/ui/member/Member.kt

@@ -2,7 +2,6 @@ package im.fdx.v2ex.ui.member
 
 import android.arch.persistence.room.ColumnInfo
 import android.os.Parcelable
-import im.fdx.v2ex.model.BaseModel
 import kotlinx.android.parcel.Parcelize
 
 /**
@@ -50,7 +49,7 @@ data class Member(
         var location: String? = "",
         var twitter: String? = "",
         var website: String? = ""
-) : BaseModel(), Parcelable {
+) : Parcelable {
 
     val avatarNormalUrl: String
         get() = "http:" + avatar_normal

app/src/main/java/im/fdx/v2ex/ui/member/MemberReplyModel.kt

@@ -1,7 +1,6 @@
 package im.fdx.v2ex.ui.member
 
 import android.os.Parcelable
-import im.fdx.v2ex.model.BaseModel
 import im.fdx.v2ex.ui.main.Topic
 import kotlinx.android.parcel.Parcelize
 
@@ -13,4 +12,4 @@ import kotlinx.android.parcel.Parcelize
 data class MemberReplyModel(var id: String? = "",
                             var topic: Topic = Topic(),
                             var content: String? = null,
-                            var create: Long = 0L) : BaseModel(), Parcelable
+                            var create: Long = 0L) : Parcelable

app/src/main/java/im/fdx/v2ex/ui/node/Node.kt

@@ -2,7 +2,6 @@ package im.fdx.v2ex.ui.node
 
 import android.arch.persistence.room.ColumnInfo
 import android.os.Parcelable
-import im.fdx.v2ex.model.BaseModel
 import kotlinx.android.parcel.Parcelize
 
 /**
@@ -61,7 +60,7 @@ data class Node(
         @ColumnInfo(name = "node_avatar_large")
 
         var avatar_large: String = "",
-        var header: String = "") : BaseModel(), Parcelable {
+        var header: String = "") : Parcelable {
 
     val avatarMiniUrl: String
         get() = "http:$avatar_mini"