首页，任务列表获取

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

@@ -264,8 +264,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          * tablayout
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
 
 //        mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);

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

@@ -80,6 +80,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private Context context;
     private int from;// 1 来自主页
     private int type = 0;//0:推荐 1:热门 2:预约 3:游戏推荐
+    private String show_type;
     private int is_succession;//0:一般任务 1:连续任务
 
     public TryMakeMoneyAdp(Context context) {
@@ -151,6 +152,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     public void addType(int type){
         this.type = type;
     }
+    public void addShowType(String show_type){
+        this.show_type = show_type;
+    }
     /**
      * 传入is_succession
      */
@@ -587,7 +591,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                                 "截止时间:" + taskReleaseEty.getDeadline());
                     }
                 }
-                if (i == 0) {
+                if (i == 0 && TextUtils.isEmpty(show_type)) {
                     viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.VISIBLE);
                     if (isBegin == 1) {
                         ((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv)).setImageResource(R.mipmap.jijiangks);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -67,6 +68,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
     private List<TaskReleaseEty> releaseEtyListsBegin = new ArrayList<>();
     private int type = 0;
+    private String show_type;
     private int is_succession;//0:一般任务 1:连续任务
 
     private void checkAndInitView() {
@@ -97,6 +99,14 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         fgtTryMakeMoney.setArguments(bundle);
         return fgtTryMakeMoney;
     }
+    public static FgtTryMakeMoney newInstance(int type,String show_type){
+        FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+        bundle.putString("show_type", show_type);
+        fgtTryMakeMoney.setArguments(bundle);
+        return fgtTryMakeMoney;
+    }
 
     public FgtTryMakeMoney() {
     }
@@ -109,6 +119,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         Bundle bundle = getArguments();
         if(bundle != null){
             type = bundle.getInt("type", 0);
+            show_type = bundle.getString("show_type", "");
         }
         return rootView;
     }
@@ -150,6 +161,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         tryMakeMoneyAdp.addType(type);
+        tryMakeMoneyAdp.addShowType(show_type);
         tryMakeMoneyAdp.setIs_succession(is_succession);
         tryMakeMoneyAdp.addPresenter(presenter);
         for (int i = 0; i < LIST_COUNT; i++) {
@@ -204,7 +216,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
         CommonUtil.getInstance().resetEmptyView(empty_view);
         //加载缓存
-        type = 0;
+        if(TextUtils.isEmpty(show_type))
+            type = 0;
         if(isFirstCache){
             //注释掉获取缓存的正在进行的任务
             List<TaskAcceptedEty> cacheTaskAcceptedEtyList;
@@ -226,7 +239,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             getFromACache(type);
         }
         //加载网络数据
-        type = 0;
+        if(TextUtils.isEmpty(show_type))
+            type = 0;
         getFromNetWork(type);
     }
 
@@ -346,7 +360,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             }
             notifyDataSetChanged();
         }
-        getFromNetWork(++type);
+        getFromNetWorkFirst(type);
     }
 
     @Override
@@ -360,7 +374,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 break;
         }
         notifyDataSetChanged();
-        getFromNetWork(++type);
+        getFromNetWorkFirst(type);
     }
 
     @Subscribe
@@ -396,6 +410,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      * 发布的任务
      * type: 0 1
      */
+    private void getFromAcacheFirst(int type){
+        if(TextUtils.isEmpty(show_type)){
+            getFromACache(++type);
+        }
+    }
     private void getFromACache(int type){
         if(type > 1){
             return;
@@ -409,7 +428,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                     releaseEtyLists.clear();
                     releaseEtyLists.addAll(cacheTaskReleaseEtyList);
                     notifyDataSetChanged();
-                    getFromACache(++type);
+                    getFromAcacheFirst(type);
                 }
                 break;
             case 1:
@@ -419,7 +438,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                     releaseEtyListsBegin.clear();
                     releaseEtyListsBegin.addAll(cacheTaskReleaseEtyList);
                     notifyDataSetChanged();
-                    getFromACache(++type);
+                    getFromAcacheFirst(type);
                 }
                 break;
         }
@@ -428,6 +447,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      * 发布的任务
      * type: 0 1
      */
+    private void getFromNetWorkFirst(int type){
+        if(TextUtils.isEmpty(show_type)){
+            getFromNetWork(++type);
+        }
+    }
     private void getFromNetWork(int type){
         if(type > 1){
             initAcceptedTaskList();
@@ -439,7 +463,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                         .setHashMap(1,
                                 100,
                                 SheepApp.getInstance().getConnectAddress().getPlatForm(),
-                                0,
+                                TextUtils.isEmpty(show_type)?0:show_type.equals("is_hot")?1:0,
                                 0,
                                 type,
                                 task_type,