2 İşlemeler f6b70d2275 ... 3673aefffe

Yazar SHA1 Mesaj Tarih
  liujiangyao 3673aefffe Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop 7 yıl önce
  liujiangyao 2aca3f59bf refresh bottom hide 7 yıl önce

+ 20 - 0
app/src/main/java/com/sheep/gamegroup/util/RefreshUtil.java

@@ -1,6 +1,10 @@
 package com.sheep.gamegroup.util;
 
+import android.content.Context;
+
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
+import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 
 /**
  * SmartRefreshLayout
@@ -23,4 +27,20 @@ public class RefreshUtil {
     public void initRefresh(){
         ClassicsFooter.REFRESH_FOOTER_LOADING = "羊羊努力加载中...";//"正在加载...";
     }
+
+    /**
+     * public parameter
+     */
+    public void publicParameterRefresh(SmartRefreshLayout refreshLayout, Context context){
+
+        refreshLayout.autoRefresh();
+        refreshLayout.setEnableRefresh(true);//是否启用下拉刷新功能
+        refreshLayout.setEnableLoadMore(true);//是否启用上拉加载功能
+        //设置 Header 为 贝塞尔雷达 样式
+        refreshLayout.setRefreshHeader(new ClassicsHeader(context));
+        //设置 Footer 为 球脉冲 样式
+        refreshLayout.setRefreshFooter(new ClassicsFooter(context).setDrawableSize(20));
+        refreshLayout.setEnableAutoLoadMore(true);
+        refreshLayout.setEnableLoadMore(true);
+    }
 }

+ 84 - 0
app/src/main/java/com/sheep/gamegroup/util/SheepClassFooter.java

@@ -0,0 +1,84 @@
+package com.sheep.gamegroup.util;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.scwang.smartrefresh.layout.api.RefreshFooter;
+import com.scwang.smartrefresh.layout.api.RefreshKernel;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.constant.RefreshState;
+import com.scwang.smartrefresh.layout.constant.SpinnerStyle;
+
+/**
+ * Created by ljy on 2018/9/19.
+ */
+
+public class SheepClassFooter extends LinearLayout implements RefreshFooter {
+    public SheepClassFooter(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean setNoMoreData(boolean b) {
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public View getView() {
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public SpinnerStyle getSpinnerStyle() {
+        return null;
+    }
+
+    @Override
+    public void setPrimaryColors(int... ints) {
+
+    }
+
+    @Override
+    public void onInitialized(@NonNull RefreshKernel refreshKernel, int i, int i1) {
+
+    }
+
+    @Override
+    public void onMoving(boolean b, float v, int i, int i1, int i2) {
+
+    }
+
+    @Override
+    public void onReleased(@NonNull RefreshLayout refreshLayout, int i, int i1) {
+
+    }
+
+    @Override
+    public void onStartAnimator(@NonNull RefreshLayout refreshLayout, int i, int i1) {
+
+    }
+
+    @Override
+    public int onFinish(@NonNull RefreshLayout refreshLayout, boolean b) {
+        return 0;
+    }
+
+    @Override
+    public void onHorizontalDrag(float v, int i, int i1) {
+
+    }
+
+    @Override
+    public boolean isSupportHorizontalDrag() {
+        return false;
+    }
+
+    @Override
+    public void onStateChanged(@NonNull RefreshLayout refreshLayout, @NonNull RefreshState refreshState, @NonNull RefreshState refreshState1) {
+
+    }
+}

+ 3 - 9
app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment2.java

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -89,15 +90,8 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        refreshLayout.autoRefresh();
-        refreshLayout.setEnableRefresh(true);//是否启用下拉刷新功能
-        refreshLayout.setEnableLoadMore(true);//是否启用上拉加载功能
-        //设置 Header 为 贝塞尔雷达 样式
-        refreshLayout.setRefreshHeader(new ClassicsHeader(activity));
-        //设置 Footer 为 球脉冲 样式
-        refreshLayout.setRefreshFooter(new ClassicsFooter(activity).setDrawableSize(20));
-        refreshLayout.setEnableAutoLoadMore(true);
-        refreshLayout.setEnableLoadMore(true);
+
+        RefreshUtil.newInstance().publicParameterRefresh(refreshLayout, activity);
 //        refreshLayout.setEnableLoadMoreWhenContentNotFull(true);//内容不满屏幕的时候也开启加载更多
 //        refreshLayout.setFooterTriggerRate(1);
     }

+ 16 - 11
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -34,6 +35,7 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
@@ -148,8 +150,14 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 bottomLine.setVisibility(View.GONE);
                 return;
             }
-            int count = getDataCount();
-            bottomLine.setVisibility(count == 0 ? View.INVISIBLE : View.VISIBLE);
+            final int count = getDataCount();
+//            new Handler().postDelayed(new Runnable() {
+//                @Override
+//                public void run() {
+//
+//                    bottomLine.setVisibility(count == 0 ? View.INVISIBLE : View.VISIBLE);
+//                }
+//            },1500);
             if(noMore) {
                 final boolean isCanScrollToPosition = count > 10;//页数大于一页才显示点击回到顶部
                 TextView bottom_line_text = bottomLine.findViewById(R.id.bottom_line_text);
@@ -261,15 +269,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         /**
          * 刷新控件
          */
-        refreshLayout.autoRefresh();
-        refreshLayout.setEnableRefresh(true);//是否启用下拉刷新功能
-        refreshLayout.setEnableLoadMore(true);//是否启用上拉加载功能
-        //设置 Header 为 贝塞尔雷达 样式
-        refreshLayout.setRefreshHeader(new ClassicsHeader(activity));
-        //设置 Footer 为 球脉冲 样式
-        refreshLayout.setRefreshFooter(new ClassicsFooter(activity).setDrawableSize(20));
-        refreshLayout.setEnableAutoLoadMore(true);
-        refreshLayout.setEnableLoadMore(true);
+        RefreshUtil.newInstance().publicParameterRefresh(refreshLayout, activity);
 
     }
 
@@ -286,6 +286,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             public void onLoadMore(final RefreshLayout refreshlayout) {
                 boolean noMoreRelease = true;
                 boolean noMoreReleaseBegin = true;
+                if(bottomLine.getVisibility() == View.VISIBLE)
+                    bottomLine.setVisibility(View.GONE);
 
                 if(isGetRelease) {
                     if (ListUtil.size(releaseEtyLists) >= per_page * releasePage) {
@@ -322,6 +324,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
+
+                if(bottomLine.getVisibility() == View.VISIBLE)
+                    bottomLine.setVisibility(View.GONE);
                 if (newState == RecyclerView.SCROLL_STATE_IDLE) {//滑动到了底部
                     refreshLayout.autoLoadMore();
                 }

+ 14 - 15
app/src/main/res/layout/fgt_try_makemoney_layout.xml

@@ -18,30 +18,29 @@
         <!--android:layout_height="match_parent"-->
         <!--android:descendantFocusability="blocksDescendants" />-->
 
-    <LinearLayout
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
-            android:id="@+id/refreshLayout"
+        android:layout_height="match_parent">
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recyclerview"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:background="#fff"
                 android:overScrollMode="never" />
 
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            <include layout="@layout/find_item_bottom"
+                android:layout_below="@+id/refreshLayout"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"/>
 
-        <include layout="@layout/find_item_bottom"
-            android:layout_below="@+id/refreshLayout"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"/>
+        </LinearLayout>
 
-    </LinearLayout>
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 </RelativeLayout>

+ 2 - 1
app/src/main/res/layout/find_item_bottom.xml

@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:padding="@dimen/content_padding_20"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:visibility="gone">
 
     <ImageView
         android:layout_width="30dp"