代码提交

app/build.gradle

@@ -267,6 +267,7 @@ dependencies {
         exclude group: 'com.android.support'
     }
     annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.16'
+    compile 'com.sunfusheng:marqueeview:1.3.3'
 
 
 }

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

@@ -7,6 +7,9 @@ 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.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -22,6 +25,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -32,6 +36,7 @@ import com.kfzs.duanduan.react.ReactUtil;
 import com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.UserNameChange;
@@ -39,17 +44,26 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 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;
+import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
+import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
+import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.BinaryUtil;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskRegistSuccess;
@@ -57,6 +71,7 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sunfusheng.marqueeview.MarqueeView;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -66,6 +81,7 @@ import org.xutils.ex.DbException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 
@@ -78,10 +94,10 @@ import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
-public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContract.View {
+public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContract.View ,TryMakeMoneyContract.View{
 
     @BindView(R.id.upview1)
-    EasyLayoutScroll upview1;
+    MarqueeView upview1;
     Unbinder unbinder;
 
     @Override
@@ -114,6 +130,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     LinearLayout invitationLayout;
     @BindView(R.id.lying_layout)
     LinearLayout lyingLayout;
+    @BindView(R.id.card_layout)
+    LinearLayout card_layout;
     @BindView(R.id.viewpager_banner)
     ViewPager viewpager_banner;
     @BindView(R.id.group_banner)
@@ -122,18 +140,37 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     ScrollView scrollView;
     @BindView(R.id.newbie_task)
     View newbie_task;
+    @BindView(R.id.refresh)
+    SwipeRefreshLayout refresh;
+    @BindView(R.id.recyclerview)
+    RecyclerView recyclerview;
 
     @Inject
     SmallSheepPresenter pagePresenter;
+    @Inject
+    TryMakeMoneyPresenter tryMakeMoneyPresenter;
     private Activity activity;
     private UserEntity userEntity;
     List<View> views = new ArrayList<>();
 
+    //recyclerview
+    private TryMakeMoneyAdp tryMakeMoneyAdp;
+    private int position = 0;
+    private  List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
+
     Handler mHanderl = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            refalsh();
+            switch (msg.what){
+                case 0:
+                    refalsh();
+                    break;
+                case 1:
+                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
+                    tryMakeMoneyAdp.notifyDataSetChanged();
+                    break;
+            }
 
         }
     };
@@ -145,8 +182,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         DaggerSmallSheepComponent.builder()
                 .netComponent(SheepApp.get(getContext()).getNetComponent())
                 .smallSheepModule(new SmallSheepModule(this))
+                .tryMakeMoneyModule(new TryMakeMoneyModule(this))
                 .build()
                 .inject(this);
+        recyclerInitView();
     }
 
 
@@ -178,33 +217,44 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     case MotionEvent.ACTION_DOWN:
                         if (upview1 != null) {
                             //开始滚动
-                            upview1.stopScroll();
+                            upview1.stopFlipping();
                         }
                         break;
                     case MotionEvent.ACTION_UP:
                         if (upview1 != null) {
                             //开始滚动
-                            upview1.startScroll();
+                            upview1.startFlipping();
                         }
                         break;
                     default:
                         if (upview1 != null) {
                             //开始滚动
-                            upview1.startScroll();
+                            upview1.startFlipping();
                         }
                         break;
                 }
                 return false;
             }
         });
+
+        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                initData();
+                refresh.setRefreshing(false);
+            }
+        });
+
+        //recyclerView 禁止滑动
+        recyclerview.setNestedScrollingEnabled(false);
     }
 
     public void initData() {
 
         if (upview1 != null) {
             //停止滚动
-            upview1.stopScroll();
-            upview1.startScroll();
+            upview1.stopFlipping();
+            upview1.startFlipping();
         }
         pagePresenter.getUserInfo();
 
@@ -213,8 +263,41 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
 
         initWechatIsOpen();
+        recyclerInitData();//任务
+        pagePresenter.bulletin(null);//轮播
+        pagePresenter.slideshow(null);
+
+    }
+
+    /**
+     * recyclerview
+     */
+    private void recyclerInitView(){
+
+        recyclerview.setLayoutManager(new LinearLayoutManager(activity));
+        tryMakeMoneyAdp = new TryMakeMoneyAdp(getActivity());
+        for (int i = 0; i < 2; i++) {
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        }
+        recyclerview.setAdapter(tryMakeMoneyAdp);
+    }
+    private void recyclerInitData(){
+
+
+        position = 0;
+        tryMakeMoneyAdp.clear();
+        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,
+                1,0,0));
 
+        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
+
     private Boolean wechatIsOpen = null;
     /**
      * 获取微信挂机是否开启状态
@@ -264,6 +347,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 Jump2View.getInstance().goAskGetMoney(activity, null);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_INVITE);
                 break;
+            case R.id.card_layout://邀请赚钱
+                Jump2View.getInstance()
+                        .goWebview(activity, 3);
+                UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_CREDITCARD);
+                break;
             case R.id.lying_layout://躺着赚钱
                 if(wechatIsOpen == null) {
                     G.showToast("网络异常，请稍候重试");
@@ -388,6 +476,88 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     @Override
+    public void acceptedTaskUpdataView(Object o) {
+
+    }
+
+    @Override
+    public void failAcceptedTask2View(Object o) {
+
+    }
+
+    @Override
+    public void giveUpTaskSuccesView(Object o) {
+        G.showToast("取消任务成功");
+        recyclerInitData();
+
+    }
+
+    @Override
+    public void giveUpTaskFailView(Object o) {
+
+    }
+
+    @Override
+    public void returnTaskTaskUpdataView(Object o) {
+
+
+        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(tryMakeMoneyPresenter);
+            tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
+            position ++;
+//            mhandler.sendEmptyMessage(0);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        mHanderl.sendEmptyMessage(1);
+    }
+
+    @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(" 网络错误！");
+        }
+        mHanderl.sendEmptyMessage(1);
+    }
+
+    @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);
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        tryMakeMoneyPresenter.returnTask(null);
+    }
+
+    @Override
+    public void failReleaseTask2View(Object o) {
+        tryMakeMoneyPresenter.returnTask(null);
+    }
+
+    @Override
     public void showMore(final List<MoreDataEntity> loginEty) {
         getActivity().runOnUiThread(new Runnable() {
             @Override
@@ -400,6 +570,30 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     }
 
+    /**
+     * 公告和轮播
+     * @param baseMessage
+     */
+    @Override
+    public void failSlideshow(BaseMessage baseMessage) {
+
+    }
+
+    @Override
+    public void successSlideshow(BaseMessage baseMessage) {
+
+    }
+
+    @Override
+    public void failbulletin(BaseMessage baseMessage) {
+
+    }
+
+    @Override
+    public void successbulletin(BaseMessage baseMessage) {
+
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -414,7 +608,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         super.onPause();
         if (upview1 != null) {
             //停止滚动
-            upview1.stopScroll();
+            upview1.stopFlipping();
         }
     }
 
@@ -432,6 +626,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
     private  void  invite(final List<MoreDataEntity> loginEty){
         views.clear();
+        upview1.removeAllViews();
         for (MoreDataEntity entity:loginEty) {
             StringBuilder  sb=new StringBuilder();
             sb.append(TimeStamp2Date(entity.getTime())+"   ");
@@ -443,12 +638,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             TextView moreView = (TextView) LayoutInflater.from(getActivity()).inflate(R.layout.x_item_view, null);
             moreView.setText(sb.toString());
             views.add(moreView);
+            upview1.addView(moreView);
         }
-        upview1.removeAllViews();
-        upview1.setEasyViews(views);
+//        upview1.setEasyViews(views);
         if(!upview1.isAutoStart()){
-            upview1.stopScroll();
-            upview1.startScroll();
+            upview1.stopFlipping();
+            upview1.startFlipping();
         }
 
 

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.di.components;
 
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
 
 import dagger.Component;
@@ -10,7 +11,7 @@ import dagger.Component;
  * Created by ljy on 2018/3/19.
  */
 @UserScope
-@Component(modules = SmallSheepModule.class, dependencies = NetComponent.class)
+@Component(modules = {SmallSheepModule.class, TryMakeMoneyModule.class}, dependencies = NetComponent.class)
 public interface SmallSheepComponent {
     void inject(FgtSmallSheep fgtSmallSheep);
 }

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

@@ -127,7 +127,9 @@ public interface ApiService {
      * 获取正在运行的任务
      */
     @GET("app/release_task/")
-    Observable<BaseMessage> releaseTask();
+    Observable<BaseMessage> releaseTask(@Query("page") int page, @Query("per_page") int per_page,
+                                        @Query("per_page") int platform, @Query("per_page") int is_hot,
+                                        @Query("per_page") int is_recommend, @Query("per_page") int about_to_begin);
 
 
 
@@ -258,6 +260,24 @@ public interface ApiService {
     Observable<BaseMessage> getUserFriendList(@Query("page") int page, @Query("per_page") int per_page);
     @GET("app/release_task/credit_card")
     Observable<BaseMessage> getReleaseTaskCreditCard();
+
+    /**
+     * 首页轮播图
+     */
+    @GET("app/slideshow")
+    Observable<BaseMessage> slideshow(@Query("platform") int platform);
+
+    /**
+     * 首页公告
+     */
+    @GET("app/bulletin")
+    Observable<BaseMessage> bulletin(@Query("page") int page, @Query("per_page") int per_page);
+
+    /**
+     * 获取任务详情
+     */
+    @GET("app/release_task/{id}/desc")
+    Observable<BaseMessage> taskDesc(@Query("id") int id);
     @GET("app/credit/{id}")
     Observable<BaseMessage> getCredit(@Path("id") int id);
 }

app/src/main/java/com/sheep/gamegroup/model/entity/BulletinEnty.java

@@ -0,0 +1,54 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * 首页公告
+ * Created by ljy on 2018/4/25.
+ */
+
+public class BulletinEnty {
+    private String Content;// private String stringprivate String ,
+            private String CreateTime;// 0,
+            private String Id;// 0,
+            private int Order;// 0,
+            private String UpdateTime;// 0
+
+    public String getContent() {
+        return Content;
+    }
+
+    public void setContent(String content) {
+        Content = content;
+    }
+
+    public String getCreateTime() {
+        return CreateTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        CreateTime = createTime;
+    }
+
+    public String getId() {
+        return Id;
+    }
+
+    public void setId(String id) {
+        Id = id;
+    }
+
+    public int getOrder() {
+        return Order;
+    }
+
+    public void setOrder(int order) {
+        Order = order;
+    }
+
+    public String getUpdateTime() {
+        return UpdateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        UpdateTime = updateTime;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/RequestParameEty.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
+import java.util.HashMap;
+
 /**
  * 请求公用参数
  * Created by ljy on 2018/3/19.
@@ -10,6 +12,19 @@ public class RequestParameEty {
     private int page;
     private int per_page;
 
+    private HashMap<String, String> hashMap;
+
+    public HashMap<String, String> getHashMap() {
+        return hashMap;
+    }
+
+    public void setHashMap(HashMap<String, String> hashMap) {
+        this.hashMap = hashMap;
+    }
+
+    public RequestParameEty() {
+    }
+
     public RequestParameEty(int page, int per_page) {
         this.page = page;
         this.per_page = per_page;

app/src/main/java/com/sheep/gamegroup/model/entity/SlideshowEty.java

@@ -0,0 +1,82 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * 首页轮播图
+ * Created by ljy on 2018/4/25.
+ */
+
+public class SlideshowEty {
+    
+    private String CreateTime;// 0,
+            private String Ext;// 扩展字段 跳转任务就是任务id 跳转H5就是url地址
+            private String Id;// 0,
+            private int IsDisplay;// 0,
+            private int Platform;// 0,平台 1：android 2：ios
+            private int Type = 1;// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面
+            private String UpdateTime;// 0,
+            private String Url;// private String stringprivate String
+
+    public String getCreateTime() {
+        return CreateTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        CreateTime = createTime;
+    }
+
+    public String getExt() {
+        return Ext;
+    }
+
+    public void setExt(String ext) {
+        Ext = ext;
+    }
+
+    public String getId() {
+        return Id;
+    }
+
+    public void setId(String id) {
+        Id = id;
+    }
+
+    public int getIsDisplay() {
+        return IsDisplay;
+    }
+
+    public void setIsDisplay(int isDisplay) {
+        IsDisplay = isDisplay;
+    }
+
+    public int getPlatform() {
+        return Platform;
+    }
+
+    public void setPlatform(int platform) {
+        Platform = platform;
+    }
+
+    public int getType() {
+        return Type;
+    }
+
+    public void setType(int type) {
+        Type = type;
+    }
+
+    public String getUpdateTime() {
+        return UpdateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        UpdateTime = updateTime;
+    }
+
+    public String getUrl() {
+        return Url;
+    }
+
+    public void setUrl(String url) {
+        Url = url;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/TaskReleaseEty.java

@@ -27,6 +27,16 @@ public class TaskReleaseEty implements Serializable{
 
     private TaskEty task;
 
+    private int cancel_duration;
+
+    public int getCancel_duration() {
+        return cancel_duration;
+    }
+
+    public void setCancel_duration(int cancel_duration) {
+        this.cancel_duration = cancel_duration;
+    }
+
     public String getBonus() {
         return bonus;
     }

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.presenter;
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
 
 import java.util.List;
@@ -16,6 +17,9 @@ public interface SmallSheepContract {
 
 
         void  getAwardDetail();
+
+        void  slideshow(Object o);
+        void  bulletin(Object o);
     }
 
     interface View {
@@ -24,6 +28,11 @@ public interface SmallSheepContract {
         void failData2View(Object o);
         void  showMore( List<MoreDataEntity> loginEty);
 
+        void failSlideshow(BaseMessage baseMessage);
+        void successSlideshow(BaseMessage baseMessage);
+        void failbulletin(BaseMessage baseMessage);
+        void successbulletin(BaseMessage baseMessage);
+
 
     }
 }

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

@@ -82,4 +82,40 @@ public class SmallSheepPresenter implements SmallSheepContract.Persenter {
                     }
                 });
     }
+
+    @Override
+    public void slideshow(Object o) {
+        apiService.slideshow(1)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.failSlideshow(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.successSlideshow(baseMessage);
+                    }
+                });
+    }
+
+    @Override
+    public void bulletin(Object o) {
+        apiService.bulletin(1,10)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.failbulletin(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.successbulletin(baseMessage);
+                    }
+                });
+    }
 }

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

@@ -8,6 +8,8 @@ import com.sheep.gamegroup.model.util.ExceptionHandle;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
+import java.util.HashMap;
+
 import javax.inject.Inject;
 
 import rx.Scheduler;
@@ -76,7 +78,11 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
     @Override
     public void releaseTask(RequestParameEty o) {
 
-        apiService.releaseTask()
+        HashMap<String, String> hashMap = o.getHashMap();
+
+        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")))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

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

@@ -2,18 +2,17 @@ package com.sheep.gamegroup.util;
 
 import android.content.Context;
 import android.text.TextUtils;
-import android.widget.Toast;
+import android.widget.TextView;
 
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.io.File;
+import java.util.HashMap;
 
 /**
  * 一些公用的class
@@ -152,4 +151,50 @@ public class CommonUtil {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 倒计时
+     */
+    public void countDownTimer(final TextView tv, long full_second, SelfCountDownTimer countDownUtil){
+        countDownUtil = new SelfCountDownTimer(full_second * 1000, 1000,(int)full_second) {
+            @Override
+            public void onTimerRest() {
+                tv.setText("");
+            }
+
+            @Override
+            public void onTimerTick(long millisUntilFinished, int counTime) {
+                String textStr = counTime + " s";
+                tv.setText("");
+            }
+
+            @Override
+            public void onTimerFinish() {
+                tv.setText("");
+            }
+        };
+    }
+
+    /**
+     * 任务倒计时
+     * 组装String
+     */
+    public String assemblyString(String date){
+        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
+        return str;
+    }
+    /**
+     * 任务传送数据组装
+     */
+    public HashMap<String, String> setHashMap(int page, int per_page, int platform, int is_hot, int is_recommend, int about_to_begin){
+
+        HashMap<String, String> hashMap = new HashMap<>();
+        hashMap.put("page", page+"");
+        hashMap.put("per_page", per_page+"");
+        hashMap.put("platform", platform+"");
+        hashMap.put("is_hot", is_hot+"");
+        hashMap.put("is_recommend", is_recommend+"");
+        hashMap.put("about_to_begin", about_to_begin+"");
+        return hashMap;
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.sheep.gamegroup.util;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * Created by ljy on 2018/4/25.
+ */
+
+public class MyScrollView extends ScrollView {
+    public MyScrollView(Context context) {
+        super(context);
+    }
+
+    public MyScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public MyScrollView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+}

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

@@ -7,7 +7,7 @@ import android.os.CountDownTimer;
  */
 
 public abstract class SelfCountDownTimer extends CountDownTimer{
-    private static final int FULL_SECOND = 60;
+    public static final int FULL_SECOND = 60;
     private int countTime = FULL_SECOND;
     /**
      * @param millisInFuture    The number of millis in the future from the call
@@ -16,13 +16,14 @@ public abstract class SelfCountDownTimer extends CountDownTimer{
      * @param countDownInterval The interval along the way to receive
      *                          {@link #onTick(long)} callbacks.
      */
-    public SelfCountDownTimer(long millisInFuture, long countDownInterval) {
+    public SelfCountDownTimer(long millisInFuture, long countDownInterval, int full_second) {
         super(millisInFuture, countDownInterval);
+        countTime = full_second;
     }
 
-    public void reset(){
+    public void reset(int full_second){
         this.cancel();
-        countTime = FULL_SECOND;
+        countTime = full_second;
 
     }
 

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

@@ -57,4 +57,43 @@ public class TimeUtil {
         String str = new SimpleDateFormat(formate, Locale.ENGLISH).format(date);
         return str;
     }
+
+    /**
+     * 毫秒值
+     * @param time
+     * @return 时:分:秒
+     */
+    public static String getHours(long time) {
+        long second = time / 1000;
+        long hour = second / 60 / 60;
+        long minute = (second - hour * 60 * 60) / 60;
+        long sec = (second - hour * 60 * 60) - minute * 60;
+
+        String rHour = "";
+        String rMin = "";
+        String rSs = "";
+        // 时
+        if (hour < 10) {
+            rHour = "0" + hour;
+        } else {
+            rHour = hour + "";
+        }
+        // 分
+        if (minute < 10) {
+            rMin = "0" + minute;
+        } else {
+            rMin = minute + "";
+        }
+        // 秒
+        if (sec < 10) {
+            rSs = "0" + sec;
+        } else {
+            rSs = sec + "";
+        }
+
+        // return hour + "小时" + minute + "分钟" + sec + "秒";
+        return rHour + ":" + rMin + ":" + rSs;
+
+    }
+
 }

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

@@ -143,7 +143,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     public void initListener() {
-        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000) {
+        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000, SelfCountDownTimer.FULL_SECOND) {
             @Override
             public void onTimerRest() {
                 canGetCaptchaPhone = true;
@@ -208,7 +208,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                     return;
                 }
                 if(oldOrNew == 0){
-                    selfCountDownTimer.reset();
+                    selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("mobile", mobile+"");
                     presenter.smsBindMobile(jsonObject);
@@ -268,7 +268,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         switch (step){
             case 1:
 
-                selfCountDownTimer.reset();
+                selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
                 canGetCaptchaPhone = false;
                 selfCountDownTimer.start();
                 break;
@@ -278,7 +278,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             case 3:
                 jsonObject.put("auth_code", auth_code+"");
                 jsonObject.put("mobile", mobile+"");
-                selfCountDownTimer.reset();
+                selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
                 canGetCaptchaPhone = false;
                 selfCountDownTimer.start();
                 break;
@@ -326,7 +326,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 phoneBtnCode.setText(getString(R.string.get_captcha));
                 canGetCaptchaPhone = true;
                 if(selfCountDownTimer != null)
-                    selfCountDownTimer.reset();
+                    selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
             }else if(step == 4){
                 SpUtils.savePhone(activity,mobile);
                 G.showToast(o.getMsg()+"");
@@ -404,4 +404,12 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         }
         return true;
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if(selfCountDownTimer != null){
+            selfCountDownTimer.cancel();
+        }
+    }
 }

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

@@ -50,8 +50,6 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
     TextView myPrice;
     @BindView(R.id.my_all_price)
     TextView myAllPrice;
-    @BindView(R.id.couple_red_packets_iv)
-    ImageView coupleRedPacketsIv;
     @BindView(R.id.try_play_layout)
     LinearLayout tryPlayLayout;
     @BindView(R.id.invitation_layout)
@@ -103,7 +101,7 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
 
     }
 
-    @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout, R.id.invitation_layout, R.id.lying_layout})
+    @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.try_play_layout, R.id.invitation_layout, R.id.lying_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.icon_img_iv:
@@ -114,8 +112,6 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
             case R.id.withdrawal:
                 Jump2View.getInstance().goWithdrawal(activity, null);
                 break;
-            case R.id.couple_red_packets_iv:
-                break;
             case R.id.try_play_layout:
                 Jump2View.getInstance().goTryplayView(activity, null);
                 break;

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

@@ -103,7 +103,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     @Override
     public void initListener() {
-        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000) {
+        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000,SelfCountDownTimer.FULL_SECOND) {
             @Override
             public void onTimerRest() {
                 canGetCaptchaPhone = true;
@@ -199,7 +199,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
         if(!checkPhoneInput()){
             return;
         }
-        selfCountDownTimer.reset();
+        selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
         phonePresenter.getCaptcha(etPhone);
         canGetCaptchaPhone = false;
         selfCountDownTimer.start();
@@ -384,4 +384,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             e.printStackTrace();
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if(selfCountDownTimer != null){
+            selfCountDownTimer.cancel();
+        }
+    }
 }

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

@@ -21,6 +21,7 @@ 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;
@@ -129,7 +130,10 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         tryMakeMoneyAdp.setTaskAcceptedEty(null);
-        presenter.releaseTask(null);
+        RequestParameEty parameEty = new RequestParameEty();
+        parameEty.setHashMap(CommonUtil.getInstance().setHashMap(1,100,1,
+                0,1,0));
+        presenter.releaseTask(parameEty);
     }
 
     @Override
@@ -291,4 +295,12 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             }
         });
     }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if(tryMakeMoneyAdp != null){
+            tryMakeMoneyAdp.cancelAllTimers();
+        }
+    }
 }

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

@@ -31,6 +31,7 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
@@ -38,7 +39,11 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.inject.Inject;
 
@@ -50,6 +55,7 @@ import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private final static int TAG_ID_TEMP = R.id.view_tag_1;
+    private HashMap<View, SelfCountDownTimer> timerHashMap= new HashMap<>();
     @Inject
     TryMakeMoneyPresenter presenter;
     private Context context;
@@ -237,6 +243,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getRelease_task().getBonus() +"元");
                 ((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)).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -273,6 +280,44 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 });
                 setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getRelease_task().getTask());
 
+                /**
+                 * 倒计时
+                 */
+                if(etyList.get(i).getRelease_task().getCancel_duration() > 0){
+                    final TextView countdown_tv = viewHolder.itemView.findViewById(R.id.countdown_tv);
+                    SelfCountDownTimer scTimer = timerHashMap.get(countdown_tv);
+                    if(scTimer != null){
+                        scTimer.cancel();
+                        scTimer = null;
+                    }
+
+                    countdown_tv.setVisibility(View.VISIBLE);
+                    String sr = "若<font color='#ff2d4b'><small>" + "" + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
+                    countdown_tv.setText(sr+"");
+                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getRelease_task().getCancel_duration() * 1000, 1000,(int)etyList.get(i).getRelease_task().getCancel_duration()) {
+                        @Override
+                        public void onTimerRest() {
+                            countdown_tv.setText("");
+                        }
+
+                        @Override
+                        public void onTimerTick(long millisUntilFinished, int counTime) {
+                            countdown_tv.setText(CommonUtil.getInstance().assemblyString(TimeUtil.getHours(millisUntilFinished))+"");
+                        }
+
+                        @Override
+                        public void onTimerFinish() {
+                            countdown_tv.setVisibility(View.GONE);
+                            presenter.giveUpTask(etyList.get(i).getId());
+                            //暂停下载
+                            CommonUtil.getInstance().stopDownloadTask(mContext, etyList.get(i).getRelease_task().getTask().getDownload_link());
+                        }
+                    };
+                    selfCountDownTimer.reset(etyList.get(i).getRelease_task().getCancel_duration());
+                    selfCountDownTimer.start();
+                    timerHashMap.put(countdown_tv, selfCountDownTimer);
+                }
+
             }
 
             @Override
@@ -282,65 +327,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         });
     }
 
-
-    /**
-     * 获取我正在运行的任务
-     */
-    private void bindRunTask(ViewHolder holder, final TaskAcceptedEty acceptedEty){
-        ImageView icon = holder.getView(R.id.item_icon_iv);
-        TextView item_anem_tv = holder.getView(R.id.item_anem_tv);
-        TextView item_num_tv = holder.getView(R.id.item_num_tv);
-        TextView item_money = holder.getView(R.id.item_money);
-        TextView cancel_task_tv = holder.getView(R.id.cancel_task_tv);
-        TextView detail_task_tv = holder.getView(R.id.detail_task_tv);
-        TextView item_date_tv = holder.getView(R.id.item_date_tv);
-        cancel_task_tv.setVisibility(View.VISIBLE);
-        Glide.with(context)
-                .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
-                .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head).dontAnimate())
-                .into(icon);
-        item_anem_tv.setText(acceptedEty.getRelease_task().getName()+"");
-        item_num_tv.setText("剩余"+ acceptedEty.getRelease_task().getLast_num()+"份");
-        item_money.setText("+"+ acceptedEty.getRelease_task().getBonus() +"元");
-        item_date_tv.setText(TimeUtil.getDate(
-                "截止时间:" + TimeUtil.FORMAT, Long.valueOf(acceptedEty.getRelease_task().getDeadline()))+"");
-        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) {
-                presenter.giveUpTask(acceptedEty.getId());
-            }
-        });
-        detail_task_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                G.showToast("任务详情");
-                TaskEty taskEty = acceptedEty.getRelease_task().getTask();
-                taskEty.setRunTask(1);
-                taskEty.setBonus(acceptedEty.getRelease_task().getBonus());
-                taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
-                taskEty.setAcceptedTaskId(acceptedEty.getId());
-                taskEty.setName(acceptedEty.getRelease_task().getName());
-                Jump2View.getInstance().goTaskDetailView(context, taskEty, taskAcceptedEty);
-                UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
-            }
-        });
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TaskEty taskEty = acceptedEty.getRelease_task().getTask();
-                taskEty.setRunTask(1);
-                taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
-                taskEty.setName(acceptedEty.getRelease_task().getName());
-                taskEty.setAcceptedTaskId(acceptedEty.getId());
-                Jump2View.getInstance().goDialogActivityView(context, taskEty, taskAcceptedEty);
-            }
-        });
-        setDebugDownLoad(context, holder.itemView, acceptedEty.getRelease_task().getTask());
-    }
-
-
     public static void setDebugDownLoad(final Context context, View view, final TaskEty taskEty) {
             view.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
@@ -434,4 +420,23 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         }
     }
 
+    /**
+     * 重置map参数
+     */
+    public void cancelAllTimers() {
+        Set<Map.Entry<View, SelfCountDownTimer>> s = timerHashMap.entrySet();
+        Iterator it = s.iterator();
+        while (it.hasNext()) {
+            try {
+                Map.Entry pairs = (Map.Entry) it.next();
+                SelfCountDownTimer cdt = (SelfCountDownTimer) pairs.getValue();
+                cdt.cancel();
+                cdt = null;
+            } catch (Exception e) {
+            }
+        }
+        it = null;
+        s = null;
+        timerHashMap.clear();
+    }
 }

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

@@ -5,6 +5,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/bg_gray">
 
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
@@ -14,107 +18,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@mipmap/home_blue_bg"
-                android:paddingTop="@dimen/content_padding_20"
-                android:paddingStart="@dimen/content_padding_20"
-                android:paddingEnd="@dimen/content_padding_20"
-                >
-
-                <RelativeLayout
-                    android:id="@+id/user_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <ImageView
-                        android:id="@+id/icon_img_iv"
-                        android:layout_width="@dimen/view_size_45"
-                        android:layout_height="@dimen/view_size_45"
-                        android:src="@drawable/icon"/>
-
-                    <TextView
-                        android:id="@+id/name_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text=""
-                        android:textSize="@dimen/text_size_12"
-                        android:textColor="@color/txt_white"
-                        android:layout_toRightOf="@id/icon_img_iv"
-                        android:layout_marginLeft="@dimen/content_padding_15"
-                        android:layout_marginTop="@dimen/content_padding_small"
-                        android:layout_marginBottom="@dimen/content_padding_small"/>
-                    <TextView
-                        android:id="@+id/sheep_num_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="绵羊号："
-                        android:textSize="@dimen/text_size_10"
-                        android:textColor="@color/txt_white"
-                        android:layout_toRightOf="@id/icon_img_iv"
-                        android:layout_below="@+id/name_tv"
-                        android:layout_marginLeft="@dimen/content_padding_15"
-                        android:layout_marginBottom="@dimen/content_padding_small"/>
 
-                    <ImageView
-                        android:id="@+id/right_arrow_iv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/home_right_arrow"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"/>
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/price_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/user_layout"
-                    android:layout_marginTop="@dimen/content_padding_20"
-                    android:layout_marginBottom="@dimen/content_padding_20">
-                    <TextView
-                        android:id="@+id/withdrawal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
-                        android:minWidth="100dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:text="提 现"
-                        android:textColor="@color/blue_34a6e7"
-                        android:textSize="@dimen/text_size_4"
-                        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                        android:gravity="center"/>
-                    <TextView
-                        android:id="@+id/my_property"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="我的资产"
-                        android:textColor="@color/txt_white"
-                        android:textSize="@dimen/text_size_12"/>
-                    <TextView
-                        android:layout_below="@+id/my_property"
-                        android:id="@+id/my_price"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text=""
-                        android:textColor="@color/txt_white"
-                        android:textSize="@dimen/text_size_25"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginBottom="12dp"
-                        android:layout_toLeftOf="@id/withdrawal"/>
-                    <TextView
-                        android:layout_below="@+id/my_price"
-                        android:id="@+id/my_all_price"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="累计资产 "
-                        android:textColor="@color/txt_white"
-                        android:textSize="@dimen/text_size_12"/>
-                </RelativeLayout>
-
-            </RelativeLayout>
+            <include
+                layout="@layout/homepage_item_top"/>
 
             <ImageView
                 android:id="@+id/couple_red_packets_iv"
@@ -123,118 +29,22 @@
                 android:padding="@dimen/content_padding_10"
                 android:src="@mipmap/couple_red_packets"
                 android:visibility="gone"/>
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/content_padding_10">
-
-                <android.support.v4.view.ViewPager
-                    android:id="@+id/viewpager_banner"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/app_group_height_135"
-                    android:minHeight="@dimen/app_group_height_120" />
 
-                <RadioGroup
-                    android:id="@+id/group_banner"
-                    android:layout_width="match_parent"
-                    android:layout_height="14dp"
-                    android:layout_alignParentBottom="true"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:paddingTop="4dp"></RadioGroup>
-            </RelativeLayout>
+            <include
+                layout="@layout/homepage_item_banner"/>
+            <include
+                layout="@layout/homepage_item_4module"/>
+            <include
+                layout="@layout/homepage_item_currenttime_reward"/>
 
-            <LinearLayout
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="@color/white"
-                android:padding="@dimen/content_padding_10">
-                <LinearLayout
-                    android:id="@+id/try_play_layout"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:gravity="center">
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/home_try_play_bg"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="试玩赚钱"/>
-
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/invitation_layout"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:gravity="center">
-
-                    <ImageView
-                        android:id="@+id/imageView2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/home_invitation_bg" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="邀请赚钱"/>
-
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/lying_layout"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:gravity="center">
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/home_lying_bg"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="躺着赚钱"/>
-
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                android:orientation="vertical"
-                android:minHeight="@dimen/view_size_80"
-                android:padding="@dimen/content_padding_10"
-                android:layout_margin="@dimen/content_padding_10">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="实时奖励"
-                    android:textSize="@dimen/text_size_15"
-                    android:textColor="@color/black_191919"/>
-
-                <com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll
-                    android:id="@+id/upview1"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:padding="10dp"
-                    app:duration="2000"
-                    app:gradient="true"
-                    app:interval="1000"
-                    ></com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll>
-
-            </LinearLayout>
+                android:orientation="vertical"/>
         </LinearLayout>
     </ScrollView>
+    </android.support.v4.widget.SwipeRefreshLayout>
 
     <RelativeLayout
         android:id="@+id/newbie_task"

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

@@ -0,0 +1,163 @@
+<?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:padding="@dimen/content_padding_10">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/try_play_layout"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_gravity="center_vertical"
+                android:padding="@dimen/content_padding_10"
+                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:layout_marginRight="@dimen/content_padding_small">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="@dimen/content_padding_small">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="试玩赚钱"
+                        android:layout_centerVertical="true"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="下载应用领现金"
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style_12"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/home_try_play_circle_bg"/>
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/invitation_layout"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_gravity="center_vertical"
+                android:padding="@dimen/content_padding_10"
+                android:background="@drawable/sp_rectangle_bg_white_radius">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="邀请赚钱"
+                        android:layout_centerVertical="true"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="上不封顶月入过万"
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style_12"/>
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/home_invitation_circle_bg" />
+
+            </LinearLayout>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="@dimen/content_padding_small">
+            <LinearLayout
+                android:id="@+id/lying_layout"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_gravity="center_vertical"
+                android:padding="@dimen/content_padding_10"
+                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:layout_marginRight="@dimen/content_padding_small">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="@dimen/content_padding_small">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="躺着赚钱"
+                        android:layout_centerVertical="true"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="微信挂机领现金"
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style_12"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/home_lying_circle_bg"/>
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/card_layout"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_gravity="center_vertical"
+                android:padding="@dimen/content_padding_10"
+                android:background="@drawable/sp_rectangle_bg_white_radius">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="@dimen/content_padding_small">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="办卡赚钱"
+                        android:layout_centerVertical="true"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="办信用卡拿现金"
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style_12"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/home_card_circle_bg"/>
+
+            </LinearLayout>
+        </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/content_padding_10">
+
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager_banner"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_group_height_135"
+        android:minHeight="@dimen/app_group_height_120" />
+
+    <RadioGroup
+        android:id="@+id/group_banner"
+        android:layout_width="match_parent"
+        android:layout_height="14dp"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingTop="4dp"></RadioGroup>
+</RelativeLayout>

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:orientation="vertical"
+    android:minHeight="@dimen/view_size_80"
+    android:padding="@dimen/content_padding_10"
+    android:layout_margin="@dimen/content_padding_10">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/item_title_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/icon"
+            android:layout_marginRight="@dimen/content_padding_small"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="实时奖励"
+            android:textSize="@dimen/text_size_15"
+            android:textColor="@color/black_191919"/>
+    </LinearLayout>
+    <com.sunfusheng.marqueeview.MarqueeView
+        android:id="@+id/upview1"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        app:mvAnimDuration="1000"
+        app:mvDirection="bottom_to_top"
+        app:mvInterval="1000"
+        app:mvTextColor="@color/white"
+        app:mvTextSize="14sp"
+        app:mvSingleLine="true" />
+
+</LinearLayout>

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

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/home_blue_bg"
+        android:paddingTop="@dimen/content_padding_20"
+        android:paddingStart="@dimen/content_padding_20"
+        android:paddingEnd="@dimen/content_padding_20"
+        >
+
+        <RelativeLayout
+            android:id="@+id/user_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/icon_img_iv"
+                android:layout_width="@dimen/view_size_45"
+                android:layout_height="@dimen/view_size_45"
+                android:src="@drawable/icon"/>
+
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textSize="@dimen/text_size_12"
+                android:textColor="@color/txt_white"
+                android:layout_toRightOf="@id/icon_img_iv"
+                android:layout_marginLeft="@dimen/content_padding_15"
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:layout_marginBottom="@dimen/content_padding_small"/>
+            <TextView
+                android:id="@+id/sheep_num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="绵羊号："
+                android:textSize="@dimen/text_size_10"
+                android:textColor="@color/txt_white"
+                android:layout_toRightOf="@id/icon_img_iv"
+                android:layout_below="@+id/name_tv"
+                android:layout_marginLeft="@dimen/content_padding_15"
+                android:layout_marginBottom="@dimen/content_padding_small"/>
+
+            <ImageView
+                android:id="@+id/right_arrow_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/home_right_arrow"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/price_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/user_layout"
+            android:layout_marginTop="@dimen/content_padding_20"
+            android:layout_marginBottom="@dimen/content_padding_20">
+            <TextView
+                android:id="@+id/withdrawal"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:minWidth="100dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="提 现"
+                android:textColor="@color/blue_34a6e7"
+                android:textSize="@dimen/text_size_4"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                android:gravity="center"/>
+            <TextView
+                android:id="@+id/my_property"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="我的资产"
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_12"/>
+            <TextView
+                android:layout_below="@+id/my_property"
+                android:id="@+id/my_price"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_25"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:layout_toLeftOf="@id/withdrawal"/>
+            <TextView
+                android:layout_below="@+id/my_price"
+                android:id="@+id/my_all_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="累计资产 "
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_12"/>
+        </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/newbie_task"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/newbie_task_tip_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/content_padding_13"
+                android:paddingTop="@dimen/content_padding_small"
+                android:paddingBottom="@dimen/content_padding_small"
+                android:paddingStart="@dimen/content_padding_15"
+                android:paddingEnd="@dimen/content_padding_15"
+                android:background="@drawable/shape_newbie_task_tv"
+                android:textSize="12sp"
+                android:textColor="#5A4E48"
+                android:text="新手任务"/>
+            <ImageView
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:layout_alignParentTop="true"
+                android:layout_alignEnd="@+id/newbie_task_tip_tv"
+                android:src="@drawable/sp_dot_red" />
+        </RelativeLayout>
+
+    </RelativeLayout>