review

任务记录中底线应该添加到最后一条数据之后；
邀请赚钱中界面优化；
主页中无数据图标上移

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

@@ -243,22 +243,6 @@ public class FgtAskgetmoney extends BaseCompatFragment {
         pager.setOffscreenPageLimit(2);
         pager.setAdapter(mAdapter);
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
-        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int i, float v, int i1) {
-
-            }
-
-            @Override
-            public void onPageSelected(int i) {
-                pager.reSetHeight();
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int i) {
-
-            }
-        });
 
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);

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

@@ -241,7 +241,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                     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));
+                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
                 case 7:
@@ -263,6 +263,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
             showRedPackage(obj);
         }
+
     }
 
     /**

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

@@ -66,9 +66,14 @@ public class TaskListItemAdp extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        if(position == getCount()-1){
+        final Object object = getItem(position);
+        if(!(object instanceof TaskAcceptedEty)){
             return LayoutInflater.from(context).inflate(R.layout.find_item_bottom, null);
         }
+        final TaskAcceptedEty ety = (TaskAcceptedEty) object;
+        if(ety.getRelease_task() == null || ety.getRelease_task().getTask() == null){
+            return convertView;
+        }
         Object tag = convertView == null ? null : convertView.getTag();
         ViewHolder holder;
         if(tag instanceof ViewHolder){
@@ -85,10 +90,6 @@ public class TaskListItemAdp extends BaseAdapter {
             convertView.setTag(holder);
         }
 
-        final TaskAcceptedEty ety = (TaskAcceptedEty) getItem(position);
-        if(ety == null || ety.getRelease_task() == null || ety.getRelease_task().getTask() == null){
-            return convertView;
-        }
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
         ViewUtil.setText(holder.date_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
         String stateStr = "";

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

@@ -114,9 +114,12 @@ public class FgtAudit extends BaseFragment {
             CommonUtil.getInstance().getAudit(new Action1<BaseMessage>() {
                 @Override
                 public void call(BaseMessage baseMessage) {
+                    int count = 0;
                     if(baseMessage != null){
                         List<TaskAcceptedEty> releaseEtyList = baseMessage.getDataList(TaskAcceptedEty.class);
-                        ListUtil.addAll(etyList, releaseEtyList);
+                        count = ListUtil.addAll(etyList, releaseEtyList);
+                    }
+                    if(count < per_page){//添加最后一条底线
                         if(!etyList.isEmpty())
                             etyList.add(null);
                     }

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

@@ -1,31 +1,22 @@
 package com.sheep.gamegroup.view.fragment;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
-import com.kfzs.duanduan.mine.ShenheAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAuditEntity;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import java.lang.reflect.Field;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;

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

@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/title"
-        android:layout_marginTop="100dp" />
+        android:layout_marginTop="50dp" />
 
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"

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

@@ -1,7 +1,7 @@
 <?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="26dp"
+    android:layout_height="43dp"
     android:gravity="center_vertical"
     android:orientation="horizontal">
     <TextView

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

@@ -20,5 +20,5 @@
     <dimen name="textSize3">18sp</dimen>
     <dimen name="textSize4">21sp</dimen>
 
-    <dimen name="ask_friend_list_h">245dp</dimen>
+    <dimen name="ask_friend_list_h">320dp</dimen>
 </resources>