2.2 版本 代码修改

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

@@ -622,7 +622,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         try {
             List<SlideshowEty> slideshowEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), SlideshowEty.class);
-            if (slideshowEtyList != null) {
+            if (slideshowEtyList != null && slideshowEtyList.size()>0) {
                 slideshowEtyLists.clear();
                 slideshowEtyLists.addAll(slideshowEtyList);
 
@@ -646,7 +646,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         try {
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
-            if (bulletinEntyList != null) {
+            if (bulletinEntyList != null && bulletinEntyList.size() >0) {
                 bulletinEntyLists.clear();
                 bulletinEntyLists.addAll(bulletinEntyList);
                 inviteNotice(bulletinEntyLists);

app/src/main/java/com/sheep/gamegroup/di/components/FgtTryMakeMoneyComponent.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/4/26.
+ */
+
+@UserScope
+@Component(modules = TryMakeMoneyModule.class, dependencies = NetComponent.class)
+public interface FgtTryMakeMoneyComponent {
+    void inject(FgtTryMakeMoney fgtTryMakeMoney);
+}

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

@@ -2,42 +2,17 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
-import com.sheep.gamegroup.di.components.DaggerTryMakeMoneyComponent;
-import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.RecyleObj;
-import com.sheep.gamegroup.model.entity.RecyleType;
-import com.sheep.gamegroup.model.entity.RequestParameEty;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
-import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -46,28 +21,12 @@ import butterknife.ButterKnife;
  * Created by ljy on 2018/3/10.
  */
 
-public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContract.View{
-    @BindView(R.id.recyclerview)
-    RecyclerView recyclerview;
-    @BindView(R.id.refresh)
-    SwipeRefreshLayout refresh;
-
-    @Inject
-    TryMakeMoneyPresenter presenter;
+public class TryMakeMoneyact extends BaseActivity {
+    @BindView(R.id.indicator)
+    TabLayout indicator;
+    @BindView(R.id.pager)
+    ViewPager pager;
     private Activity activity;
-    private TryMakeMoneyAdp tryMakeMoneyAdp;
-    private int position = 0;
-    private  List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
-
-    Handler mhandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
-            tryMakeMoneyAdp.notifyDataSetChanged();
-        }
-    };
 
     @Override
     protected int getLayoutId() {
@@ -82,174 +41,19 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
                 .setTitleFinish(activity);
-        DaggerTryMakeMoneyComponent.builder()
-                .netComponent(SheepApp.get(this).getNetComponent())
-                .tryMakeMoneyModule(new TryMakeMoneyModule(this))
-                .build()
-                .inject(this);
-        recyclerview.setLayoutManager(new LinearLayoutManager(activity));
-        tryMakeMoneyAdp = new TryMakeMoneyAdp(this);
-        for (int i = 0; i < 2; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-        recyclerview.setAdapter(tryMakeMoneyAdp);
     }
 
     @Override
     public void initListener() {
-        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                initData();
-                refresh.setRefreshing(false);
-            }
-        });
-        recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-            }
-
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-
-                int topRowVerticalPosition =
-                        (recyclerView == null || recyclerView.getChildCount() == 0) ? 0 : recyclerView.getChildAt(0).getTop();
-
-                refresh.setEnabled(topRowVerticalPosition >= 0);
-            }
-        });
     }
 
     @Override
     public void initData() {
-        showProgress(false);
-        position = 0;
-        tryMakeMoneyAdp.clear();
-        tryMakeMoneyAdp.addType(0);
-        for (int i = 0; i < 2; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-        tryMakeMoneyAdp.setTaskAcceptedEty(null);
-        RequestParameEty parameEty = new RequestParameEty();
-        parameEty.setHashMap(CommonUtil.getInstance().setHashMap(1,100,1,
-                0,1,0));
-        presenter.releaseTask(parameEty);
-    }
-
-    @Override
-    public void updateData2View(Object o) {
-
-    }
-
-    @Override
-    public void failData2View(Object o) {
-
-    }
-
-    @Override
-    public void acceptedTaskUpdataView(Object o) {
-
-    }
-
-    @Override
-    public void failAcceptedTask2View(Object o) {
-        hideProgress();
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            switch (baseMessage.getCode()){
-                case 300://未查询到数据
-                    G.showToast(" 未查询到数据！");
-                    break;
-                default:
-                    G.showToast(" 网络错误！");
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            G.showToast(" 网络错误！");
-        }
-    }
-
-    @Override
-    public void giveUpTaskSuccesView(Object o) {
-        G.showToast("取消任务成功");
-        initData();
-    }
-
-    @Override
-    public void giveUpTaskFailView(Object o) {
-        G.showToast("访问失败");
-    }
-
-    @Override
-    public void returnTaskTaskUpdataView(Object o) {
-
-        hideProgress();
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
-            tryMakeMoneyAdp.addPresenter(presenter);
-            tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
-            position ++;
-//            mhandler.sendEmptyMessage(0);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        mhandler.sendEmptyMessage(0);
-    }
-
-    @Override
-    public void failReturnTask2View(Object o) {
-        hideProgress();
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            switch (baseMessage.getCode()){
-                case 300://未查询到正在运行的任务
-//                    G.showToast(" 未查询到正在运行的任务！");
-                    break;
-                default:
-                    G.showToast(" 网络错误！");
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            G.showToast(" 网络错误！");
-        }
-        mhandler.sendEmptyMessage(0);
-    }
-
-    /**
-     *  获取已经发布任务
-     * @param o
-     */
-    @Override
-    public void releaseTaskTaskUpdataView(Object o) {
-        releaseEtyLists.clear();
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-            if(releaseEtyList != null){
-                releaseEtyLists.addAll(releaseEtyList);
-            }
-
-//            mhandler.sendEmptyMessage(0);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        presenter.returnTask(null);
-    }
-
-    @Override
-    public void failReleaseTask2View(Object o) {
-
-        presenter.returnTask(null);
     }
 
     @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
             case ONFRESH_TRYMAKEMANY_PAGE:
                 initData();
                 break;
@@ -262,46 +66,16 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
         EventBus.getDefault().unregister(this);
     }
-    /**
-     * 滚动到顶部
-     */
-    private boolean move;
-    private String string = "0";
-    private void goTop(){
-        final LinearLayoutManager manager = (LinearLayoutManager) recyclerview.getLayoutManager();
-        int fir = manager.findFirstVisibleItemPosition();
-        int end = manager.findLastVisibleItemPosition();
-        final int p = Integer.parseInt(string);
-        if (p <= fir) {
-            recyclerview.scrollToPosition(p);
-        } else if (p <= end) {
-            int top = recyclerview.getChildAt(p - fir).getTop();
-            recyclerview.scrollBy(0, top);
-        } else {
-            recyclerview.scrollToPosition(p);    //先让当前view滚动到列表内
-            move = true;
-        }
-        recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener()
-        {
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
-                if (move) {
-                    move = false;
-                    int n = p - manager.findFirstVisibleItemPosition();
-                    if (n >= 0 && n < recyclerView.getChildCount()) {
-                        recyclerView.scrollBy(0, recyclerView.getChildAt(n).getTop()); //滚动到顶部
-                    }
-                }
-            }
-        });
-    }
 
     @Override
     protected void onStop() {
         super.onStop();
-        if(tryMakeMoneyAdp != null){
-            tryMakeMoneyAdp.cancelAllTimers();
-        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
     }
 }

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

@@ -176,6 +176,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 }else{
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
+                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
                 }
                 if(i == getItemCount()-1){
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
@@ -188,6 +189,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
                         "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
+                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("领取任务");
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -271,6 +273,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
                         "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getRelease_task().getDeadline()))+"");
 
+                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

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

@@ -0,0 +1,338 @@
+package com.sheep.gamegroup.view.fragment;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.event.BigEvent;
+import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
+import com.sheep.gamegroup.di.components.DaggerTryMakeMoneyComponent;
+import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.RecyleObj;
+import com.sheep.gamegroup.model.entity.RecyleType;
+import com.sheep.gamegroup.model.entity.RequestParameEty;
+import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
+import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+/**
+ * 试玩赚钱
+ * Created by ljy on 2018/4/26.
+ */
+
+public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContract.View{
+    @BindView(R.id.recyclerview)
+    RecyclerView recyclerview;
+    @BindView(R.id.refresh)
+    SwipeRefreshLayout refresh;
+    Unbinder unbinder;
+
+    @Inject
+    TryMakeMoneyPresenter presenter;
+    private Activity activity;
+    private TryMakeMoneyAdp tryMakeMoneyAdp;
+    private int position = 0;
+    private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
+    private int type = 0;
+
+    Handler mhandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
+            tryMakeMoneyAdp.notifyDataSetChanged();
+        }
+    };
+
+    static FgtTryMakeMoney newInstance(int type){
+        FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+        fgtTryMakeMoney.setArguments(bundle);
+        return fgtTryMakeMoney;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fgt_try_makemoney_layout;
+    }
+
+    @Override
+    public void onViewCreated() {
+        EventBus.getDefault().register(this);
+        activity = getActivity();
+        TitleBarUtils
+                .getInstance()
+                .setTitle(activity, "试玩赚钱")
+                .setTitleFinish(activity);
+        DaggerFgtTryMakeMoneyComponent.builder()
+                .netComponent(SheepApp.get(activity).getNetComponent())
+                .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney.this))
+                .build()
+                .inject(FgtTryMakeMoney.this);
+        recyclerview.setLayoutManager(new LinearLayoutManager(activity));
+        tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
+        for (int i = 0; i < 2; i++) {
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        }
+        recyclerview.setAdapter(tryMakeMoneyAdp);
+
+        initListener();
+        initData();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // TODO: inflate a fragment view
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
+        Bundle bundle = getArguments();
+        if(bundle != null){
+            type = bundle.getInt("type", 0);
+        }
+        return rootView;
+    }
+    public void initListener() {
+        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                initData();
+                refresh.setRefreshing(false);
+            }
+        });
+        recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+            }
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+
+                int topRowVerticalPosition =
+                        (recyclerView == null || recyclerView.getChildCount() == 0) ? 0 : recyclerView.getChildAt(0).getTop();
+
+                refresh.setEnabled(topRowVerticalPosition >= 0);
+            }
+        });
+    }
+    public void initData() {
+        showProgress(false);
+        position = 0;
+        tryMakeMoneyAdp.clear();
+        tryMakeMoneyAdp.addType(0);
+        for (int i = 0; i < 2; i++) {
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        }
+        tryMakeMoneyAdp.setTaskAcceptedEty(null);
+        RequestParameEty parameEty = new RequestParameEty();
+        parameEty.setHashMap(CommonUtil.getInstance().setHashMap(1,100,1,
+                0,0,0));
+        presenter.releaseTask(parameEty);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Override
+    public void updateData2View(Object o) {
+
+    }
+
+    @Override
+    public void failData2View(Object o) {
+
+    }
+
+    @Override
+    public void acceptedTaskUpdataView(Object o) {
+
+    }
+
+    @Override
+    public void failAcceptedTask2View(Object o) {
+        hideProgress();
+        try {
+            BaseMessage baseMessage = (BaseMessage) o;
+            switch (baseMessage.getCode()){
+                case 300://未查询到数据
+                    G.showToast(" 未查询到数据！");
+                    break;
+                default:
+                    G.showToast(" 网络错误！");
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            G.showToast(" 网络错误！");
+        }
+    }
+
+    @Override
+    public void giveUpTaskSuccesView(Object o) {
+        G.showToast("取消任务成功");
+        initData();
+    }
+
+    @Override
+    public void giveUpTaskFailView(Object o) {
+        G.showToast("访问失败");
+    }
+
+    @Override
+    public void returnTaskTaskUpdataView(Object o) {
+
+        hideProgress();
+        try{
+            BaseMessage baseMessage = (BaseMessage) o;
+            TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
+            tryMakeMoneyAdp.addPresenter(presenter);
+            tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
+            position ++;
+//            mhandler.sendEmptyMessage(0);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        mhandler.sendEmptyMessage(0);
+    }
+
+    @Override
+    public void failReturnTask2View(Object o) {
+        hideProgress();
+        try {
+            BaseMessage baseMessage = (BaseMessage) o;
+            switch (baseMessage.getCode()){
+                case 300://未查询到正在运行的任务
+//                    G.showToast(" 未查询到正在运行的任务！");
+                    break;
+                default:
+                    G.showToast(" 网络错误！");
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            G.showToast(" 网络错误！");
+        }
+        mhandler.sendEmptyMessage(0);
+    }
+
+    /**
+     *  获取已经发布任务
+     * @param o
+     */
+    @Override
+    public void releaseTaskTaskUpdataView(Object o) {
+        releaseEtyLists.clear();
+        try{
+            BaseMessage baseMessage = (BaseMessage) o;
+            List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+            if(releaseEtyList != null){
+                releaseEtyLists.addAll(releaseEtyList);
+            }
+
+//            mhandler.sendEmptyMessage(0);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        presenter.returnTask(null);
+    }
+
+    @Override
+    public void failReleaseTask2View(Object o) {
+
+        presenter.returnTask(null);
+    }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case ONFRESH_TRYMAKEMANY_PAGE:
+                initData();
+                break;
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+    /**
+     * 滚动到顶部
+     */
+    private boolean move;
+    private String string = "0";
+    private void goTop(){
+        final LinearLayoutManager manager = (LinearLayoutManager) recyclerview.getLayoutManager();
+        int fir = manager.findFirstVisibleItemPosition();
+        int end = manager.findLastVisibleItemPosition();
+        final int p = Integer.parseInt(string);
+        if (p <= fir) {
+            recyclerview.scrollToPosition(p);
+        } else if (p <= end) {
+            int top = recyclerview.getChildAt(p - fir).getTop();
+            recyclerview.scrollBy(0, top);
+        } else {
+            recyclerview.scrollToPosition(p);    //先让当前view滚动到列表内
+            move = true;
+        }
+        recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener()
+        {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                if (move) {
+                    move = false;
+                    int n = p - manager.findFirstVisibleItemPosition();
+                    if (n >= 0 && n < recyclerView.getChildCount()) {
+                        recyclerView.scrollBy(0, recyclerView.getChildAt(n).getTop()); //滚动到顶部
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if(tryMakeMoneyAdp != null){
+            tryMakeMoneyAdp.cancelAllTimers();
+        }
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -44,6 +44,19 @@ public abstract class BaseFragment extends Fragment {
         mPd.show();
     }
 
+    protected void  showProgress(boolean cancel){
+        if(mPd!=null){
+            hideProgress();
+        }
+        mPd = new ProgressDialog(getActivity());
+//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
+//        mPd.setContentView(view);//自己定义布局
+        mPd.setMessage("数据加载中...");
+        mPd.setCancelable(cancel);//能否够被取消
+//        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
+        mPd.show();
+    }
+
 
     protected void  hideProgress(){
         if(mPd!=null){

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/bg_gray">
+
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/content_padding_10">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"></android.support.v7.widget.RecyclerView>
+    </android.support.v4.widget.SwipeRefreshLayout>
+</LinearLayout>

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

@@ -8,17 +8,20 @@
     <include
         layout="@layout/title"/>
 
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/refresh"
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/content_padding_10">
+        android:layout_height="40dp"
+        android:src="@mipmap/icon"/>
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recyclerview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"></android.support.v7.widget.RecyclerView>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
 
 </LinearLayout>