Merge branch 'sheep_develop' of http://10.8.230.114:3000/xmy_android/small_sheep_android into sheep_develop

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

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -41,4 +41,5 @@ public enum EventTypes {
     REFRESH_MING_DONG,//刷新界面
 
     REFRESH_XIAOMI_GAME_LIST,//刷新界面
+    FGT_SHEEP_REFRESH_H , //刷新fgtSmallSheep高度
 }

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

@@ -254,7 +254,7 @@ public class FgtAskgetmoney extends BaseCompatFragment {
                 if(TextUtils.isEmpty(my_invitation_tv.getText().toString()))
                     return;
                 QR_COPY.onEvent();
-                StringUtils.CopyText(my_invitation_tv.getText().toString());
+                StringUtils.CopyText(userEntity.getInvitation_code()+"");
                 G.showToast("复制邀请码成功");
                 break;
             case R.id.ask_invite_tv:

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

@@ -222,16 +222,23 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     break;
                 case 1:
                     tryMakeMoneyAdp.clear();
-                    if (!ListUtil.isEmpty(allTaskAcceptedTaskList)) {
+                    if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
                         recyclerview_line.setVisibility(View.VISIBLE);
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
-                    if (!ListUtil.isEmpty(releaseEtyLists)) {
+                    if(!ListUtil.isEmpty(releaseEtyLists)) {
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     checkAndInitView();
                     break;
+                case 2:
+                    FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
+                    int count = item.getDataCount();
+                    ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
+                    params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
+                    mViewPager.setLayoutParams(params);
+                    break;
             }
 
         }
@@ -293,15 +300,33 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
         adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1, "about_to_begin"), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
 
 //        mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);
 
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
         tabLayout.setupWithViewPager(mViewPager);
+        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                curPosition = position;
+                mHanderl.sendEmptyMessage(2);//重新计算viewpager高度
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
         CommonUtil.getInstance().reflex(tabLayout, activity);
     }
+    private int curPosition = 0;
 
 
     private void loadUserInfo() {
@@ -409,26 +434,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null) {
+        if(userEntity != null){
             loadUserInfo();
         }
         //任务
-        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
-        if (cacheTaskReleaseEtyList != null) {
-            releaseEtyLists.addAll(cacheTaskReleaseEtyList);
-            mHanderl.sendEmptyMessage(1);
-        }
+//        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
+//        if (cacheTaskReleaseEtyList != null) {
+//            releaseEtyLists.addAll(cacheTaskReleaseEtyList);
+//            mHanderl.sendEmptyMessage(1);
+//        }
 
 
         //实时动态
         List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
-        if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
+        if(!ListUtil.isEmpty(cacheMoreDataEtyList)){
             invite(cacheMoreDataEtyList);
         }
 
         //公告
         List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
-        if (ListUtil.isEmpty(cacheBulletinEtyList)) {
+        if(ListUtil.isEmpty(cacheBulletinEtyList)){
             homepageItemNoticeLayout.setVisibility(View.GONE);
         } else {
             bulletinEntyLists.clear();
@@ -437,7 +462,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //轮播
         List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
-        if (ListUtil.isEmpty(cacheSlideshowEtyList)) {
+        if(ListUtil.isEmpty(cacheSlideshowEtyList)){
             banner.setVisibility(View.GONE);
         } else {
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
@@ -449,7 +474,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
-        if (ListUtil.isEmpty(cacheHomeListEtyList)) {
+        if(ListUtil.isEmpty(cacheHomeListEtyList)){
             home_list_gridview_layout.setVisibility(View.GONE);
         } else {
             home_list_gridview_layout.setVisibility(View.VISIBLE);
@@ -480,8 +505,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         refreshData();
     }
 
-    int toolBarPositionY;
-
     /**
      * 刷新数据
      */
@@ -522,34 +545,29 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
-                if (o != null) {
+                if(o != null){
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
-                    if (cashAwarsEntity != null) {
-
-                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward() + ""));
-                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash() + ""));
-                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare() + ""));
-                        homepage_item_get_award_name_tv.setText(award + "");
-                        homepage_item_money_tv.setText(cash + "");
-                        homepage_item_juan_tv.setText(welfare + "");
+                    if(cashAwarsEntity != null){
+
+                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward()+""));
+                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash()+""));
+                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare()+""));
+                        homepage_item_get_award_name_tv.setText(award+"");
+                        homepage_item_money_tv.setText(cash+"");
+                        homepage_item_juan_tv.setText(welfare+"");
                     }
                 }
             }
         });
-        adpViewPagerDetail.cleanListFragment();
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "即将开始");
-        adpViewPagerDetail.notifyDataSetChanged();
-        tabLayout.post(new Runnable() {
-            @Override
-            public void run() {
-                toolBarPositionY = tabLayout.getHeight();
-                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight() + 1;
-                mViewPager.setLayoutParams(params);
+        if(!isFirst){
+            for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
+                FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
+                item.refreshData();
             }
-        });
+        }
+        isFirst = false;
     }
+    private boolean isFirst = true;
 
     /**
      * recyclerview
@@ -576,21 +594,20 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (null == homeListEntitysGridview.get(position)) {
+                if(null ==  homeListEntitysGridview.get(position)){
                     return;
                 }
-                HomeListEntity homeListEntity = homeListEntitysGridview.get(position);
+                HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if (homeListEntity.getJump().equals("-2")) {
+                if(homeListEntity.getJump().equals("-2")){
                     setValueList(!homeListEntity.isSelect());
-                } else {
+                }else {
                     CommonUtil.getInstance()
                             .goWhere(activity, homeListEntity, "首页");
                 }
             }
         });
     }
-
     private void refreshTaskList() {
         DataUtil.getInstance().isTaskListChange(getClass());
         tryMakeMoneyPresenter.returnTask(is_succession, show_game_task);
@@ -603,7 +620,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                "-1",
+                                 "-1",
                                 3));
 //        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -643,7 +660,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = baseMessage.getData(UserEntity.class);
-        if (userEntity == null) {
+        if(userEntity == null){
             return;
         }
         DataUtil.getInstance().setUserEntity(userEntity);
@@ -671,20 +688,20 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         G.showToast("取消任务成功");
         CommonUtil.getInstance().setTAskEnty(null);
         refreshTaskList();
+        FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(0);//因为放弃了任务，所以刷新可以接收的任务列表
+        item.refreshData();
     }
 
     @Override
     public void giveUpTaskFailView(Object o) {
 
     }
-
     private int is_succession = 3;//所有
     private int show_game_task = 1;//包含游戏任务
-
     @Override
     public void returnTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.new_run_task(is_succession, show_game_task));
-        if (isNewData) {
+        if(isNewData) {
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
             AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
@@ -718,7 +735,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void releaseTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task);
-        if (isNewData && object instanceof BaseMessage) {
+        if(isNewData && object instanceof BaseMessage) {
             List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             if (releaseEtyList != null) {
                 releaseEtyLists = releaseEtyList;
@@ -756,7 +773,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successSlideshow(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
-        if (isNewData) {
+        if(isNewData){
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
             if (ListUtil.isEmpty(slideshowEtyList)) {
                 banner.setVisibility(View.GONE);
@@ -781,7 +798,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successbulletin(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.bulletin);
-        if (isNewData) {
+        if(isNewData){
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
             if (ListUtil.isEmpty(bulletinEntyList)) {
                 homepageItemNoticeLayout.setVisibility(View.GONE);
@@ -797,7 +814,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void successhomeList(BaseMessage baseMessage) {
         checkAndInitView();
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
-        if (isNewData) {
+        if(isNewData){
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
             if (ListUtil.isEmpty(homeListEntityList)) {
                 home_list_gridview_layout.setVisibility(View.GONE);
@@ -850,18 +867,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_layout.setVisibility(View.GONE);
 
     }
-
     private int onResumeCount = 0;
-
     @Override
     public void onResume() {
         super.onResume();
         UserEntity result = DataUtil.getInstance().getUserEntity();
-        if (result == null) {
+        if(result == null) {
             CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                 @Override
                 public void call(UserEntity item) {
-                    if (item != null) {
+                    if(item != null) {
                         userEntity = item;
                         loadUserInfo();
                     }
@@ -871,7 +886,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        if (DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
+        if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
             refreshTaskList();
 
         viewRobDuty.setOnClickListener(new View.OnClickListener() {
@@ -932,6 +947,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case ONFRESH_FGT_FAMLLSHEEP:
                 mHanderl.sendEmptyMessage(1);
                 break;
+            case FGT_SHEEP_REFRESH_H:
+                mHanderl.sendEmptyMessage(2);
+                break;
         }
     }
 
@@ -1140,7 +1158,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 点击一条公告
      */
     private void onClickNotice(BulletinEnty item) {
-        switch (item.getJumpType()) {// 跳转类型:11,任务 98,内部h5 99,外部h5
+        switch (item.getJumpType()){// 跳转类型:11,任务 98,内部h5 99,外部h5
             case 11:
                 Jump2View.getInstance().goTaskDetailView(activity, NumberFormatUtils.parseInteger(item.getJumpValue()));
                 break;
@@ -1185,7 +1203,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
 
     }
-
     /**
      * 邀请成功后在个人资料显示领红包弹窗
      *
@@ -1227,7 +1244,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         });
 
     }
-
     /**
      * 兑换红包
      *
@@ -1246,33 +1262,32 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (popupWindow.isShowing()) {
+                        if (popupWindow.isShowing()){
                             popupWindow.dismiss();
                         }
                     }
                 });
     }
-
     /**
      * 新手任务
      */
-    private void addNewTask() {
+    private void addNewTask(){
 //        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
         {
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("新手任务");
             homeListEntity.setDesc("新手任务");
             homeListEntity.setJump("-1");
-            homeListEntity.setIcon(R.mipmap.homepage_xinshourw + "");
+            homeListEntity.setIcon(R.mipmap.homepage_xinshourw+"");
             homeListEntitys.add(0, homeListEntity);
 
         }
-        if (homeListEntitys.size() > 8) {
+        if(homeListEntitys.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             homeListEntitys.add(7, homeListEntity);
         }
         onResumeCount++;
@@ -1281,26 +1296,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private void setValueList(boolean flag) {
         homeListEntitysGridview.clear();
-        for (int i = 0; i < homeListEntitys.size(); i++) {
-            if (flag) {
+        for(int i=0;i<homeListEntitys.size();i++){
+            if(flag){
                 homeListEntitysGridview.add(homeListEntitys.get(i));
-            } else {
-                if (i < 8) {
+            }else {
+                if(i<8){
                     homeListEntitysGridview.add(homeListEntitys.get(i));
                 }
             }
 
         }
-        if (homeListEntitysGridview.size() > 8) {
+        if(homeListEntitysGridview.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
             } else {
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -398,6 +398,9 @@ public class DataUtil {
         }
         return null;
     }
+    public static boolean 是官方包吗(){
+        return "kfzs".equals(ChannelContent.getInstance().getChannel_name());
+    }
 //    //正在运行的任务
 //    List<TaskAcceptedEty> taskAcceptedEtyList = ListUtil.emptyList();
 //    public void addTaskAcceptedEtyList(List<TaskAcceptedEty> list) {

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

@@ -119,7 +119,7 @@ public class TaskListItemAdp extends BaseAdapter {
     }
 
     /**
-     * 1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核
+     * 1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核8任务已下线9连续任务
      * @return
      */
     private String returnValue(TaskAcceptedEty ety){
@@ -164,6 +164,7 @@ public class TaskListItemAdp extends BaseAdapter {
                 textView.setText("审核中");
                 break;
             case 3://完成
+            case 9:
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("已完成");

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

@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -24,6 +25,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.util.LogUtil;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
@@ -89,8 +91,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(!ListUtil.isEmpty(releaseEtyListsBegin))
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin));
         tryMakeMoneyAdp.refreshAdapter();
-        CommonUtil.getInstance().updateEmptyView(empty_view, tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty());
+        boolean showEmpty = tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
+        LogUtil.println("showEmpty", showEmpty);
+        CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
         refresh.setRefreshing(false);
+        if(!TextUtils.isEmpty(show_type))
+            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_REFRESH_H));
     }
     public static FgtTryMakeMoney newInstance(int type){
         FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
@@ -162,7 +168,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         tryMakeMoneyAdp.addType(type);
         tryMakeMoneyAdp.addShowType(show_type);
-        tryMakeMoneyAdp.setIs_succession(is_succession);
+        tryMakeMoneyAdp.setIs_succession(TextUtils.isEmpty(show_type)?is_succession:3);
         tryMakeMoneyAdp.addPresenter(presenter);
         for (int i = 0; i < LIST_COUNT; i++) {
             tryMakeMoneyAdp.add(NULL);
@@ -206,7 +212,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void refreshData(){
         DataUtil.getInstance().isTaskListChange(getClass());
         isFirstCache = false;
-        refresh.setRefreshing(true);
+        if(TextUtils.isEmpty(show_type))
+            refresh.setRefreshing(true);
         mInitData();
     }
     public void mInitData() {
@@ -224,7 +231,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             if(isGameTask) {
                 cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.run_game_task, TaskAcceptedEty.class);
             } else {
-                cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(is_succession, 0), TaskAcceptedEty.class);
+                cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(TextUtils.isEmpty(show_type)?is_succession:3, 0), TaskAcceptedEty.class);
             }
             if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {
                 acceptedEtyList.clear();
@@ -239,7 +246,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             getFromACache(type);
         }
         //加载网络数据
-        if(TextUtils.isEmpty(show_type))
+        if(TextUtils.isEmpty(show_type))//这里为
             type = 0;
         getFromNetWork(type);
     }
@@ -250,8 +257,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private void initAcceptedTaskList() {
         if(isGameTask){
             presenter.runGameTask();
-        } else {
-            presenter.returnTask(is_succession, 0);
+        } else if(!TextUtils.isEmpty(show_type)){
+
+        }
+        else {
+            presenter.returnTask(TextUtils.isEmpty(show_type)?is_succession:3, 0);
         }
     }
 
@@ -316,7 +326,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void returnTaskTaskUpdataView(Object object) {
-        boolean isNewData = DataUtil.getInstance().isNewData(isGameTask ? ApiKey.run_game_task : ApiKey.new_run_task(is_succession, 0));
+        boolean isNewData = DataUtil.getInstance().isNewData(isGameTask ? ApiKey.run_game_task : ApiKey.new_run_task(TextUtils.isEmpty(show_type)?is_succession:3, 0));
         if(isNewData) {
             if (object instanceof BaseMessage) {
                 List<TaskAcceptedEty> taskAcceptedEty = ((BaseMessage) object).getDataList(TaskAcceptedEty.class);
@@ -345,7 +355,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     @Override
     public void releaseTaskTaskUpdataView(Object object) {
-        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task(type, task_type, is_succession));
+        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task(type, task_type, TextUtils.isEmpty(show_type)?is_succession:3));
         if(isNewData && object instanceof BaseMessage) {
             List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             switch (type) {
@@ -412,14 +422,15 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     private void getFromAcacheFirst(int type){
         if(TextUtils.isEmpty(show_type)){
-            getFromACache(++type);
+            this.type = ++type;
+            getFromACache(this.type);
         }
     }
     private void getFromACache(int type){
         if(type > 1){
             return;
         }
-        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, is_succession), TaskReleaseEty.class);
+        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, TextUtils.isEmpty(show_type)?is_succession:3), TaskReleaseEty.class);
         switch (type){
             case 0:
                 if(cacheTaskReleaseEtyList == null) {
@@ -449,7 +460,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     private void getFromNetWorkFirst(int type){
         if(TextUtils.isEmpty(show_type)){
-            getFromNetWork(++type);
+            this.type = ++type;
+            getFromNetWork(this.type);
         }
     }
     private void getFromNetWork(int type){
@@ -467,7 +479,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                                 0,
                                 type,
                                 task_type,
-                                is_succession));
+                                TextUtils.isEmpty(show_type)?is_succession:3));
         presenter.releaseTask(parameEty);
     }
+
+    public int getDataCount() {
+        return acceptedEtyList.size() + releaseEtyLists.size() + releaseEtyListsBegin.size();
+    }
 }

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

@@ -35,6 +35,8 @@
                 android:layout_weight="1"
                 android:text="@string/app_name"
                 android:textColor="@color/black_6_3"
+                android:singleLine="true"
+                android:ellipsize="end"
                 android:textSize="15sp" />
 
             <com.kfzs.android.view.tag.TagFlowLayout

app/src/main/res/values/common.xml

@@ -63,6 +63,7 @@
     <dimen name="content_padding_54">54dp</dimen>
     <dimen name="content_padding_65">65dp</dimen>
     <dimen name="content_padding_80">80dp</dimen>
+    <dimen name="content_padding_96">96.5dp</dimen>
     <dimen name="content_padding_100">100dp</dimen>
     <dimen name="content_padding_120">120dp</dimen>
     <dimen name="content_padding_140">140dp</dimen>