fix bug : throw an exception when call ImmutableSingleDataSource's sh…

…ow() or hide()
caoddx · Sep 11, 2018 · 94bf8ad · 94bf8ad
1 parent 51c7b06
commit 94bf8ad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/...apter/src/main/java/com/github/caoddx/easyadapter/datasource/ImmutableSingleDataSource.kt b/...apter/src/main/java/com/github/caoddx/easyadapter/datasource/ImmutableSingleDataSource.kt
@@ -7,6 +7,16 @@ class ImmutableSingleDataSource<T>(val data: T) : SingleDataSource<T> {
     override var group: SingleGroup<T>? = null
 
     var visible: Boolean = true
+        set(value) {
+            if (field && !value) {
+                field = value
+                group?.notifyDataSetChanged(1)
+            }
+            if (!field && value) {
+                field = value
+                group?.notifyDataSetChanged(0)
+            }
+        }
 
     override fun haveData(): Boolean {
         return visible
@@ -17,16 +27,10 @@ class ImmutableSingleDataSource<T>(val data: T) : SingleDataSource<T> {
     }
 
     fun show() {
-        if (!visible) {
-            visible = true
-            group?.notifyDataSetChanged(1)
-        }
+        visible = true
     }
 
     fun hide() {
-        if (visible) {
-            visible = false
-            group?.notifyDataSetChanged(0)
-        }
+        visible = false
     }
 }
diff --git a/...adapter/src/main/java/com/github/caoddx/easyadapter/datasource/MutableSingleDataSource.kt b/...adapter/src/main/java/com/github/caoddx/easyadapter/datasource/MutableSingleDataSource.kt
@@ -15,6 +15,16 @@ class MutableSingleDataSource<T>(initData: T) : SingleDataSource<T> {
         }
 
     var visible: Boolean = true
+        set(value) {
+            if (field && !value) {
+                field = value
+                group?.notifyDataSetChanged(1)
+            }
+            if (!field && value) {
+                field = value
+                group?.notifyDataSetChanged(0)
+            }
+        }
 
     override fun haveData(): Boolean {
         return visible
@@ -25,16 +35,10 @@ class MutableSingleDataSource<T>(initData: T) : SingleDataSource<T> {
     }
 
     fun show() {
-        if (!visible) {
-            visible = true
-            group?.notifyDataSetChanged(0)
-        }
+        visible = true
     }
 
     fun hide() {
-        if (visible) {
-            visible = false
-            group?.notifyDataSetChanged(1)
-        }
+        visible = false
     }
 }