任务、提现列表增加分页功能，重叠修改等待验证

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -185,6 +185,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     public void initData() {
+
+        if (upview1 != null) {
+            //停止滚动
+            upview1.stopScroll();
+        }
         pagePresenter.getUserInfo();
 
         pagePresenter.getAwardDetail();
@@ -400,13 +405,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         } catch (Exception e) {
             e.printStackTrace();
         }
-        Log.e("onAttach-----","");
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        Log.e("onStart-----","");
     }
     /**
      * banner

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -15,7 +15,6 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

app/src/main/java/com/sheep/gamegroup/view/activity/TaskListAct.java

@@ -19,6 +19,7 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.react.upfile.UpFileListener;
 import com.kfzs.duanduan.react.upfile.UpFileUtils;
+import com.kfzs.duanduan.view.ListMore;
 import com.sheep.gamegroup.di.components.DaggerTaskListComponent;
 import com.sheep.gamegroup.di.modules.TaskListModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -59,7 +60,7 @@ import go.kfzssafe.Kfzssafe;
 
 public class TaskListAct extends BaseActivity implements TaskListContract.View, UpFileListener {
     @BindView(R.id.withdrawal_listview)
-    ListView withdrawalListview;
+    ListMore withdrawalListview;
 
     @Inject
     TaskListPresenter presenter;
@@ -73,6 +74,8 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
      * 上传进度
      */
     private boolean isUpload = true;
+    private int page = 1;//页数
+    private int per_page = 10;
 
 
     @Override
@@ -93,9 +96,29 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
                 .setTitle(this, "任务记录")
                 .setTitleFinish(this);
         adp = new TaskListItemAdp(activity , etyList);
-        withdrawalListview.setAdapter(adp);
+        withdrawalListview.getmListView().setAdapter(adp);
         adp.notifyDataSetChanged();
 
+
+
+        withdrawalListview.setDrivers(null);
+        withdrawalListview.setmPullMoreEnable(false);
+        withdrawalListview.setmOnListMoreListener(new ListMore.OnListMoreListener() {
+            @Override
+            public void onRefresh() {
+                page = 1;
+                initData();
+            }
+
+            @Override
+            public void onLoadMore() {
+                if(etyList != null && etyList.size() >= per_page*page){
+                    page += 1;
+                }
+                initData();
+            }
+        });
+
     }
 
     @Override
@@ -106,12 +129,14 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
     @Override
     public void initData() {
         showProgress();
-        presenter.acceptedTask(0,10);
+        withdrawalListview.setRefreshing(true);
+        presenter.acceptedTask(page,per_page);
     }
 
     @Override
     public void updataView(Object o) {
         hideProgress();
+        withdrawalListview.setRefreshing(false);
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskAcceptedEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
@@ -126,6 +151,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
     @Override
     public void failView(Object o) {
         hideProgress();
+        withdrawalListview.setRefreshing(false);
         G.showToast(((BaseMessage) o).getMsg()+"");
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -201,7 +201,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             BaseMessage baseMessage = (BaseMessage) o;
             switch (baseMessage.getCode()){
                 case 300://未查询到正在运行的任务
-                    G.showToast(" 未查询到正在运行的任务！");
+//                    G.showToast(" 未查询到正在运行的任务！");
                     break;
                 default:
                     G.showToast(" 网络错误！");

app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalListAct.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSONArray;
+import com.kfzs.duanduan.view.ListMore;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalListComponent;
 import com.sheep.gamegroup.di.modules.WishdrawalListModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -34,7 +35,7 @@ import butterknife.ButterKnife;
 
 public class WithdrawalListAct extends BaseActivity implements WithdrawalListContract.View{
     @BindView(R.id.withdrawal_listview)
-    ListView withdrawalListview;
+    ListMore withdrawalListview;
 
     @Inject
     WithdrawalListPresenter presenter;
@@ -42,6 +43,8 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
     private List<WithdrawalEty> etyList = new ArrayList<>();
     private WithdrawalListAdp adp;
     private Activity activity;
+    private int page = 1;//页数
+    private int per_page = 10;
 
     @Override
     protected int getLayoutId() {
@@ -60,8 +63,28 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
                 .setTitle(this, "提现明细")
                 .setTitleFinish(this);
         adp = new WithdrawalListAdp(activity, etyList);
-        withdrawalListview.setAdapter(adp);
+        withdrawalListview.getmListView().setAdapter(adp);
         adp.notifyDataSetChanged();
+
+
+
+        withdrawalListview.setDrivers(null);
+        withdrawalListview.setmPullMoreEnable(false);
+        withdrawalListview.setmOnListMoreListener(new ListMore.OnListMoreListener() {
+            @Override
+            public void onRefresh() {
+                page = 1;
+                initData();
+            }
+
+            @Override
+            public void onLoadMore() {
+                if(etyList != null && etyList.size() >= per_page*page){
+                    page += 1;
+                }
+                initData();
+            }
+        });
     }
 
     @Override
@@ -71,13 +94,15 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
 
     @Override
     public void initData() {
-        presenter.goWithdrawal(0,10, 0+"",System.currentTimeMillis()+"");
+        withdrawalListview.setRefreshing(true);
+        presenter.goWithdrawal(page, per_page, 0+"",System.currentTimeMillis()+"");
 
     }
 
     @Override
     public void updataView(Object o) {
 
+        withdrawalListview.setRefreshing(false);
         hideProgress();
         try{
             BaseMessage baseMessage = (BaseMessage) o;
@@ -92,6 +117,7 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
 
     @Override
     public void failView(Object o) {
+        withdrawalListview.setRefreshing(false);
         G.showToast(((BaseMessage) o).getMsg()+"");
     }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -201,6 +201,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         item_anem_tv.setText(acceptedEty.getRelease_task().getName()+"");
         item_num_tv.setText("剩余"+ acceptedEty.getRelease_task().getLast_num()+"份");
         item_money.setText("+"+ acceptedEty.getRelease_task().getBonus() +"元");
+        holder.itemView.setBackground(mContext.getResources().getDrawable(R.drawable.x_shap_shadow_bg_rectgangle_white));
+        holder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
         cancel_task_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/res/layout/task_list_item.xml

@@ -12,64 +12,73 @@
         android:layout_height="@dimen/view_size_60"
         android:src="@mipmap/ic_launcher"
         android:layout_centerVertical="true"/>
-
-    <RelativeLayout
-        android:id="@+id/name_date_layout"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:layout_toRightOf="@+id/icon_iv"
-        android:layout_marginLeft="@dimen/content_padding"
-        android:layout_centerVertical="true">
-        <TextView
-            android:id="@+id/name_tv"
-            style="@style/nomal_txt_style"
-            android:layout_width="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/content_padding">
+        <RelativeLayout
+            android:id="@+id/name_date_layout"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="完成试玩任务无敌大航海"/>
+            android:layout_gravity="center_vertical">
+            <TextView
+                android:id="@+id/name_tv"
+                style="@style/nomal_txt_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="完成试玩任务无敌大航"
+                android:lines="2"
+                android:ellipsize="end"
+                android:layout_marginTop="@dimen/content_padding_small"/>
+
+            <TextView
+                android:id="@+id/date_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="2018/02/14 14:41"
+                android:layout_below="@+id/name_tv"
+                android:textSize="@dimen/text_size_3"
+                android:textColor="@color/txt_black_818181"
+                android:layout_marginBottom="@dimen/content_padding_small"/>
+        </RelativeLayout>
 
-        <TextView
-            android:id="@+id/date_tv"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2018/02/14 14:41"
-            android:layout_below="@+id/name_tv"
-            android:textSize="@dimen/text_size_3"
-            android:textColor="@color/txt_black_818181"
-            android:layout_marginTop="@dimen/content_padding_10"/>
-    </RelativeLayout>
+            android:layout_marginLeft="@dimen/content_padding"
+            android:layout_gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/price_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="+1.5元"
+                android:textColor="@color/txt_red"
+                android:textSize="@dimen/text_size_15"
+                android:layout_centerHorizontal="true"/>
+            <TextView
+                android:id="@+id/detail_task_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="任务截图"
+                android:minWidth="@dimen/view_size_73"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_10"
+                android:gravity="center"
+                android:padding="@dimen/content_padding_3"
+                android:layout_below="@+id/price_tv"
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/sp_bg_gradient_rectangle_blue"
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:visibility="visible"/>
+        </RelativeLayout>
+    </LinearLayout>
 
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/name_date_layout"
-        android:layout_marginLeft="@dimen/content_padding"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true">
 
-        <TextView
-            android:id="@+id/price_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="+1.5元"
-            android:textColor="@color/txt_red"
-            android:textSize="@dimen/text_size_15"
-            android:layout_centerHorizontal="true"/>
-        <TextView
-            android:id="@+id/detail_task_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="任务截图"
-            android:minWidth="@dimen/view_size_73"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_10"
-            android:gravity="center"
-            android:padding="@dimen/content_padding_3"
-            android:layout_below="@+id/price_tv"
-            android:layout_centerHorizontal="true"
-            android:background="@drawable/sp_bg_gradient_rectangle_blue"
-            android:layout_marginTop="@dimen/content_padding_small"
-            android:visibility="visible"/>
-    </RelativeLayout>
 
 
 </RelativeLayout>

app/src/main/res/layout/withdrawal_list.xml

@@ -7,11 +7,11 @@
 
     <include layout="@layout/title" />
 
-    <ListView
+    <com.kfzs.duanduan.view.ListMore
         android:id="@+id/withdrawal_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:listSelector="@color/transparent"
         android:layout_margin="@dimen/content_padding_13"
-        android:scrollbars="none"></ListView>
+        android:scrollbars="none"></com.kfzs.duanduan.view.ListMore>
 </LinearLayout>