The DataBinding that adds the RecyclerView Adapter supports and stores ViewState

朱显松
1 parent cfb6f42e
Showing 15 changed files with 277 additions and 176 deletions
app/build.gradle
app/src/main/java/com/cnlive/libs/demo/MainActivity.java
app/src/main/java/com/cnlive/libs/demo/MainAdapter.java
app/src/main/java/com/cnlive/libs/demo/MainPageData.java
app/src/main/java/com/cnlive/libs/demo/ToastTest.java
app/src/main/java/com/cnlive/libs/demo/MainListItemData.java → app/src/main/java/com/cnlive/libs/demo/mvptest/model/LaunchListItemData.java
app/src/main/java/com/cnlive/libs/demo/mvptest/model/LaunchPage.java
app/src/main/java/com/cnlive/libs/demo/mvptest/ui/activity/LaunchActivity.java
app/src/main/res/layout/activity_launch.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/listitem_main.xml
cnlive/build.gradle
cnlive/from_installv1.gradle
app/src/main/java/com/cnlive/libs/demo/DataBindingRecyclerAdapter.java → cnlive/src/main/java/com/cnlive/libs/base/frame/adapter/DataBindingRecyclerAdapter.java
cnlive/src/main/java/com/cnlive/libs/base/frame/model/ViewStateListData.java
@@ -41,6 +41,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     //    TODO 本地酷使用说明 代码仓库标识
     //    compile 'com.cnlive.libs:base:1.0.0@aar'
-    compile 'com.cnlive:cnlive:0.2.0'
-//        compile project(':cnlive')
+//    compile 'com.cnlive:cnlive:0.2.0'
+        compile project(':cnlive')
 }
 package com.cnlive.libs.demo;
-import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import com.cnlive.libs.demo.databinding.ActivityMainBinding;
 public class MainActivity extends AppCompatActivity {
-    private MainPageData data = new MainPageData();
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
-        binding.setData(data);
-        //Toast 测试
-        ToastTest.test(this);
-        Java8Test.test(this);
     }
-    protected void onAddItemClick(View view){
-        int id = data.getList().size();
-        data.getList().add(new MainListItemData(""+id));
-    }
-
-    protected void onMainItemClick(View view) {
-        TextView itemView = (TextView) view;
-        Log.e("DemoView", "view ~" + itemView.getText());
-    }
 }
-package com.cnlive.libs.demo;
-
-import com.cnlive.libs.demo.databinding.ListitemMainBinding;
-
-import java.util.List;
-
-/**
- * Created by xiansong on 2017/8/30.
- */
-
-public class MainAdapter extends DataBindingRecyclerAdapter<MainListItemData, ListitemMainBinding> {
-
-    private List<MainListItemData> list;
-
-    public MainAdapter(List<MainListItemData> list){
-        this.list = list;
-    }
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.listitem_main;
-    }
-
-    @Override
-    public List<MainListItemData> getList() {
-        return list;
-    }
-}
-package com.cnlive.libs.demo;
-
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.support.v7.widget.LinearLayoutManager;
-
-import com.cnlive.libs.demo.databinding.ListitemMainBinding;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by xiansong on 2017/8/30.
- */
-
-public class MainPageData extends BaseObservable {
-
-    private List<MainListItemData> list = Arrays.asList(
-            new MainListItemData("Title 1"),
-            new MainListItemData("Title 2"),
-            new MainListItemData("Title 3"),
-            new MainListItemData("Title 4"),
-            new MainListItemData("Title 5"));
-
-    private DataBindingRecyclerAdapter adapter = new DataBindingRecyclerAdapter<MainListItemData, ListitemMainBinding>() {
-        @Override
-        public int getLayoutId() {
-            return R.layout.listitem_main;
-        }
-
-        @Override
-        public List<MainListItemData> getList() {
-            return list;
-        }
-    };
-
-    private LinearLayoutManager manager = new LinearLayoutManager(null);
-
-    public List<MainListItemData> getList() {
-        return list;
-    }
-
-    public void setList(List<MainListItemData> list) {
-        this.list = list;
-    }
-
-    @Bindable
-    public DataBindingRecyclerAdapter getAdapter() {
-        return adapter;
-    }
-
-    public void setAdapter(DataBindingRecyclerAdapter adapter) {
-        this.adapter = adapter;
-        notifyPropertyChanged(BR.adapter);
-    }
-
-    @Bindable
-    public LinearLayoutManager getManager() {
-        return manager;
-    }
-
-    public void setManager(LinearLayoutManager manager) {
-        this.manager = manager;
-        notifyPropertyChanged(BR.manager);
-    }
-}
@@ -23,8 +23,8 @@ public class ToastTest {
             .setView(R.layout.layout_toast_1, R.id.text);
-    public static void test(Context context) {
+    public static void showMainToast(Context context,String message) {
         //Toast 调用示例
-        mainToast.build(context).showToast("Start ~~~");
+        mainToast.build(context).showToast(message);
     }
 }
-package com.cnlive.libs.demo;
+package com.cnlive.libs.demo.mvptest.model;
 import android.databinding.BaseObservable;
 import android.databinding.Bindable;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.cnlive.libs.demo.BR;
 /**
  * Created by xiansong on 2017/8/30.
  */
-public class MainListItemData extends BaseObservable {
+public class LaunchListItemData extends BaseObservable implements Parcelable {
     private String name;
-    public MainListItemData(String name ){
+    public LaunchListItemData(String name ){
         this.name = name;
     }
+    protected LaunchListItemData(Parcel in) {
+        name = in.readString();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(name);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<LaunchListItemData> CREATOR = new Creator<LaunchListItemData>() {
+        @Override
+        public LaunchListItemData createFromParcel(Parcel in) {
+            return new LaunchListItemData(in);
+        }
+
+        @Override
+        public LaunchListItemData[] newArray(int size) {
+            return new LaunchListItemData[size];
+        }
+    };
+
     @Bindable
     public String getName() {
         return name;
 package com.cnlive.libs.demo.mvptest.model;
-import android.databinding.BaseObservable;
 import android.databinding.Bindable;
 import android.os.Parcel;
-import android.os.Parcelable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import com.cnlive.libs.base.frame.model.ViewStateListData;
 import com.cnlive.libs.demo.BR;
+import com.cnlive.libs.demo.R;
+import com.cnlive.libs.demo.databinding.ListitemMainBinding;
-public class LaunchPage extends BaseObservable implements Parcelable {
+public class LaunchPage extends ViewStateListData<LaunchListItemData,ListitemMainBinding> {
     private long time = -1;
     private int timing = View.GONE;
     private int loading = View.GONE;
+    @Override
+    public int getLayoutId() {
+        return R.layout.listitem_main;
+    }
+
+    @Override
+    public RecyclerView.LayoutManager getLayoutManager() {
+        return new LinearLayoutManager(null);
+    }
+
     @Bindable
     public long getTime() {
         return time;
@@ -45,26 +58,25 @@ public class LaunchPage extends BaseObservable implements Parcelable {
     }
     @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
     public void writeToParcel(Parcel parcel, int i) {
+        super.writeToParcel(parcel, i);
         parcel.writeLong(this.time);
         parcel.writeInt(this.timing);
         parcel.writeInt(this.loading);
     }
+    @Override
+    public void createFromParcel(Parcel in) {
+        super.createFromParcel(in);
+        this.time = in.readLong();
+        this.timing = in.readInt();
+        this.loading = in.readInt();
+    }
-    public static final Creator<LaunchPage> CREATOR = new Creator<LaunchPage>() {
+    public  static final Creator<LaunchPage> CREATOR = new Creator<LaunchPage>() {
         @Override
         public LaunchPage createFromParcel(Parcel in) {
-            LaunchPage target = new LaunchPage();
-            target.time = in.readLong();
-            target.timing = in.readInt();
-            target.loading = in.readInt();
-            return target;
+            return ViewStateListData.newInstance(LaunchPage.class,in);
         }
         @Override
@@ -6,7 +6,9 @@ import android.os.Bundle;
 import android.view.View;
 import com.cnlive.libs.base.frame.activity.MvpViewStateBindingActivity;
+import com.cnlive.libs.demo.mvptest.model.LaunchListItemData;
 import com.cnlive.libs.demo.R;
+import com.cnlive.libs.demo.ToastTest;
 import com.cnlive.libs.demo.databinding.ActivityLaunchBinding;
 import com.cnlive.libs.demo.mvptest.frame.presenter.LaunchPresenter;
 import com.cnlive.libs.demo.mvptest.frame.view.LaunchView;
@@ -25,6 +27,11 @@ public class LaunchActivity extends MvpViewStateBindingActivity&lt;LaunchView, Laun
     }
     @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+    }
+
+    @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
     }
@@ -48,4 +55,14 @@ public class LaunchActivity extends MvpViewStateBindingActivity&lt;LaunchView, Laun
     public void onNewViewStateInstance() {
         getPresenter().initData(this);
     }
+
+    private int index = 1;
+    public void onAddItemClick(View view){
+        getViewData().getAdapter().addItem(new LaunchListItemData(""+index++));
+        getViewData().setTime(getViewData().getAdapter().getItemCount());
+    }
+
+    public void onMainItemClick(View view) {
+        ToastTest.showMainToast(this,((LaunchListItemData)view.getTag()).getName());
+    }
 }
@@ -16,6 +16,21 @@
         android:background="#FFc2c4f6"
         tools:context=".mvptest.ui.activity.LaunchActivity">
+        <Button
+            android:layout_width="368dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:onClick="onAddItemClick"
+            android:text="Add  Item"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintVertical_bias="0.013"
+            app:layout_constraintTop_toBottomOf="@+id/textView2" />
         <ProgressBar
             android:id="@+id/progressBar"
             android:layout_width="32dp"
@@ -38,7 +53,8 @@
             android:visibility="@{data.timing}"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="0" />
+            tools:text="0"
+            android:id="@+id/textView2" />
         <View
             android:id="@+id/click"
@@ -51,6 +67,27 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="368dp"
+            android:layout_height="200dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+
+
+            app:adapter="@{data.adapter}"
+            app:layoutManager="@{data.manager}"/>
     </android.support.constraint.ConstraintLayout>
 </layout>
@@ -7,7 +7,7 @@
         <variable
             name="data"
-            type="com.cnlive.libs.demo.MainPageData" />
+            type="String" />
     </data>
     <android.support.constraint.ConstraintLayout
@@ -41,25 +41,6 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="368dp"
-            android:layout_height="200dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            app:adapter="@{data.adapter}"
-            app:layoutManager="@{data.manager}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="1.0" />
     </android.support.constraint.ConstraintLayout>
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
         <variable
             name="data"
-            type="com.cnlive.libs.demo.MainListItemData" />
+            type="com.cnlive.libs.demo.mvptest.model.LaunchListItemData" />
     </data>
     <RelativeLayout
@@ -18,7 +19,9 @@
             android:layout_centerVertical="true"
             android:onClick="onMainItemClick"
             android:padding="8dp"
-            android:text="@{data.name}" />
+
+            android:text="@{data.name}"
+            app:tag="@{data}" />
     </RelativeLayout>
@@ -35,6 +35,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:recyclerview-v7:26.+'
     //MVP
     compile 'com.hannesdorfmann.mosby3:mvp:3.0.4'
     compile 'com.hannesdorfmann.mosby3:viewstate:3.0.4'
@@ -41,7 +41,7 @@ install {
                         List list = new ArrayList()
                         pom.dependencies.findAll {
                             dep ->
-                                dep.groupId == rootProject.name
+                                dep.groupId == rootProject.name || dep.groupId == 'com.android.support'
                         }.collect {
                             dep ->
                                 list.add(dep)
-package com.cnlive.libs.demo;
+package com.cnlive.libs.base.frame.adapter;
+
+/**
+ * Created by xiansong on 2017/9/1.
+ */
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
@@ -14,6 +18,23 @@ import java.util.List;
 public abstract class DataBindingRecyclerAdapter<D, T extends ViewDataBinding> extends RecyclerView.Adapter<DataBindingRecyclerAdapter<D, T>.DataBindingViewHolder> {
+    class DataBindingViewHolder extends RecyclerView.ViewHolder {
+
+        private ViewDataBinding binding;
+
+        private DataBindingViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        public void setBinding(ViewDataBinding binding) {
+            this.binding = binding;
+        }
+
+        public ViewDataBinding getBinding() {
+            return binding;
+        }
+    }
+
     public abstract int getLayoutId();
     public abstract List<D> getList();
@@ -32,26 +53,51 @@ public abstract class DataBindingRecyclerAdapter&lt;D, T extends ViewDataBinding&gt; e
         holder.binding.executePendingBindings();
     }
+    public D getItem(int location) {
+        return getList().get(location);
+    }
+
     @Override
     public int getItemCount() {
-        return getList().size();
+        return getList() == null ? 0 : getList().size();
     }
-    public class DataBindingViewHolder extends RecyclerView.ViewHolder {
+    public void addItem(D item) {
+        if (item == null) return;
+        getList().add(getList().size(), item);
+        notifyItemInserted(getList().size());
+    }
-        private ViewDataBinding binding;
+    public void addItems(List<D> items) {
+        if (items == null) return;
+        this.getList().addAll(items);
+        notifyDataSetChanged();
+    }
-        public DataBindingViewHolder(View itemView) {
-            super(itemView);
-        }
+    public boolean containsAll(List<D> items) {
+        return getList().containsAll(items);
+    }
-        public void setBinding(ViewDataBinding binding) {
-            this.binding = binding;
-        }
+    public void updateItem(D tasks, int position) {
+        if (tasks == null) return;
+        getList().set(position, tasks);
+        notifyItemChanged(position);
+    }
-        public ViewDataBinding getBinding() {
-            return binding;
-        }
+    public void updateItems(List<D> items) {
+        if (items == null) return;
+        this.getList().clear();
+        this.getList().addAll(items);
+        notifyDataSetChanged();
+    }
+
+    public void removeItem(int index) {
+        getList().remove(index);
+        notifyItemRemoved(index);
+    }
+    public void removeAllItems() {
+        getList().clear();
+        notifyDataSetChanged();
     }
 -}
+}
 \ No newline at end of file
+package com.cnlive.libs.base.frame.model;
+
+import android.databinding.BaseObservable;
+import android.databinding.Bindable;
+import android.databinding.ViewDataBinding;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import com.cnlive.libs.base.frame.adapter.DataBindingRecyclerAdapter;
+import com.cnlive.libs.base.util.LogUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by xiansong on 2017/9/1.
+ */
+
+public abstract class ViewStateListData<ITEM extends BaseObservable, BINDING extends ViewDataBinding> extends BaseObservable implements Parcelable {
+
+    private static final String TAG = "PageListData";
+
+    public static <T extends ViewStateListData<ITEM, BINDING>, ITEM extends BaseObservable, BINDING extends ViewDataBinding> T newInstance(Class<T> clazz, Parcel in) {
+        T data = null;
+        try {
+            data = clazz.newInstance();
+            data.createFromParcel(in);
+        } catch (Exception e) {
+            LogUtil.e(TAG, "Presenter or data need to implement the default constructor: constructor ()", e);
+        }
+        return data;
+    }
+
+    public abstract int getLayoutId();
+
+    public abstract RecyclerView.LayoutManager getLayoutManager();
+
+    private List<ITEM> list = new ArrayList<>();
+
+    private RecyclerView.LayoutManager manager = getLayoutManager();
+
+    private DataBindingRecyclerAdapter<ITEM, BINDING> adapter = new DataBindingRecyclerAdapter<ITEM, BINDING>() {
+        @Override
+        public int getLayoutId() {
+            return ViewStateListData.this.getLayoutId();
+        }
+
+        @Override
+        public List<ITEM> getList() {
+            return list;
+        }
+    };
+
+    @Bindable
+    public DataBindingRecyclerAdapter<ITEM, BINDING> getAdapter() {
+        return adapter;
+    }
+
+    public void setAdapter(DataBindingRecyclerAdapter<ITEM, BINDING> adapter) {
+        this.adapter = adapter;
+        notifyPropertyChanged(com.cnlive.libs.base.BR.adapter);
+    }
+
+    @Bindable
+    public RecyclerView.LayoutManager getManager() {
+        return manager;
+    }
+
+    public void setManager(LinearLayoutManager manager) {
+        this.manager = manager;
+        notifyPropertyChanged(com.cnlive.libs.base.BR.manager);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeList(this.list);
+    }
+
+    public void createFromParcel(Parcel in) {
+        in.readList(list, getClass().getClassLoader());
+    }
+
+}