游戏任务缓存相关

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

@@ -994,8 +994,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                 break;
             case 6://连续任务
-                Jump2View.getInstance()
-                        .goTryplayView(activity, 1);
+                Jump2View.getInstance().goSequentialTaskView(activity);
                 break;
             case 9://打卡赚钱
                 showToast("打卡赚钱");

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

@@ -1,17 +0,0 @@
-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.FgtGameMakeMoney;
-
-import dagger.Component;
-
-/**
- * Created by ljy on 2018/6/12.
- */
-
-@UserScope
-@Component(modules = TryMakeMoneyModule.class, dependencies = NetComponent.class)
-public interface FgtMakeMoneyComponent {
-    void inject(FgtGameMakeMoney fgtGameMakeMoney);
-}

app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyContract.java

@@ -12,6 +12,7 @@ public interface TryMakeMoneyContract {
         void getData(Object o);
         void acceptedTask(RequestParameEty o);//获取已接受的任务
         void returnTask(int is_succession);//获取我正在运行的任务
+        void runGameTask();//获取正在运行的游戏任务
         void releaseTask(RequestParameEty o);//获取正在运行的任务
 
         void giveUpTask(int id);//放弃任务接口

app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyPresenter.java

@@ -71,6 +71,25 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
                     }
                 });
     }
+    @Override
+    public void runGameTask() {
+
+        apiService.run_game_task()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.failReturnTask2View(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.returnTaskTaskUpdataView(baseMessage);
+
+                    }
+                });
+    }
 
     @Override
     public void releaseTask(RequestParameEty o) {

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -426,7 +426,7 @@ public class CommonUtil {
                         entity.getUrl(), "微信二维码辅助好友注册任务");
                 break;
             case 8://连续任务
-                Jump2View.getInstance().goTryplayView(context, 1);
+                Jump2View.getInstance().goSequentialTaskView(context);
                 break;
             case 9://打卡赚钱
                 Jump2View.getInstance().goSignCardAct(context, null);

app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -45,7 +45,7 @@ public enum ConnectAddress {
 
         @Override
         public String getAppUrl() {
-            return "http://test.sheep.kfzs.com/";
+            return "http://testnei.ss.kfzs.com/";
         }
         @Override
         public String getName() {
@@ -55,7 +55,7 @@ public enum ConnectAddress {
 
         @Override
         public String getAppUrl() {
-            return "http://testnei.ss.kfzs.com/";
+            return "http://simul.ss.kfzs.com/";
         }
 
         @Override

app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -366,6 +366,9 @@ public class DataUtil {
             ListUtil.removeItem(taskList, new ListUtil.CallBack<TaskAcceptedEty, Boolean>() {
                 @Override
                 public Boolean call(TaskAcceptedEty taskAcceptedEty) {
+                    if(taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().getDeadline().equals("永久")){//永久任务
+                        return false;
+                    }
                     long endTime = getTaskAcceptedSaveTime(taskAcceptedEty);
                     long newEndTime = endTime - (System.currentTimeMillis() - saveTime) / 1000;
                     if (newEndTime < 1) {//时间到了，删除该任务

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -371,13 +371,19 @@ public class Jump2View {
      */
     public void goTryplayView(Context context, Object o){
         Intent intent = new Intent(context, TryMakeMoneyact.class);
-        intent.putExtra("is_succession", o instanceof Integer ? (Integer)o : 0);
+        intent.putExtra("is_succession", 0);
         context.startActivity(intent);
-        if(o == Integer.valueOf(1)){
-            UMConfigUtils.Event.SHEEP_GAME_TASK.onEvent();
-        } else {
-            UMConfigUtils.Event.SHEEP_TASK_TRY.onEvent();
-        }
+        UMConfigUtils.Event.SHEEP_TASK_TRY.onEvent();
+    }
+    /**
+     * 跳到试玩界面
+     * @param context
+     */
+    public void goSequentialTaskView(Context context){
+        Intent intent = new Intent(context, TryMakeMoneyact.class);
+        intent.putExtra("is_succession", 1);
+        context.startActivity(intent);
+        UMConfigUtils.Event.SHEEP_SEQUENTIAL_TASK.onEvent();
     }
 
     /**

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

@@ -20,8 +20,8 @@ import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.AdpTrymakemoneyTabGridview;
-import com.sheep.gamegroup.view.fragment.FgtGameMakeMoney;
 import com.sheep.gamegroup.view.fragment.FgtMyGame;
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -98,33 +98,13 @@ public class GamemakeMoneyAct extends BaseActivity {
                 });
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
-        mAdapter.add(FgtGameMakeMoney.newInstance(0), titles[0]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
         mAdapter.add(FgtMyGame.newInstance(2), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
 
         tabGridviewAdp = new AdpTrymakemoneyTabGridview(activity, gridviewList);
         tabGridview.setAdapter(tabGridviewAdp);
-        indicator.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-//                if(tab.getPosition() == 0){
-//                    task_gridview_layout.setVisibility(View.VISIBLE);
-//                }else {
-//                    task_gridview_layout.setVisibility(View.GONE);
-//                }
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
         pager.setCurrentItem(currentItem);
         CommonUtil.getInstance().reflex(indicator, activity);
     }

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

@@ -363,7 +363,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                     Jump2View.getInstance().goWeb(activity, advertising.getLink(), "微信二维码辅助好友注册任务");
                     break;
                 case 7:
-                    Jump2View.getInstance().goTryplayView(activity, 1);
+                    Jump2View.getInstance().goSequentialTaskView(activity);
                     break;
                 case 8:
                     Jump2View.getInstance().goSignCardAct(activity, null);

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

@@ -1,479 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-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.kfzs.duanduan.event.BigEvent;
-import com.sheep.gamegroup.di.components.DaggerFgtMakeMoneyComponent;
-import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.GridViewEntity;
-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.model.util.SheepSubscriber;
-import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
-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.gamegroup.presenter.TryMakeMoneyContract;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-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;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by ljy on 2018/6/12.
- */
-
-public class FgtGameMakeMoney extends BaseFragment implements TryMakeMoneyContract.View {
-    @BindView(R.id.recyclerview)
-    RecyclerView recyclerview;
-    @BindView(R.id.refresh)
-    SwipeRefreshLayout refresh;
-    @BindView(R.id.empty_view)
-    View empty_view;
-    Unbinder unbinder;
-
-    @Inject
-    TryMakeMoneyPresenter presenter;
-    private Activity activity;
-    private TryMakeMoneyAdp tryMakeMoneyAdp;
-    private int position = 0;
-    private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
-    private List<TaskReleaseEty> releaseEtyListsBegin = new ArrayList<>();
-    private int type = 0;
-    private GridViewEntity gridViewEntity;//选中的
-    private int is_succession;//0:一般任务 1:连续任务
-
-    private void checkAndInitView() {
-        if(refresh == null)
-            refresh = findViewById(R.id.refresh);
-        if(empty_view == null)
-            empty_view = findViewById(R.id.empty_view);
-    }
-    private void notifyDataSetChanged(){
-        checkAndInitView();
-        tryMakeMoneyAdp.refreshAdapter();
-        if(tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty()){
-            CommonUtil.getInstance().updateEmptyView(empty_view, true);
-        }else {
-            empty_view.setVisibility(View.GONE);
-        }
-        refresh.setRefreshing(false);
-    }
-    public static FgtGameMakeMoney newInstance(int type){
-        FgtGameMakeMoney fgtTryMakeMoney = new FgtGameMakeMoney();
-        Bundle bundle = new Bundle();
-        bundle.putInt("type", type);
-        fgtTryMakeMoney.setArguments(bundle);
-        return fgtTryMakeMoney;
-    }
-
-    public FgtGameMakeMoney() {
-    }
-
-    @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;
-    }
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.fgt_try_makemoney_layout;
-    }
-
-    @Override
-    public void onViewCreated() {
-        activity = getActivity();
-
-        initView();
-    }
-
-    public void initView() {
-        if(activity instanceof GamemakeMoneyAct)
-            is_succession = ((GamemakeMoneyAct) activity).getIsSuccession();//0:一般任务 1:连续任务
-        EventBus.getDefault().register(this);
-        DaggerFgtMakeMoneyComponent.builder()
-                .netComponent(SheepApp.get(activity).getNetComponent())
-                .tryMakeMoneyModule(new TryMakeMoneyModule(FgtGameMakeMoney.this))
-                .build()
-                .inject(FgtGameMakeMoney.this);
-        recyclerview.setLayoutManager(new LinearLayoutManager(activity));
-        tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
-        for (int i = 0; i < 3; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-        recyclerview.setAdapter(tryMakeMoneyAdp);
-
-        initListener();
-
-    }
-
-    public void initListener() {
-        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                initData();
-            }
-        });
-        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 reFresh(){
-//        if(refresh.isRefreshing()){
-//            return;
-//        }
-        refresh.setRefreshing(true);
-        initData();
-    }
-    public void initData() {
-        empty_view.setVisibility(View.GONE);
-        type = 0;
-        position = 0;
-        releaseEtyLists.clear();
-        tryMakeMoneyAdp.clear();
-        tryMakeMoneyAdp.addType(type);
-        for (int i = 0; i < 3; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-        tryMakeMoneyAdp.setIs_succession(is_succession);
-        if(activity instanceof GamemakeMoneyAct) {
-            gridViewEntity = ((GamemakeMoneyAct) activity).getTabValue();
-            if (activity instanceof GamemakeMoneyAct)
-                SheepApp.getInstance()
-                        .getNetComponent()
-                        .getApiService()
-                        .run_game_task()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                hideProgress();
-                                try {
-                                    switch (baseMessage.getCode()) {
-                                        case 300://未查询到数据
-                                            G.showToast(" 未查询到数据！");
-                                            break;
-                                        default:
-                                            G.showToast(" 网络错误！");
-                                            break;
-                                    }
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                    G.showToast(" 网络错误！");
-                                }
-                                getNetWork(type);
-//                            notifyDataSetChanged();
-                            }
-
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                hideProgress();
-                                try {
-                                    List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-                                    if (taskAcceptedEty != null && taskAcceptedEty.size() > 0) {
-                                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty), 0);
-                                        tryMakeMoneyAdp.addPresenter(presenter);
-                                        position++;
-                                    }
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                                getNetWork(type);
-                                notifyDataSetChanged();
-
-                            }
-                        });
-        }
-    }
-
-    @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) {
-        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("取消任务成功");
-        CommonUtil.getInstance().setTAskEnty(null);
-        reFresh();
-    }
-
-    @Override
-    public void giveUpTaskFailView(Object o) {
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            G.showToast(baseMessage.getMsg()+"");
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void returnTaskTaskUpdataView(Object o) {
-
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
-                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
-                tryMakeMoneyAdp.addPresenter(presenter);
-                position ++;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        getNetWork(type);
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public void failReturnTask2View(Object o) {
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            switch (baseMessage.getCode()){
-                case 300://未查询到正在运行的任务
-//                    G.showToast(" 未查询到正在运行的任务！");
-                    break;
-                default:
-                    G.showToast(" 网络错误！");
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            G.showToast(" 网络错误！");
-        }
-        getNetWork(type);
-        notifyDataSetChanged();
-    }
-
-    /**
-     *  获取已经发布任务
-     * @param o
-     */
-    @Override
-    public void releaseTaskTaskUpdataView(Object o) {
-        try{
-            if(type == 0){
-                type = 1;
-
-
-                BaseMessage baseMessage = (BaseMessage) o;
-                List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-                if(releaseEtyList != null){
-                    releaseEtyLists.addAll(releaseEtyList);
-                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
-                    position++;
-                }
-
-                getNetWork(type);
-            }else if(type == 1){
-                BaseMessage baseMessage = (BaseMessage) o;
-                List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-                if(releaseEtyList != null){
-                    releaseEtyListsBegin.clear();
-                    releaseEtyListsBegin.addAll(releaseEtyList);
-                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin),position);
-                    position++;
-                }
-            }
-
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public void failReleaseTask2View(Object o) {
-
-        if(type == 0){
-            type = 1;
-            getNetWork(type);
-        }
-        notifyDataSetChanged();
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
-            case ONFRESH_TRYMAKEMANY_PAGE:
-//                reFresh();
-                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();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (presenter != null) {
-            reFresh();
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        try {
-
-            if(tryMakeMoneyAdp != null){
-
-                tryMakeMoneyAdp.refreshAdapter();
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 即将开始
-     * type: 0 1
-     * task_type:1002平台游戏，1003 腾讯游戏，1004 小米游戏
-     */
-    private void getNetWork(int type){
-        if(type > 1){
-            return;
-        }
-        RequestParameEty parameEty = new RequestParameEty();
-        parameEty.setHashMap(
-                CommonUtil.getInstance()
-                        .setHashMap(1,
-                                100,
-                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
-                                0,
-                                0,
-                                type,
-                                1002 + ","+ 1003,
-                                0));
-        presenter.releaseTask(parameEty);
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.view.fragment;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -23,6 +24,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.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.R;
@@ -61,7 +63,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Inject
     TryMakeMoneyPresenter presenter;
-    private TryMakeMoneyact activity;
+    private Activity activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private List<TaskAcceptedEty> acceptedEtyList = new ArrayList<>();
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
@@ -118,16 +120,24 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void onViewCreated() {
-
+        activity = getActivity();
         initView();
     }
-
+    private String task_type = "-1";
+    private boolean isGameTask = false;
     public void initView() {
-        activity = (TryMakeMoneyact) getActivity();
         if(activity == null){
             return;
         }
-        is_succession = activity.getIsSuccession();//0:一般任务 1:连续任务
+        if(activity instanceof TryMakeMoneyact) {//试玩任务、连续任务
+            is_succession = ((TryMakeMoneyact) activity).getIsSuccession();
+            task_type = "-1";
+            isGameTask = false;
+        } else if(activity instanceof GamemakeMoneyAct) {//游戏任务
+            is_succession = ((GamemakeMoneyAct) activity).getIsSuccession();
+            task_type = "1002,1003,1004";
+            isGameTask = true;
+        }
         EventBus.getDefault().register(this);
 //        ButterKnife.bind(this, mContentView);
         DaggerFgtTryMakeMoneyComponent.builder()
@@ -138,11 +148,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         tryMakeMoneyAdp.addType(type);
-        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         tryMakeMoneyAdp.setIs_succession(is_succession);
         tryMakeMoneyAdp.addPresenter(presenter);
+        for (int i = 0; i < 3; i++) {
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        }
         recyclerview.setAdapter(tryMakeMoneyAdp);
 
         initListener();
@@ -181,19 +191,19 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     //强制刷新数据
     public void refreshData(){
         isFirstCache = false;
-        mInitData();
-    }
-    public void reFresh(){
-        isFirstCache = false;
         refresh.setRefreshing(true);
         mInitData();
     }
     public void mInitData() {
-        empty_view.setVisibility(View.GONE);
         type = 0;
 
         if(isFirstCache){
-            List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getTaskAcceptedTaskList(is_succession);
+            List<TaskAcceptedEty> cacheTaskAcceptedEtyList;
+            if(isGameTask) {
+                cacheTaskAcceptedEtyList = DataUtil.getInstance().getGameTaskList();
+            } else {
+                cacheTaskAcceptedEtyList = DataUtil.getInstance().getTaskAcceptedTaskList(is_succession);
+            }
             if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {
                 acceptedEtyList.clear();
             } else {
@@ -201,7 +211,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             }
             getNetWork(type);
         } else {
-            presenter.returnTask(is_succession);
+            if(isGameTask){
+                presenter.runGameTask();
+            } else {
+                presenter.returnTask(is_succession);
+            }
         }
     }
 
@@ -250,7 +264,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void giveUpTaskSuccesView(Object o) {
         G.showToast("取消任务成功");
         CommonUtil.getInstance().setTAskEnty(null);
-        reFresh();
+        refreshData();
     }
 
     @Override
@@ -267,7 +281,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void returnTaskTaskUpdataView(Object object) {
         if(object instanceof BaseMessage) {
             List<TaskAcceptedEty> taskAcceptedEty = ((BaseMessage) object).getDataList(TaskAcceptedEty.class);
-            if(!ListUtil.isEmpty(taskAcceptedEty)) {
+            if(ListUtil.isEmpty(taskAcceptedEty)) {
                 acceptedEtyList.clear();
             } else {
                 acceptedEtyList = taskAcceptedEty;
@@ -322,16 +336,17 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private void loadReleaseOrNotifyAdapter(){
         switch (type){
             case 0://获取已经发布任务
-                if(ListUtil.isEmpty(releaseEtyLists)){
-                    DataUtil.getInstance().resetCacheTime(ApiKey.release_task(type, is_succession), DEFAULT_SAVE_TIME);
+                if(ListUtil.isEmpty(releaseEtyLists)){//获取过数据，但是没有数据，直接保存空数据，以便下次不重复调接口
+                    DataUtil.getInstance().resetCacheTime(ApiKey.release_task(type, task_type, is_succession), DEFAULT_SAVE_TIME);
                 }
                 break;
             case 1://即将开始的任务列表
                 if(ListUtil.isEmpty(releaseEtyListsBegin)){
-                    DataUtil.getInstance().resetCacheTime(ApiKey.release_task(type, is_succession), DEFAULT_SAVE_TIME);
+                    DataUtil.getInstance().resetCacheTime(ApiKey.release_task(type, task_type, is_succession), DEFAULT_SAVE_TIME);
                 }
                 break;
         }
+        notifyDataSetChanged();
         getNetWork(++type);
     }
 
@@ -339,7 +354,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void onEventMainThread(BigEvent event){
         switch (event.getEventTypes()){
             case ONFRESH_TRYMAKEMANY_PAGE:
-                reFresh();
                 break;
         }
     }
@@ -380,11 +394,10 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     private void getNetWork(int type){
         if(type > 1){
-            notifyDataSetChanged();
             return;
         }
         if(isFirstCache){
-            List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, is_succession), TaskReleaseEty.class);
+            List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, is_succession), TaskReleaseEty.class);
             switch (type){
                 case 0:
                     if(cacheTaskReleaseEtyList == null) {
@@ -393,6 +406,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                         getNetWork(type);
                     } else {
                         releaseEtyLists = cacheTaskReleaseEtyList;
+                        notifyDataSetChanged();
                         getNetWork(++type);
                     }
                     break;
@@ -403,6 +417,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                         getNetWork(type);
                     } else {
                         releaseEtyListsBegin = cacheTaskReleaseEtyList;
+                        notifyDataSetChanged();
                         getNetWork(++type);
                     }
                     break;
@@ -417,7 +432,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                                     0,
                                     0,
                                     type,
-                                    -1 + "",
+                                    task_type,
                                     is_succession));
             presenter.releaseTask(parameEty);
         }

app/src/main/java/org/afinal/simplecache/ApiKey.java

@@ -36,8 +36,9 @@ public class ApiKey {
     public static final String award_detail = "app/user/award_detail?page=0&per_page=100";
     //首页获取所有发布的热门任务（试玩任务、游戏任务、连续任务）
     public static final String release_task = "app/release_task?page=1&per_page=100&platform=1&is_hot=1&is_recommend=0&about_to_begin=0&task_type=-1&is_succession=3";
-    public static String release_task(int type, int is_succession){
-        return String.format(Locale.CHINA, "app/release_task?page=1&per_page=100&platform=1&is_hot=0&is_recommend=0&about_to_begin=%d&task_type=-1&is_succession=%d", type, is_succession);
+    public static String release_task(int type, String task_type, int is_succession){
+        task_type = task_type.replaceAll(",", "%2C");
+        return String.format(Locale.CHINA, "app/release_task?page=1&per_page=100&platform=1&is_hot=0&is_recommend=0&about_to_begin=%d&task_type=%s&is_succession=%d", type, task_type, is_succession);
     }
     //获取正在运行的任务（试玩任务、游戏任务、连续任务）
     public static String new_run_task(int is_succession){