优化代码

jdsjlzx · Dec 13, 2016 · f90813f · f90813f
1 parent f182a0b
commit f90813f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/LRecyclerview_library/src/main/java/com/github/jdsjlzx/recyclerview/LRecyclerView.java b/LRecyclerview_library/src/main/java/com/github/jdsjlzx/recyclerview/LRecyclerView.java
@@ -336,10 +336,14 @@ public void setRefreshing(boolean refreshing) {
     }
 
     public void forceToRefresh() {
-        LoadingFooter.State state = RecyclerViewStateUtils.getFooterViewState(this);
-        if(state == LoadingFooter.State.Loading) {
-            return;
+
+        if (mWrapAdapter.getFooterView() instanceof  LoadingFooter) {
+            LoadingFooter.State state = RecyclerViewStateUtils.getFooterViewState(this);
+            if(state == LoadingFooter.State.Loading) {
+                return;
+            }
         }
+
         if (mPullRefreshEnabled && mRefreshListener != null) {
             scrollToPosition(0);
             mRefreshHeader.setState(ArrowRefreshHeader.STATE_REFRESHING);

diff --git a/app/app.iml b/app/app.iml
@@ -62,20 +62,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

diff --git a/app/src/main/java/com/lzx/demo/ui/LinearLayoutActivity.java b/app/src/main/java/com/lzx/demo/ui/LinearLayoutActivity.java
@@ -90,8 +90,6 @@ public void onClick(View v) {
         //add a FooterView
         mLRecyclerViewAdapter.addFooterView(sampleFooter);
 
-
-
     }
 
     private class DataAdapter extends ListBaseAdapter<ItemModel> {
@@ -102,7 +100,6 @@ public DataAdapter(Context context) {
             mLayoutInflater = LayoutInflater.from(context);
         }
 
-
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             return new ViewHolder(mLayoutInflater.inflate(R.layout.sample_item_text, parent, false));

diff --git a/app/src/main/java/com/lzx/demo/ui/MulItemGridLayoutActivity.java b/app/src/main/java/com/lzx/demo/ui/MulItemGridLayoutActivity.java
@@ -212,7 +212,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             finish();
         } else if (item.getItemId() == R.id.menu_refresh) {
             mRecyclerView.forceToRefresh();
-            //mDataAdapter.remove(mLRecyclerViewAdapter.getAdapterPosition(false,3));
         }
         return true;
     }

diff --git a/app/src/main/java/com/lzx/demo/ui/MulItemLinearLayoutActivity.java b/app/src/main/java/com/lzx/demo/ui/MulItemLinearLayoutActivity.java
@@ -356,7 +356,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             finish();
         } else if (item.getItemId() == R.id.menu_refresh) {
             mRecyclerView.forceToRefresh();
-            //mDataAdapter.remove(mLRecyclerViewAdapter.getAdapterPosition(false,3));
         }
         return true;
     }