Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

# Conflicts:
#	app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

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

@@ -120,7 +120,6 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_QZONE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WEIXIN_CIRCLE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WX;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.XIAOMI_GAME_RECEIVE;
-import static com.sheep.gamegroup.util.ViewUtil.mRobTask;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
 import static com.sheep.gamegroup.view.adapter.WelfareAdapter.TO_REFRESH;
 import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
@@ -2419,7 +2418,7 @@ public class CommonUtil {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         if (action1 != null) {
-                            mRobTask = baseMessage.getData(RobTask.class);
+                            RobTask mRobTask = baseMessage.getData(RobTask.class);
                             action1.call(mRobTask);
                         }
                     }

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

@@ -110,7 +110,7 @@ public class ViewUtil {
 
     public static final int REQUEST_CODE_TASK_LIST = 110;
     private static ViewUtil viewUtil;
-    static RobTask mRobTask;
+    private RobTask mRobTask;
 
     public static ViewUtil newInstance() {
         if (viewUtil == null) {
@@ -206,7 +206,7 @@ public class ViewUtil {
      *
      * @return , TaskEty对象
      */
-    public static RobTask getTask(final ImageView ivIcon, final TextView tvTitel, final TextView tvDutyMoney) {
+    public RobTask getTask(final ImageView ivIcon, final TextView tvTitel, final TextView tvDutyMoney) {
         LogUtil.logI(SpUtils.getOrder("order") + "开始的order");
 
         CommonUtil.getInstance().robTask(new Action1<RobTask>() {
@@ -236,7 +236,7 @@ public class ViewUtil {
      * @param mActivity  当前Activity,
      * @param viewAnchor 锚
      */
-    public static void showRobDutyDialog(final Activity mActivity, View viewAnchor) {
+    public void showRobDutyDialog(final Activity mActivity, View viewAnchor, RobTask robTask) {
         View view = LayoutInflater.from(mActivity).inflate(R.layout.pop_robduty, null, false);
         ImageView ivChangeOne = view.findViewById(R.id.iv_change_one);
         ImageView ivDoNow = view.findViewById(R.id.iv_do_now);
@@ -247,7 +247,16 @@ public class ViewUtil {
         final TextView tvDutyMoney = view.findViewById(R.id.tv_robduty_money);
         ViewUtil.setDefaultText(tvTitel);
         ViewUtil.setDefaultText(tvDutyMoney);
-        mRobTask = getTask(ivIcon, tvTitel, tvDutyMoney);
+        if(robTask != null){
+            mRobTask = robTask;
+            SpUtils.saveOrder("order", mRobTask.getOrder());
+            SheepApp.getInstance().setOrder(mRobTask.getOrder());
+            tvDutyMoney.setText("+"+mRobTask.getM().getBonus() + "元");//设置任务奖励金额
+            tvTitel.setText(mRobTask.getM().getName()+"");//设置任务名字--getTask().getTask_name()
+            GlideImageLoader.setImage(ivIcon, mRobTask.getM().getTask().getIcon());//设置任务图标
+        }else {
+            mRobTask = getTask(ivIcon, tvTitel, tvDutyMoney);
+        }
         final PopupWindow popupWindow = new PopupWindow(mActivity);
         popupWindow.setContentView(view);
         popupWindow.setAnimationStyle(R.style.Rising);

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

@@ -18,7 +18,6 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
@@ -37,7 +36,6 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.transformer.ScaleTransformer;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.StringUtils;
@@ -104,6 +102,7 @@ public class ActInvitation extends BaseActivity {
     protected int getLayoutId() {
         return R.layout.act_invitation;
     }
+
     private List<PictureInvitationEntity> mPictureList = new ArrayList<>();
     private List<View> viewArrayList = new ArrayList<>();
 
@@ -111,7 +110,7 @@ public class ActInvitation extends BaseActivity {
     @Override
     public void initView() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(this) -G.getNoHasVirtualKey(this) );
+            main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(this) - G.getNoHasVirtualKey(this));
 
         }
     }
@@ -128,7 +127,7 @@ public class ActInvitation extends BaseActivity {
     @Override
     public void initData() {
         showProgress();
-        if(userEntity == null) {
+        if (userEntity == null) {
             CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
                 @Override
                 public void call(UserEntity userEntity) {
@@ -188,15 +187,17 @@ public class ActInvitation extends BaseActivity {
                     }
                 });
     }
+
     private int load = 0;
+
     private void checkLoadLinkAndDesFinish() {
-        if(userEntity  != null && friendAndAwardEntity != null){
+        if (userEntity != null && friendAndAwardEntity != null) {
             init(userEntity.getShareLink(), friendAndAwardEntity.getShare_desc());
         }
     }
 
     private void checkLoadFinish() {
-        if(load == 3){
+        if (load == 3) {
             hideProgress();
         }
     }
@@ -223,7 +224,7 @@ public class ActInvitation extends BaseActivity {
                             return false;
                         }
                     })
-                    .apply(new RequestOptions().centerCrop().transform(new RoundedCorners((int) getResources().getDimension(R.dimen.content_padding_8))))
+                    .apply(new RequestOptions().transform(new RoundedCorners((int) getResources().getDimension(R.dimen.content_padding_8))).fitCenter())
                     .into(image_full);
             GlideImageLoader.saveAndSetRqImage(image_bottom, item.getLink(), 800);
             viewArrayList.add(itemView);
@@ -250,9 +251,10 @@ public class ActInvitation extends BaseActivity {
 
             }
         });
-        if(size > 2)
-            viewPager.setCurrentItem((size-1) / 2, false);
+        if (size > 2)
+            viewPager.setCurrentItem((size - 1) / 2, false);
     }
+
     private int curPosition = 0;
     private SparseArray<View> viewList = new SparseArray<>();
 
@@ -297,11 +299,11 @@ public class ActInvitation extends BaseActivity {
                     @Override
                     public void onClick(View view) {
                         File file = null;
-                        switch (position){
+                        switch (position) {
                             case 2://qq
                             case 1://wx
                                 PictureInvitationEntity picItem = ListUtil.getItem(mPictureList, curPosition);
-                                if(picItem != null && picItem.isLoaded()) {
+                                if (picItem != null && picItem.isLoaded()) {
                                     try {
                                         String fileName = String.format(Locale.CHINA, "share%d%s%d.jpg", position, BuildConfig.FLAVOR, picItem.getPicture().hashCode());
                                         file = new File(ClassFileHelper.DIR, fileName);
@@ -392,7 +394,7 @@ public class ActInvitation extends BaseActivity {
                 break;
         }
         UMImage umImage;
-        switch (type){
+        switch (type) {
             case DialogShare.QQ:
             case DialogShare.WX:
                 umImage = new UMImage(activity, file);
@@ -405,7 +407,7 @@ public class ActInvitation extends BaseActivity {
         umWeb.setTitle(activity.getResources().getString(R.string.app_name));
         umWeb.setThumb(umImage);
         umWeb.setDescription(TextUtils.isEmpty(description) ? activity.getResources().getString(R.string.app_name) : description);
-        switch (type){
+        switch (type) {
             case DialogShare.QQ:
             case DialogShare.WX:
                 new ShareAction(activity)
@@ -423,6 +425,7 @@ public class ActInvitation extends BaseActivity {
                 break;
         }
     }
+
     @OnClick(R.id.img_baseactivity_title)
     public void onViewClicked(View view) {
         switch (view.getId()) {

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

@@ -523,7 +523,9 @@ public class ActWeb extends BaseActivity {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mWebView.loadUrl(url);
+                if (mWebView != null && !TextUtils.isEmpty(url)) {
+                    mWebView.loadUrl(url);
+                }
             }
         });
     }

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

@@ -67,7 +67,7 @@ public class AdpHomeListGrideview extends BaseAdapter {
         ViewUtil.newInstance().showGridviewStatues(context,holder.gridview_item_tag_tv, entity);
         ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
         Glide.with(context)
-                .load(entity.getId() == 0 ? Integer.valueOf(entity.getIcon()) : entity.getIcon())
+                .load(entity.getIcon())
                 .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /3, G.WIDTH /4 /3))
                 .into(holder.gridview_item_icon_iv);
         return convertView;

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

@@ -23,7 +23,6 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -51,7 +50,6 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
     private Activity activity;
     @Override
     public void onViewCreated() {
-        ButterKnife.bind(this, mView);
         activity = getActivity();
         if(activity != null) {
             swipe_container.setFooterView(activity, list_view, R.layout.listview_footer);

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

@@ -28,8 +28,6 @@ import org.greenrobot.eventbus.Subscribe;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -101,7 +99,29 @@ public abstract class BaseListFragment<T> extends BaseFragment {
         bottomLine = ViewUtil.setBottomLine(view_list, getNoMoreCallBack());
         view_list.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
         view_list.setAdapter(getAdapter());
+        view_list.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+                RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+
+                if(layoutManager instanceof LinearLayoutManager){
+                    LinearLayoutManager linearLayoutManager = (LinearLayoutManager) layoutManager;
+                    //获取最后一个view 位置
+                    int lastItemPosition = linearLayoutManager.findLastVisibleItemPosition();
+
+                    View childView = recyclerView.getChildAt(list.size() - 1);
+                    //底部bottom
+                    int bottom = childView.getBottom();
+                    //正常来说RecycleView的顶部坐标应该是0,但是严格来考虑,当RecycleView设置了paddingTop时,所有子view的绘制将以paddingTop的位置为起始位置,所以实际的顶部应该是paddingTop的高度的数值.
+                    int topEdge=recyclerView.getPaddingBottom();
+
+                    if(newState == RecyclerView.SCROLL_STATE_IDLE && lastItemPosition + 1 == list.size()){
 
+                    }
+                }
+            }
+        });
     }
 
     protected void loadMoreData() {
@@ -117,6 +137,8 @@ public abstract class BaseListFragment<T> extends BaseFragment {
                         view_list.setNoMore(true);
                         setNoMore(true);
                     }
+                }else {
+                    view_list.loadMoreComplete();
                 }
             }
         },1000);
@@ -231,20 +253,16 @@ public abstract class BaseListFragment<T> extends BaseFragment {
         notifyData();
         view_list.getFootView().setVisibility(view_list.getAdapter().getItemCount() == 0?View.GONE : View.VISIBLE);
     }
-    Unbinder unbinder;
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if(rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
         // any time,when you finish your activity or fragment,call this below
         if(view_list != null){
             view_list.destroy(); // this will totally release XR's memory

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

@@ -10,9 +10,6 @@ import android.view.ViewGroup;
 
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.constant.SpinnerStyle;
-import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
-import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.sheep.gamegroup.model.api.ApiService;
@@ -33,8 +30,6 @@ import org.greenrobot.eventbus.Subscribe;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -252,20 +247,16 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         view_list.getAdapter().notifyDataSetChanged();
         notifyData();
     }
-    Unbinder unbinder;
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if(rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
         // any time,when you finish your activity or fragment,call this below
         if(view_list != null){
 //            view_list.destroy(); // this will totally release XR's memory

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

@@ -16,7 +16,6 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * Created by ljy on 2018/8/17.
@@ -46,7 +45,6 @@ public class FgtAskGetMoneyFriend extends BaseFragment {
 
     @Override
     public void onViewCreated() {
-        ButterKnife.bind(this, mView);
         activity = getActivity();
 
         initView();

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

@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -76,7 +75,6 @@ public class FgtAskGetMoneyRank extends BaseFragment {
 
     @Override
     public void onViewCreated() {
-        ButterKnife.bind(this, mView);
         activity = getActivity();
 
         if(!EventBus.getDefault().isRegistered(this))
@@ -256,6 +254,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        unbinder.unbind();
         if(EventBus.getDefault().isRegistered(this))
             EventBus.getDefault().unregister(this);
     }

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

@@ -42,9 +42,7 @@ import com.sunfusheng.marqueeview.MarqueeView;
 import org.greenrobot.eventbus.EventBus;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -84,23 +82,14 @@ public class FgtAskgetmoney extends BaseFragment {
     TextView copy_my_invitation_tv;
 
     private FriendAndAwardEntity mEntity;
-    Unbinder unbinder;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if (rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     private Activity activity;
 
     @Override

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

@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.functions.Action1;
 
 /**
@@ -67,13 +66,13 @@ public class FgtAudit extends BaseFragment {
 
     @Override
     public void onViewCreated() {
-        ButterKnife.bind(this, mView);
         activity = getActivity();
         initView();
     }
 
     private void initView() {
         title.setVisibility(View.GONE);
+        empty_view.setPadding(0, 50, 0, 0);
         swipe_container.setFooterView(activity, withdrawalListview, R.layout.listview_footer);
         adp = new TaskListItemAdp(activity , etyList);
         withdrawalListview.setAdapter(adp);

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

@@ -4,14 +4,12 @@ import android.app.Activity;
 import android.view.View;
 import android.widget.ListView;
 
-import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.view.adapter.CreditCardProgressQueryAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -20,7 +18,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -46,7 +43,6 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
     @Override
     public void onViewCreated() {
         activity = getActivity();
-        ButterKnife.bind(this, mView);
         swipe_container.setFooterView(activity, credit_card_task_list, R.layout.listview_footer);
         adapter = new CreditCardProgressQueryAdp(activity, list);
         credit_card_task_list.setAdapter(adapter);

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

@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -46,7 +45,6 @@ public class FgtCreditCardTaskList extends BaseFragment {
     private Activity activity;
     @Override
     public void onViewCreated() {
-        ButterKnife.bind(this, mView);
         activity = getActivity();
         swipe_container.setFooterView(activity, credit_card_task_list, R.layout.listview_footer);
         adapter = new CreditCardTaskAdp(activity, list);

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

@@ -25,8 +25,6 @@ import org.afinal.simplecache.ApiKey;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -53,23 +51,13 @@ public class FgtFind extends BaseFragment {
         initData();
     }
 
-    Unbinder unbinder;
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if (rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     @BindView(R.id.indicator)
     TabLayout indicator;
     @BindView(R.id.pager)

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

@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -47,7 +46,6 @@ public class FgtFriendExtractPage extends BaseFragment {
     private Fragment activity;
     @Override
     public void onViewCreated() {
-        ButterKnife.bind(this, mView);
         activity = getParentFragment();
         if(!EventBus.getDefault().isRegistered(this))
             EventBus.getDefault().register(this);
@@ -132,6 +130,7 @@ public class FgtFriendExtractPage extends BaseFragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        unbinder.unbind();
 
         if(EventBus.getDefault().isRegistered(this))
             EventBus.getDefault().unregister(this);

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

@@ -33,8 +33,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.functions.Action1;
 
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_SHEEP;
@@ -65,23 +63,13 @@ public class FgtGameAgencyRecharge extends BaseFragment {
         Aria.download(this).register();
     }
 
-    Unbinder unbinder;
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if (rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     private Activity activity;
 
     @Override

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

@@ -24,8 +24,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.functions.Action1;
 
 /**
@@ -85,22 +83,13 @@ public class FgtMainAudit extends BaseFragment {
         });
 
     }
-    Unbinder unbinder;
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if(rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     public void initData() {
 
         CommonUtil.getInstance().staticAudit(new Action1<BaseMessage>() {

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

@@ -28,8 +28,6 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.functions.Action1;
 
 /**
@@ -73,24 +71,14 @@ public class FgtMiDong extends BaseFragment {
         }
     }
 
-    Unbinder unbinder;
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if (rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Override
     public int getLayoutId() {
         return R.layout.net_empty_fresh_list_more;
     }

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

@@ -2,10 +2,7 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,7 +23,6 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
-import com.sheep.gamegroup.view.customview.SheepmSwipeRefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -39,8 +35,6 @@ import java.util.List;
 import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -58,7 +52,6 @@ public class FgtMyGame extends BaseFragment {
     XRecyclerView recyclerview;
     @BindView(R.id.empty_view)
     View empty_view;
-    Unbinder unbinder;
     private Activity activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private int page = 1;//页数
@@ -185,7 +178,6 @@ public class FgtMyGame extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         Bundle bundle = getArguments();
         if(bundle != null){
             type = bundle.getInt("type", 0);
@@ -193,12 +185,6 @@ public class FgtMyGame extends BaseFragment {
         return rootView;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     private int onResumeCount = 0;
     @Override
     public void onResume() {

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

@@ -5,14 +5,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -39,16 +35,13 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.afinal.simplecache.ACache;
 
 import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -91,7 +84,6 @@ public class FgtPersonalCenter extends BaseFragment {
     View txt_baseactivity_title;
     @BindView(R.id.img_baseactivity_title)
     View img_baseactivity_title;
-    Unbinder unbinder;
 
     public UserEntity userEntity;
     private String faqUrl;
@@ -178,14 +170,6 @@ public class FgtPersonalCenter extends BaseFragment {
 
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-        return rootView;
-    }
-
     /**
      * 获取是否有未读消息并更新图标
      */
@@ -320,12 +304,6 @@ public class FgtPersonalCenter extends BaseFragment {
                 });
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout,
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.feedbook_layout,
             R.id.recommend_friend_layout, R.id.faq_layout, R.id.reservation_layout, R.id.version_layout,

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

@@ -2,7 +2,6 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -16,7 +15,6 @@ import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
@@ -26,10 +24,8 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import rx.functions.Action1;
 
@@ -175,14 +171,7 @@ public class FgtPlaGameGift extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         gameEntity = DataUtil.getObject(getArguments(), GameEntity.class);
         return rootView;
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
 }

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

@@ -22,7 +22,6 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.entity.GameEntity;
@@ -36,6 +35,7 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -53,7 +53,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
@@ -239,17 +238,10 @@ public class FgtPlayGame extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Override
     public void onStart() {
         super.onStart();
         //结束轮播

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

@@ -22,13 +22,11 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.ArrayAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.tencent.smtt.sdk.WebView;
 
 import java.util.ArrayList;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
 /**
@@ -132,14 +130,7 @@ public class FgtPlayGameDetail extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         gameEntity = DataUtil.getObject(getArguments(), GameEntity.class);
         return rootView;
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
 }

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

@@ -45,7 +45,6 @@ public class FgtPlayGameSon extends BaseListFragment2<GameEntity> {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         Bundle bundle = getArguments();
         if(bundle != null){
             type = bundle.getInt("type", 1002);

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

@@ -42,7 +42,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import me.iwf.photopicker.PhotoPreview;
 import rx.android.schedulers.AndroidSchedulers;
@@ -85,15 +84,8 @@ public class FgtRouser extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
     private void initView(){
         title.setVisibility(View.GONE);
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {

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

@@ -34,7 +34,6 @@ import java.util.Locale;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
 
@@ -102,18 +101,10 @@ public class FgtSignRankings extends BaseFragment implements SignRankingsContrac
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        if (rootView != null)
-            unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Override
     public void succPunch(BaseMessage o) {
         List<PunchEntity> list = o.getDatas(PunchEntity.class);
 

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

@@ -950,7 +950,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                     @Override
                     public void call(RobTask robTask) {
                         if(robTask != null){
-                            ViewUtil.showRobDutyDialog(getActivity(), getView());
+                            SheepApp.getInstance().setOrder(robTask.getOrder());
+                            ViewUtil.newInstance().showRobDutyDialog(getActivity(), getView(), robTask);
                         }else {
                             G.showToast("任务已被抢光！请实时关注任务发布！");
                         }
@@ -1565,7 +1566,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             homeListEntityNewTask.setTitle("新手任务");
             homeListEntityNewTask.setDesc("新手任务");
             homeListEntityNewTask.setJump("-1");
-            homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
+            homeListEntityNewTask.setIcon("http://cdngame.kuaifazs.com/homepage_xinshourw.png");
             homeListEntitys.add(0, homeListEntityNewTask);
         }
         if (homeListEntitys.size() > 8) {
@@ -1573,7 +1574,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+            homeListEntity.setIcon("http://cdngame.kuaifazs.com/homepage_chakangd.png");
             homeListEntitys.add(7, homeListEntity);
         }
         setValueList(false);
@@ -1598,11 +1599,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             if (flag) {
                 homeListEntity.setTitle("收起模块");
                 homeListEntity.setDesc("收起模块");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
+                homeListEntity.setIcon("http://cdngame.kuaifazs.com/homepage_chakangd_click.png");
             } else {
                 homeListEntity.setTitle("查看更多");
                 homeListEntity.setDesc("查看更多");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+                homeListEntity.setIcon("http://cdngame.kuaifazs.com/homepage_chakangd.png");
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -61,14 +61,10 @@ import butterknife.Unbinder;
  */
 
 public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContract.View {
+    @BindView(R.id.recyclerview)
+    XRecyclerView view_list;
     @BindView(R.id.empty_view)
     View empty_view;
-    @BindView(R.id.refreshLayout)
-    protected SmartRefreshLayout refreshLayout;
-    @BindView(R.id.recyclerview)
-    protected RecyclerView view_list;
-    @BindView(R.id.bottom_line)
-    protected LinearLayout bottomLine;
     Unbinder unbinder;
 
     @Inject
@@ -97,8 +93,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             }
             unbinder = ButterKnife.bind(this, mView);
         }
-        if(refreshLayout == null)
-            refreshLayout = findViewById(R.id.refreshLayout);
     }
 
     private static final int LIST_COUNT = 3;//tryMakeMoneyAdp 总共有3条数据
@@ -122,17 +116,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin));
         tryMakeMoneyAdp.refreshAdapter();
         boolean showEmpty = acceptedEtyList.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
-        if(showEmpty){
-            refreshLayout.setVisibility(View.GONE);
-            bottomLine.setVisibility(View.GONE);
-        }else {
-
-            refreshLayout.setVisibility(View.VISIBLE);
-        }
         CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
-
-        refreshLayout.finishRefresh(1000/*,false*/);//传入false表示加载失败
-        refreshLayout.finishLoadMore(1000/*,false*/);//传入false表示加载失败
+        view_list.refreshComplete();
+        view_list.loadMoreComplete();
         notifyBottomLine(false);
         if (isFromHome && isSelected)
             EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_REFRESH_H));
@@ -144,14 +130,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 bottomLine.setVisibility(View.GONE);
                 return;
             }
-            final int count = getDataCount();
-//            new Handler().postDelayed(new Runnable() {
-//                @Override
-//                public void run() {
-//
-//                    bottomLine.setVisibility(count == 0 ? View.INVISIBLE : View.VISIBLE);
-//                }
-//            },1500);
+            int count = getDataCount();
+            bottomLine.setVisibility(count == 0 ? View.INVISIBLE : View.VISIBLE);
             if(noMore) {
                 final boolean isCanScrollToPosition = count > 10;//页数大于一页才显示点击回到顶部
                 TextView bottom_line_text = bottomLine.findViewById(R.id.bottom_line_text);
@@ -222,6 +202,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         activity = getActivity();
         initView();
         initListener();
+        view_list.refresh();
 //        initData();
     }
 
@@ -259,29 +240,28 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
         view_list.setAdapter(tryMakeMoneyAdp);
 
-
-        /**
-         * 刷新控件
-         */
-        RefreshUtil.newInstance().publicParameterRefresh(refreshLayout, activity);
+        bottomLine = ViewUtil.setBottomLine(view_list, isFromHome ? new Action1<String>() {
+            @Override
+            public void call(String msg) {
+                if (isFromHome && isSelected)
+                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_FOOT_VIEW_CALL_BACK).setData(msg));
+            }
+        } : null);
 
     }
+    private View bottomLine;
 
     public void initListener() {
-        refreshLayout.setOnRefreshListener(new OnRefreshListener() {
+        view_list.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
-            public void onRefresh(RefreshLayout refreshlayout) {
-                refreshlayout.finishRefresh(1000/*,false*/);//传入false表示刷新失败
+            public void onRefresh() {
                 refreshData();
             }
-        });
-        refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+
             @Override
-            public void onLoadMore(final RefreshLayout refreshlayout) {
+            public void onLoadMore() {
                 boolean noMoreRelease = true;
                 boolean noMoreReleaseBegin = true;
-                if(bottomLine.getVisibility() == View.VISIBLE)
-                    bottomLine.setVisibility(View.GONE);
 
                 if(isGetRelease) {
                     if (ListUtil.size(releaseEtyLists) >= per_page * releasePage) {
@@ -304,26 +284,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                     }
                 }
                 if(noMoreRelease && noMoreReleaseBegin){
-                    refreshLayout.finishLoadMore(1000/*,false*/);//传入false表示加载失败
-                    refreshLayout.setNoMoreData(true);
+                    view_list.setNoMore(true);
                     noMore = true;
                     notifyBottomLine(true);
                     if (isFromHome)
                         EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SET_BOTTOM_LINE));
                 }
-
-            }
-        });
-        view_list.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-
-                if(bottomLine.getVisibility() == View.VISIBLE)
-                    bottomLine.setVisibility(View.GONE);
-                if (newState == RecyclerView.SCROLL_STATE_IDLE) {//滑动到了底部
-                    refreshLayout.autoLoadMore();
-                }
             }
         });
     }
@@ -418,7 +384,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         unbinder.unbind();
         // any time,when you finish your activity or fragment,call this below
         if(view_list != null){
-//            view_list.destroyDrawingCache(); // this will totally release XR's memory
+            view_list.destroyDrawingCache(); // this will totally release XR's memory
             view_list = null;
         }
     }

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

@@ -39,9 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -71,7 +69,6 @@ public class FgtWelfareCenter extends BaseFragment{
     TextView bottomLineText;
     @BindView(R.id.bottom_line)
     LinearLayout bottomLine;
-    Unbinder unbinder;
 
     @Override
     public int getLayoutId() {
@@ -264,16 +261,9 @@ public class FgtWelfareCenter extends BaseFragment{
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
 
     @OnClick({R.id.wc_all_welfare, R.id.wc_all_gift})
     public void onViewClicked(View view) {

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -10,6 +10,9 @@ import android.view.ViewGroup;
 
 import com.sheep.gamegroup.view.dialog.DialogLoading;
 
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
 /**
  * @ Created by Dlg
  * @ <p>TiTle:  BaseFragment</p>
@@ -27,6 +30,7 @@ public abstract class BaseFragment extends Fragment {
     protected boolean mIsFirstInit = true;
 
     protected DialogLoading dialogLoading;
+    protected Unbinder unbinder;
 
 
 
@@ -84,6 +88,7 @@ public abstract class BaseFragment extends Fragment {
         } else {
             mIsFirstInit = false;
         }
+        unbinder = ButterKnife.bind(this, mView);
         return mView;
     }
 
@@ -126,4 +131,9 @@ public abstract class BaseFragment extends Fragment {
         return (T)mView.findViewById(id);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
 }

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

@@ -12,35 +12,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!--<com.jcodecraeer.xrecyclerview.XRecyclerView-->
-        <!--android:id="@+id/recyclerview"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:descendantFocusability="blocksDescendants" />-->
-
-    <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/refreshLayout"
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="#fff"
-                android:overScrollMode="never" />
-
-            <include layout="@layout/find_item_bottom"
-                android:layout_below="@+id/refreshLayout"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"/>
-
-        </LinearLayout>
+        android:layout_height="match_parent"
+        android:descendantFocusability="blocksDescendants" />
 
-    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 </RelativeLayout>

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

@@ -6,7 +6,7 @@
     android:gravity="center"
     android:padding="@dimen/content_padding_20"
     android:orientation="horizontal"
-    android:visibility="gone">
+    android:visibility="visible">
 
     <ImageView
         android:layout_width="30dp"

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

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/image_full"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY" />
+        android:layout_centerHorizontal="true" />
 
     <LinearLayout
         android:layout_width="70dp"
@@ -23,10 +21,11 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_weight="8"
-            android:paddingEnd="4dp"
-            android:paddingStart="4dp"
-            android:paddingTop="4dp">
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="4dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_weight="1">
 
             <ImageView
                 android:id="@+id/image_bottom"
@@ -44,10 +43,10 @@
 
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_marginTop="-3dp"
-            android:gravity="top|center_horizontal"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1dp"
+            android:layout_marginBottom="3dp"
+            android:gravity="center"
             android:text="扫我开始赚钱"
             android:textColor="#ff999999"
             android:textSize="8sp" />

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

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