Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

# Conflicts:
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

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

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
@@ -47,7 +46,6 @@ import com.sheep.gamegroup.model.entity.BulletinEnty;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
 import com.sheep.gamegroup.model.entity.NewbieTask;
-import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
@@ -76,6 +74,7 @@ import com.sheep.gamegroup.view.activity.NotificationsUtils;
 import com.sheep.gamegroup.view.adapter.AdpHomeListGrideview;
 import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
+import com.sheep.gamegroup.view.customview.SheepViewPager;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -139,7 +138,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @BindView(R.id.card_layout)
     LinearLayout card_layout;
     @BindView(R.id.viewpager_banner)
-    ViewPager viewpager_banner;
+    SheepViewPager viewpager_banner;
     @BindView(R.id.group_banner)
     RadioGroup group_banner;
     @BindView(R.id.scrollView)
@@ -365,7 +364,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                -1));
+                                -1,
+                                0));
 
         tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -456,8 +456,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
     }
 
-    private NewbieTaskRecord newbie_task_record;
-
     @Override
     public void updateData2View(Object o) {
         if (o == null) {
@@ -567,12 +565,17 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         } catch (Exception e) {
             e.printStackTrace();
         }
-        tryMakeMoneyPresenter.returnTask(null);
+        //请求正在运行中的任务
+        CommonUtil.getInstance()
+                .getRunTask(tryMakeMoneyPresenter,
+                        0);
     }
 
     @Override
     public void failReleaseTask2View(Object o) {
-        tryMakeMoneyPresenter.returnTask(null);
+        CommonUtil.getInstance()
+                .getRunTask(tryMakeMoneyPresenter,
+                        0);
     }
 
     @Override
@@ -844,7 +847,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 SlideshowEty clickedGameObj = slideshowEtyLists.get(position);
 
                 UMConfigUtils.onEvent(UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL);
-                switch (clickedGameObj.getType()) {// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面
+                switch (clickedGameObj.getType()) {// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面、5 微信二维码任务
                     case 1:
                         Jump2View.getInstance()
                                 .goTryplayView(activity, null);
@@ -873,6 +876,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         }
 
                         break;
+                    case 5:
+                        if(!TextUtils.isEmpty(clickedGameObj.getObjects())){
+
+                            Jump2View.getInstance()
+                                    .goWeb(
+                                            activity,
+                                            clickedGameObj.getObjects(),
+                                            "微信二维码辅助好友注册任务");
+                        }
+
+                        break;
+                    case 6://连续任务
+                        Jump2View.getInstance()
+                                .goTryplayView(activity, 1);
+                        break;
                 }
             }
         });
@@ -909,7 +927,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 1）只提示一次，如果用户取消，以后都不在提示
      */
     private void showPDialog(){
-       boolean isShowDialog = SharedPreferences.getInstance().getBoolean("isShowDialog",true);
+        boolean isShowDialog = SharedPreferences.getInstance().getBoolean("isShowDialog",true);
         if(isShowDialog && !NotificationsUtils.isNotificationEnabled(mContext)){//没有开启通知权限
             AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
             builder.setTitle("提示");

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -122,7 +122,7 @@ public interface ApiService {
      * 获取自己正在运行的任务
      */
     @GET("app/accepted_task/run_task/")
-    Observable<BaseMessage> returnTask();
+    Observable<BaseMessage> returnTask(@Query("is_succession") int is_succession);
     /**
      * 自动提交时长任务
      *
@@ -140,7 +140,7 @@ public interface ApiService {
     Observable<BaseMessage> releaseTask(@Query("page") int page, @Query("per_page") int per_page,
                                         @Query("platform") int platform, @Query("is_hot") int is_hot,
                                         @Query("is_recommend") int is_recommend, @Query("about_to_begin") int about_to_begin,
-                                        @Query("task_type") int task_type);
+                                        @Query("task_type") int task_type, @Query("is_succession") int is_succession);
 
 
 

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

@@ -55,7 +55,8 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
     @Override
     public void returnTask(RequestParameEty o) {
 
-        apiService.returnTask()
+        HashMap<String, String> hashMap = o.getHashMap();
+        apiService.returnTask(Integer.valueOf(hashMap.get("is_succession")))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
@@ -80,7 +81,7 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
         apiService.releaseTask(Integer.valueOf(hashMap.get("page")),Integer.valueOf(hashMap.get("per_page")),
                 Integer.valueOf(hashMap.get("platform")),Integer.valueOf(hashMap.get("is_hot")),
                 Integer.valueOf(hashMap.get("is_recommend")),Integer.valueOf(hashMap.get("about_to_begin")),
-                Integer.valueOf(hashMap.get("task_type")))
+                Integer.valueOf(hashMap.get("task_type")), Integer.valueOf(hashMap.get("is_succession")))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

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

@@ -18,10 +18,12 @@ import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
+import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -208,11 +210,12 @@ public class CommonUtil {
     }
     /**
      * 任务传送数据组装
+     * is_succession:0:不是连续  1:联系任务
      */
     public HashMap<String, String> setHashMap(int page, int per_page,
                                               int platform, int is_hot,
                                               int is_recommend, int about_to_begin,
-                                              int task_type){
+                                              int task_type, int is_succession){
 
         HashMap<String, String> hashMap = new HashMap<>();
         hashMap.put("page", page+"");
@@ -222,6 +225,7 @@ public class CommonUtil {
         hashMap.put("is_recommend", is_recommend+"");
         hashMap.put("about_to_begin", about_to_begin+"");
         hashMap.put("task_type", task_type+"");
+        hashMap.put("is_succession", is_succession+"");
         return hashMap;
     }
     /**
@@ -374,6 +378,9 @@ public class CommonUtil {
                 Jump2View.getInstance().goWeb(context,
                         entity.getUrl(), "微信二维码辅助好友注册任务");
                 break;
+            case 8://连续任务
+                Jump2View.getInstance().goTryplayView(context, 1);
+                break;
             default:
 
                 break;
@@ -459,4 +466,25 @@ public class CommonUtil {
         }
 //        SheepApp.getInstance().setTaskEty(tAskEnty);
     }
+
+    /**
+     * 获取正在进行中的任务
+     */
+    public void getRunTask(TryMakeMoneyPresenter presenter,
+                           int is_succession){
+
+        RequestParameEty parameEty = new RequestParameEty();
+        parameEty.setHashMap(
+                CommonUtil.getInstance()
+                        .setHashMap(1,
+                                100,
+                                1,
+                                1,
+                                0,
+                                0,
+                                -1,
+                                is_succession));
+        presenter.returnTask(parameEty);
+    }
+
 }

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

@@ -239,6 +239,11 @@ public class Jump2View {
      */
     public void goTryplayView(Context context, Object o){
         Intent intent = new Intent(context, TryMakeMoneyact.class);
+        try{
+            intent.putExtra("is_succession", o == null? 0: Integer.valueOf(o+ ""));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         context.startActivity(intent);
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_TRY);
     }

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

@@ -65,6 +65,8 @@ public class TryMakeMoneyact extends BaseActivity {
     private GridViewEntity gridViewEntity;//选中的
     private int select;
 
+    private int is_succession;//0:一般任务 1:连续任务
+
     @Override
     protected int getLayoutId() {
         return R.layout.try_makemoney_act_layout;
@@ -83,6 +85,9 @@ public class TryMakeMoneyact extends BaseActivity {
                         UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
                     }
                 });
+        is_succession = getIntent()
+                .getIntExtra(
+                        "is_succession", 0);
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
         mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
@@ -126,32 +131,37 @@ public class TryMakeMoneyact extends BaseActivity {
 
     @Override
     public void initData() {
-        SheepApp.get(activity)
-                .getNetComponent()
-                .getApiService()
-                .getChildTask(1)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg()+"");
-                        task_gridview_layout.setVisibility(View.GONE);
-                    }
+        if(is_succession == 0){
+            SheepApp.get(activity)
+                    .getNetComponent()
+                    .getApiService()
+                    .getChildTask(1)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                            G.showToast(baseMessage.getMsg()+"");
+                            task_gridview_layout.setVisibility(View.GONE);
+                        }
 
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-
-                        task_gridview_layout.setVisibility(View.VISIBLE);
-                        List<GridViewEntity> entityList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), GridViewEntity.class);
-                        if(entityList != null){
-                            gridviewListAll.clear();
-                            gridviewListAll.add(new GridViewEntity(true, -1, "全部" ));
-                            gridviewListAll.addAll(entityList);
-                            setValueList2(clickFlag);
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+
+                            task_gridview_layout.setVisibility(View.VISIBLE);
+                            List<GridViewEntity> entityList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), GridViewEntity.class);
+                            if(entityList != null){
+                                gridviewListAll.clear();
+                                gridviewListAll.add(new GridViewEntity(true, -1, "全部" ));
+                                gridviewListAll.addAll(entityList);
+                                setValueList2(clickFlag);
+                            }
                         }
-                    }
-                });
+                    });
+        }else {
+            task_gridview_layout.setVisibility(View.GONE);
+        }
+
     }
 
     @Override
@@ -175,6 +185,13 @@ public class TryMakeMoneyact extends BaseActivity {
         return gridViewEntity;
     }
 
+    /**
+     * 获取is_succession，是否是连续任务
+     */
+    public int getIsSuccession(){
+        return is_succession;
+    }
+
 
     /**
      * test

app/src/main/java/com/sheep/gamegroup/view/customview/SheepViewPager.java

@@ -0,0 +1,55 @@
+package com.sheep.gamegroup.view.customview;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * Created by ljy on 2018/5/16.
+ */
+
+public class SheepViewPager extends ViewPager {
+
+    int lastX = -1;
+    int lastY = -1;
+
+    public SheepViewPager(@NonNull Context context) {
+        super(context);
+    }
+
+    public SheepViewPager(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        int x = (int) ev.getRawX();
+        int y = (int) ev.getRawY();
+        int dealtX = 0;
+        int dealtY = 0;
+
+        switch (ev.getAction()){
+            case MotionEvent.ACTION_DOWN:
+                dealtX = 0;
+                dealtY = 0;
+                //保证 view能够得到 Action_move 事件
+                getParent().requestDisallowInterceptTouchEvent(true);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                dealtX += Math.abs(x - lastX);
+                dealtY += Math.abs(y - lastY);
+                if(dealtX >= dealtY){
+                    getParent().requestDisallowInterceptTouchEvent(true);
+                }else {
+                    getParent().requestDisallowInterceptTouchEvent(false);
+                }
+                lastX = x;
+                lastY = y;
+                break;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+}

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

@@ -193,7 +193,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                                 0,
                                 0,
                                 type==2 ? 1 : type,
-                                gridViewEntity == null ? -1 :gridViewEntity.getId()));
+                                gridViewEntity == null ? -1 :gridViewEntity.getId(),
+                                ((TryMakeMoneyact)getActivity()).getIsSuccession()));
         presenter.releaseTask(parameEty);
     }
 
@@ -308,7 +309,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(type == 2){
             notifyDataSetChanged();
         }else {
-            presenter.returnTask(null);
+            CommonUtil.getInstance()
+                    .getRunTask(presenter,
+                            ((TryMakeMoneyact)getActivity()).getIsSuccession());
         }
 
     }
@@ -319,7 +322,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(type == 2){
             notifyDataSetChanged();
         }else {
-            presenter.returnTask(null);
+            CommonUtil.getInstance()
+                    .getRunTask(presenter,
+                            ((TryMakeMoneyact)getActivity()).getIsSuccession());
         }
     }
 

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

@@ -6,7 +6,7 @@
     android:visibility="gone">
 
 
-    <android.support.v4.view.ViewPager
+    <com.sheep.gamegroup.view.customview.SheepViewPager
         android:id="@+id/viewpager_banner"
         android:layout_width="match_parent"
         android:layout_height="@dimen/app_group_height_135"