1. fixbugs

beiger · Oct 14, 2018 · fe97117 · fe97117
1 parent 2bbb9cf
commit fe97117
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 8 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/mvvmbase/src/main/java/com/bing/mvvmbase/base/recycleview/BaseRecycleViewAdapter.java b/mvvmbase/src/main/java/com/bing/mvvmbase/base/recycleview/BaseRecycleViewAdapter.java
@@ -14,9 +14,13 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 public abstract class BaseRecycleViewAdapter<T, VH extends BaseViewHolder> extends RecyclerView.Adapter<VH> {
-	private List<T> mData = new ArrayList<>();
+	protected List<T> mData = new ArrayList<>();
 	protected OnClickListener mListener;
 
+	public List<T> getData() {
+		return mData;
+	}
+
 	@NonNull
 	@Override
 	public VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

diff --git a/mvvmbase/src/main/java/com/bing/mvvmbase/base/recycleview/BaseRecycleViewFragment.java b/mvvmbase/src/main/java/com/bing/mvvmbase/base/recycleview/BaseRecycleViewFragment.java
@@ -32,6 +32,7 @@
 import androidx.databinding.ViewDataBinding;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
@@ -116,6 +117,7 @@ protected void initRecycleView() {
 		mRecyclerView.setLayoutManager(getLayoutManager());
 		mRecyclerView.setItemAnimator(getItemAnimator());
 		initAdapter();
+		mRecyclerView.setAdapter(mAdapter);
 	}
 
 	protected abstract RecyclerView getRecyclerView();
@@ -125,8 +127,8 @@ protected RecyclerView.ItemAnimator getItemAnimator() {
 		return new DefaultItemAnimator();
 	}
 	protected abstract void initAdapter();
-	protected abstract LiveData<Status> getNetworkState();
-	protected abstract LiveData<Status> getRefreshState();
+	protected abstract MutableLiveData<Status> getNetworkState();
+	protected abstract MutableLiveData<Status> getRefreshState();
 	protected abstract LiveData<List<T>> getData();
 
 	protected abstract void handleArguments();
@@ -168,6 +170,9 @@ public void onChanged(@Nullable Status status) {
 			@Override
 			public void onChanged(List<T> list) {
 				mAdapter.setData(list);
+				if (list == null || list.size() == 0) {
+					getNetworkState().setValue(Status.NONE);
+				}
 			}
 		});
 		getRefreshState().observe(this, new Observer<Status>() {

diff --git a/mvvmbase/src/main/java/com/bing/mvvmbase/base/recycleview/BaseViewHolder.java b/mvvmbase/src/main/java/com/bing/mvvmbase/base/recycleview/BaseViewHolder.java
@@ -11,4 +11,7 @@ public BaseViewHolder(DB binding) {
 		mBinding = binding;
 	}
 
+	public DB getBinding() {
+		return mBinding;
+	}
 }
diff --git a/mvvmbase/src/main/java/com/bing/mvvmbase/bindingadapter/BindingAdapters.java b/mvvmbase/src/main/java/com/bing/mvvmbase/bindingadapter/BindingAdapters.java
@@ -9,12 +9,12 @@
 import androidx.databinding.BindingAdapter;
 
 public class BindingAdapters {
-	@BindingAdapter("bind:visibleGone")
+	@BindingAdapter("visibleGone")
 	public static void showHide(View view, boolean show) {
 		view.setVisibility(show ? View.VISIBLE : View.GONE);
 	}
 
-	@BindingAdapter("bind:img_url")
+	@BindingAdapter("img_url")
 	public static void showImg(ImageView iv, String url) {
 		GlideApp.with(iv.getContext()).load(url).skipMemoryCache(true).diskCacheStrategy(DiskCacheStrategy.NONE).into(iv);
 	}