首页任务列表计算高度

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/FgtSmallSheep.java

@@ -221,6 +221,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     checkAndInitView();
                     break;
+                case 2:
+                    int count = 0;
+                    for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
+                        FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
+                        count = Math.max(item.getDataCount(), count);
+                    }
+                    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;
             }
 
         }
@@ -452,7 +462,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         refreshData();
     }
 
-    int toolBarPositionY;
     /**
      * 刷新数据
      */
@@ -507,20 +516,15 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 }
             }
         });
-        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
@@ -898,6 +902,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;
         }
     }
 

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();
@@ -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() {
@@ -470,4 +477,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                                 is_succession));
         presenter.releaseTask(parameEty);
     }
+
+    public int getDataCount() {
+        return acceptedEtyList.size() + releaseEtyLists.size() + releaseEtyListsBegin.size();
+    }
 }

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>