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

app/src/main/java/com/sheep/gamegroup/event/EventTypes.java

@@ -49,4 +49,5 @@ public enum EventTypes {
     FGT_PLAY_GAME_REFRESH_H, //刷新玩转游戏高度
     FGT_PLAY_GAME_FOOT_VIEW_CALL_BACK, //玩转游戏中ViewPager内容中的任务列表XRecyclerView的FootView刷新回调
     FGT_PLAY_GAME_SET_BOTTOM_LINE , //设置底线内容
+    ASK_GETMONEY_FRIEND_REFRESH , //邀请赚钱刷新
 }

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

@@ -95,11 +95,11 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         //设置 Header 为 贝塞尔雷达 样式
         refreshLayout.setRefreshHeader(new ClassicsHeader(activity));
         //设置 Footer 为 球脉冲 样式
-        refreshLayout.setRefreshFooter(new ClassicsFooter(activity).setSpinnerStyle(SpinnerStyle.Scale));
+        refreshLayout.setRefreshFooter(new ClassicsFooter(activity).setDrawableSize(20));
         refreshLayout.setEnableAutoLoadMore(true);
         refreshLayout.setEnableLoadMore(true);
-        refreshLayout.setEnableLoadMoreWhenContentNotFull(true);//内容不满屏幕的时候也开启加载更多
-        refreshLayout.setFooterTriggerRate(1);
+//        refreshLayout.setEnableLoadMoreWhenContentNotFull(true);//内容不满屏幕的时候也开启加载更多
+//        refreshLayout.setFooterTriggerRate(1);
     }
     protected View bottomLine;
     public void initListener() {

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

@@ -6,9 +6,8 @@ import android.util.SparseArray;
 import android.view.View;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.view.adapter.PagerAdapter;
-import com.kfzs.duanduan.view.ViewPagerPlus;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.view.adapter.PagerAdapter;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -26,7 +25,7 @@ import butterknife.ButterKnife;
 public class FgtAskGetMoneyFriend extends BaseFragment {
 
     @BindView(R.id.friend_extract_vp)
-    ViewPagerPlus friend_extract_vp;
+    ViewPager friend_extract_vp;
     @BindView(R.id.friend_extract_last_page_tv)
     TextView friend_extract_last_page_tv;
     @BindView(R.id.friend_extract_page_tv)
@@ -35,6 +34,11 @@ public class FgtAskGetMoneyFriend extends BaseFragment {
     TextView friend_extract_next_page_tv;
     private Activity activity;
 
+
+    public static FgtAskGetMoneyFriend newInstance(){
+        FgtAskGetMoneyFriend fgt = new FgtAskGetMoneyFriend();
+        return fgt;
+    }
     @Override
     public int getLayoutId() {
         return R.layout.fgt_askgetmoney_friend;

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

@@ -11,6 +11,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.AskTop;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
@@ -25,6 +26,9 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.List;
 import java.util.Locale;
 
@@ -59,6 +63,12 @@ public class FgtAskGetMoneyRank extends BaseFragment {
     private Activity activity;
     private List<AskTop> list = ListUtil.emptyList();
     private AdbCommonRecycler<AskTop> adapter;
+
+    public static FgtAskGetMoneyRank newInstance(){
+        FgtAskGetMoneyRank fgt = new FgtAskGetMoneyRank();
+        return fgt;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_askgetmoney_rank;
@@ -69,6 +79,8 @@ public class FgtAskGetMoneyRank extends BaseFragment {
         ButterKnife.bind(this, mView);
         activity = getActivity();
 
+        if(!EventBus.getDefault().isRegistered(this))
+            EventBus.getDefault().register(this);
         initView();
     }
 
@@ -195,7 +207,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
         hideProgress();
         ViewUtil.newInstance().hideProgress(activity);
         CommonUtil.getInstance().updateEmptyView(emptyView, list.size() == 1, true);
-        while (list.size() < 5) {
+        while (list.size() < 6) {
             list.add(null);
         }
         adapter.notifyDataSetChanged();
@@ -227,8 +239,8 @@ public class FgtAskGetMoneyRank extends BaseFragment {
                     this_last_tv.setText(activity.getResources().getString(R.string.this_month_rank));
                     askTop5Title.setText(activity.getResources().getString(R.string.last_this_month_rank_top5));
                     long[] longs = CommonUtil.getInstance().getLastMonth();
-                    start_time = longs[0];
-                    end_time = longs[1];
+                    start_time = longs[0] / 1000;
+                    end_time = longs[1] / 1000;
                 }else {//查本月
                     start_time = 0;
                     end_time = 0;
@@ -240,4 +252,20 @@ public class FgtAskGetMoneyRank extends BaseFragment {
                 break;
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if(EventBus.getDefault().isRegistered(this))
+            EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case ASK_GETMONEY_FRIEND_REFRESH:
+                initData();
+                break;
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
@@ -19,6 +20,8 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -40,6 +43,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.sunfusheng.marqueeview.MarqueeView;
 
+import org.greenrobot.eventbus.EventBus;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -156,6 +161,7 @@ public class FgtAskgetmoney extends BaseFragment {
         ask_top_3.setLayoutParams(layoutParams3);
         ViewUtil.setDefaultText(tvSize);
         ViewUtil.setDefaultText(tvMoney);
+        showViewPager();
         initData(true);
 
         initListener();
@@ -202,8 +208,11 @@ public class FgtAskgetmoney extends BaseFragment {
     private UserEntity userEntity;
 
     public void initData(final boolean isShow) {
-        if (isShow)
+        if (isShow){
             showProgress();
+        }else {
+            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.ASK_GETMONEY_FRIEND_REFRESH));
+        }
         SheepApp.getInstance().getNetComponent().getApiService().FriendCountAndAward()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -236,7 +245,6 @@ public class FgtAskgetmoney extends BaseFragment {
 
                     }
                 });
-        showViewPager();
         CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
             @Override
             public void call(UserEntity result) {
@@ -265,8 +273,8 @@ public class FgtAskgetmoney extends BaseFragment {
 
     private void showViewPager() {
         mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
-        mAdapter.add(new FgtAskGetMoneyRank(), tabNames[0]);
-        mAdapter.add(new FgtAskGetMoneyFriend(), tabNames[1]);
+        mAdapter.add(FgtAskGetMoneyRank.newInstance(), tabNames[0]);
+        mAdapter.add(FgtAskGetMoneyFriend.newInstance(), tabNames[1]);
         pager.setOffscreenPageLimit(2);
         pager.setAdapter(mAdapter);
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Friend;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -16,6 +17,9 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,6 +49,8 @@ public class FgtFriendExtractPage extends BaseFragment {
     public void onViewCreated() {
         ButterKnife.bind(this, mView);
         activity = getParentFragment();
+        if(!EventBus.getDefault().isRegistered(this))
+            EventBus.getDefault().register(this);
         initData();
     }
 
@@ -122,4 +128,21 @@ public class FgtFriendExtractPage extends BaseFragment {
     public List<Friend> getList() {
         return list;
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if(EventBus.getDefault().isRegistered(this))
+            EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case ASK_GETMONEY_FRIEND_REFRESH:
+                initData();
+                break;
+        }
+    }
 }

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

@@ -5,6 +5,7 @@
     android:layout_marginEnd="@dimen/content_padding_10"
     android:layout_marginStart="@dimen/content_padding_10"
     android:layout_marginTop="@dimen/content_padding_10"
+    android:minHeight="@dimen/view_size_420"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
     android:orientation="vertical"
     android:paddingBottom="@dimen/content_padding_10"
@@ -21,10 +22,11 @@
 
     <include layout="@layout/x_ask_getmoney_act_layout_include" />
 
-    <com.kfzs.duanduan.view.ViewPagerPlus
+    <android.support.v4.view.ViewPager
         android:id="@+id/friend_extract_vp"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/ask_friend_list_h"
+        android:layout_height="@dimen/view_size_350"
+        android:minHeight="@dimen/ask_friend_list_h"
         android:layout_marginTop="3dp" />
 
     <LinearLayout

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

@@ -26,7 +26,8 @@
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-40dp">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/view_list"

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

@@ -82,6 +82,8 @@
     <dimen name="view_size_130">130dp</dimen>
     <dimen name="view_size_150">150dp</dimen>
     <dimen name="view_size_200">200dp</dimen>
+    <dimen name="view_size_350">350dp</dimen>
+    <dimen name="view_size_420">420dp</dimen>
 
 
     <dimen name="orienteering_item_gao">40dp</dimen>