diff --git a/adapter/src/main/java/kale/adapter/RcvAdapterWrapper.java b/adapter/src/main/java/kale/adapter/RcvAdapterWrapper.java
index c9eed6e..f99278c 100644
--- a/adapter/src/main/java/kale/adapter/RcvAdapterWrapper.java
+++ b/adapter/src/main/java/kale/adapter/RcvAdapterWrapper.java
@@ -23,7 +23,7 @@ public class RcvAdapterWrapper extends RecyclerView.Adapter<RecyclerView.ViewHol
     public static final int TYPE_FOOTER = 99931;
 
     @Getter
-    private final RecyclerView.LayoutManager layoutManager;
+    private RecyclerView.LayoutManager layoutManager;
 
     private RecyclerView.Adapter mWrapped;
 
@@ -123,6 +123,16 @@ public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, int posit
         }
     }
 
+    public void setLayoutManager(RecyclerView.LayoutManager layoutManager) {
+        this.layoutManager = layoutManager;
+        if (headerView != null) {
+            setFullSpan(headerView, layoutManager);
+        }
+        if (footerView != null) {
+            setFullSpan(footerView, layoutManager);
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // 添加/移除头部、尾部的操作
     ///////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/kale/commonadapter/RcvHeaderFooterTestActivity.java b/app/src/main/java/kale/commonadapter/RcvHeaderFooterTestActivity.java
index bd12b6c..9c83ac4 100644
--- a/app/src/main/java/kale/commonadapter/RcvHeaderFooterTestActivity.java
+++ b/app/src/main/java/kale/commonadapter/RcvHeaderFooterTestActivity.java
@@ -34,16 +34,20 @@
 public class RcvHeaderFooterTestActivity extends AppCompatActivity {
 
     private ObservableArrayList<DemoModel> data = new ObservableArrayList<>();
+    private RcvAdapterWrapper wrapper;
+    private GridLayoutManager layoutManager1;
+    private StaggeredGridLayoutManager layoutManager2;
+    private RecyclerView recyclerView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final RecyclerView recyclerView = new RecyclerView(this);
+        recyclerView = new RecyclerView(this);
         LayoutUtil.setContentView(this, recyclerView);
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
-        GridLayoutManager layoutManager1 = new GridLayoutManager(this, 2);
-        StaggeredGridLayoutManager layoutManager2 = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
+        layoutManager1 = new GridLayoutManager(this, 2);
+        layoutManager2 = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
         recyclerView.setLayoutManager(layoutManager1);
 
         data.addAll(DataManager.loadData(getBaseContext()));
@@ -70,7 +74,7 @@ public AdapterItem createItem(Object type) {
             }
         };
 
-        final RcvAdapterWrapper wrapper = new RcvAdapterWrapper(adapter, recyclerView.getLayoutManager());
+        wrapper = new RcvAdapterWrapper(adapter, recyclerView.getLayoutManager());
 
         Button header = new Button(this);
         header.setText("Header");
@@ -111,6 +115,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
         //添加菜单项
         MenuItem add = menu.add(0, 0, 0, "add");
         add.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        
+        MenuItem change = menu.add(1, 1, 0, "change");
+        change.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         return true;
     }
 
@@ -122,6 +129,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
             model.content = "kale";
             data.add(0, model);
             return true;
+        } else if (item.getItemId() == 1) {
+            if (wrapper.getLayoutManager() instanceof StaggeredGridLayoutManager) {
+                recyclerView.setLayoutManager(layoutManager1);
+                wrapper.setLayoutManager(layoutManager1);
+            } else {
+                recyclerView.setLayoutManager(layoutManager2);
+                wrapper.setLayoutManager(layoutManager2);
+            }
+            return true;
         } else {
             return super.onOptionsItemSelected(item);
         }