修复代码报错;

小绵羊3.3需求--邀请赚钱优化

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

@@ -108,7 +108,6 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
-import com.sheep.jiuyan.samllsheep.service.FloatService;
 import com.sheep.jiuyan.samllsheep.service.FloatShotScreenService;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -1060,16 +1059,16 @@ public class Jump2View {
     }
 
 
-    /**
-     * 启动小绵羊悬浮窗
-     *
-     * @param context
-     */
-    public void startFloat(Context context, boolean isShow) {
-        Intent intent = new Intent(context, FloatService.class);
-        intent.putExtra("isShow", isShow);
-        context.startService(intent);
-    }
+//    /**
+//     * 启动小绵羊悬浮窗
+//     *
+//     * @param context
+//     */
+//    public void startFloat(Context context, boolean isShow) {
+//        Intent intent = new Intent(context, FloatService.class);
+//        intent.putExtra("isShow", isShow);
+//        context.startService(intent);
+//    }
     /**
      * 启动小绵羊悬浮窗
      *

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

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.util;
 
 import android.support.v4.app.Fragment;
 
-import com.sheep.gamegroup.view.fragment.FgtAskgetmoney;
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.view.fragment.FgtNull;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
@@ -39,7 +39,7 @@ public enum MainTab {
     FgtMainAskGetMoney(R.string.main_tab_invite) {
         @Override
         public Fragment getFragment() {
-            return new FgtAskgetmoney();
+            return new FgtAskGetMoney();
         }
 
         @Override

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

@@ -5,9 +5,10 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
-import com.sheep.gamegroup.view.fragment.FgtAskgetmoney;
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 /**
  * Created by Administrator on 2018/3/19.
@@ -20,18 +21,21 @@ public class AskGetMoneyAct extends BaseUMActivity{
 
     @Override
     protected int getLayoutId() {
-        return R.layout.personalcenter_act_layout;
+        return R.layout.common_container_act;
     }
 
     @Override
     public void initView() {
         activity = this;
 
+        TitleBarUtils.getInstance()
+                .setTitle(this, "邀请赚钱")
+                .setTitleFinish(activity);
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Bundle bundle = new Bundle();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if(fragment == null){
-            fragment = new FgtAskgetmoney();
+            fragment = new FgtAskGetMoney();
             fragment.setArguments(bundle);
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.commitAllowingStateLoss();

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

@@ -1,16 +1,11 @@
 package com.sheep.gamegroup.view.fragment;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -29,15 +24,12 @@ import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 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;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.sunfusheng.marqueeview.MarqueeView;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -53,7 +45,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
  * Created by ljy on 2018/8/20.
  */
 
-public class FgtAskgetmoney extends BaseFragment {
+public class FgtAskGetMoney extends BaseFragment {
     @BindView(R.id.refresh)
     SwipeRefreshLayout refresh;
     @BindView(R.id.tv_size)
@@ -68,8 +60,6 @@ public class FgtAskgetmoney extends BaseFragment {
     View ask_top_2;
     @BindView(R.id.ask_top_3)
     View ask_top_3;
-    @BindView(R.id.ask_award_info)
-    MarqueeView ask_award_info;
     @BindView(R.id.ask_scroll_view)
     NestedScrollView scrollView;
     @BindView(R.id.indicator)
@@ -83,13 +73,6 @@ public class FgtAskgetmoney extends BaseFragment {
 
     private FriendAndAwardEntity mEntity;
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        return rootView;
-    }
-
     private Activity activity;
 
     @Override
@@ -100,15 +83,6 @@ public class FgtAskgetmoney extends BaseFragment {
     @Override
     public void onViewCreated() {
         activity = getActivity();
-        if (activity instanceof ActMain) {
-            TitleBarUtils.getInstance()
-                    .setTitle(mView, "邀请赚钱")
-                    .setTitleListen(mView, 0, null);
-        } else {
-            TitleBarUtils.getInstance()
-                    .setTitle(mView, "邀请赚钱")
-                    .setTitleFinish(mView, activity);
-        }
 //
 //        String content = "<!DOCTYPEhtml>\n" +
 //                "<html>\n" +
@@ -153,29 +127,7 @@ public class FgtAskgetmoney extends BaseFragment {
 
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     public void initListener() {
-        scrollView.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_DOWN:
-                        if (ask_award_info != null) {
-                            //开始滚动
-                            ask_award_info.stopFlipping();
-                        }
-                        break;
-                    case MotionEvent.ACTION_UP:
-                    default:
-                        if (ask_award_info != null) {
-                            //开始滚动
-                            ask_award_info.startFlipping();
-                        }
-                        break;
-                }
-                return false;
-            }
-        });
 
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
@@ -242,17 +194,6 @@ public class FgtAskgetmoney extends BaseFragment {
         });
     }
 
-
-    @Override
-    public void onStop() {
-        super.onStop();
-
-        if (ask_award_info != null) {
-            //停止滚动
-            ask_award_info.stopFlipping();
-        }
-    }
-
     public static final String[] tabNames = {"排行榜", "好友列表"};
     private TitleFragmentListAdapter mAdapter;
 
@@ -268,7 +209,7 @@ public class FgtAskgetmoney extends BaseFragment {
         CommonUtil.getInstance().reflex(indicator, activity);
     }
 
-    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.ask_invite_rl, R.id.ask_act_rule})
+    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.refresh, R.id.ask_act_rule})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.copy_my_invitation_tv:
@@ -282,7 +223,7 @@ public class FgtAskgetmoney extends BaseFragment {
                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动规则").setBtnLeftText("我知道了").setTheme(DialogConfig.THEME_PURPLE)
                     .setMsg("首邀好友，好友下载并登录小绵羊，既可获得2.5绵羊币\n首邀好友完成新手任务，邀请人可额外再获得2.5绵羊币"));
                 break;
-            case R.id.ask_invite_rl://只是一个点击，用来遮盖底部不可见的view的点击
+            case R.id.refresh://只是一个点击，用来遮盖底部不可见的view的点击
                 break;
             case R.id.ask_invite_tv:
                 Jump2View.getInstance().goActInvitation(activity);

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

@@ -254,7 +254,6 @@ 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/FgtFriendExtractPage.java

@@ -130,7 +130,6 @@ 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/FgtSmallSheep.java

@@ -1289,20 +1289,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         EventBus.getDefault().unregister(this);
     }
 
-    @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 void onAttach(Context context) {

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

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
@@ -32,6 +33,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
@@ -53,6 +55,7 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
+import rx.functions.Action1;
 
 
 /**
@@ -381,7 +384,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @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.destroyDrawingCache(); // this will totally release XR's memory

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

@@ -1,226 +1,181 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.sheep.gamegroup.util.SheepSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ask_invite_rl"
+    android:id="@+id/refresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.sheep.gamegroup.view.activity.AskGetMoneyAct">
 
-    <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
-        android:id="@+id/refresh"
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/ask_scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/ask_scroll_view"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginBottom="60dp"
+        android:fillViewport="true"
+        android:orientation="vertical"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_gravity="fill_vertical"
-            android:layout_marginBottom="60dp"
-            android:fillViewport="true"
-            android:orientation="vertical"
-            android:scrollbars="none"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <RelativeLayout
+            android:background="#FFD269">
+
+            <ImageView
+                android:id="@+id/ask_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <!--底部有白条，用这一层覆盖-->
+            <View
+                android:id="@+id/ask_top_3"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginTop="300dp"
+                android:background="#FFD269" />
+            <!--内容   注：layout_marginBottom 为底部添加一点空间-->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="#FFD269">
+                android:baselineAligned="false"
+                android:descendantFocusability="beforeDescendants"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-                <ImageView
-                    android:id="@+id/ask_bg"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
 
-                <!--底部有白条，用这一层覆盖-->
                 <View
-                    android:id="@+id/ask_top_3"
+                    android:id="@+id/ask_top_1"
                     android:layout_width="match_parent"
-                    android:layout_height="100dp"
-                    android:layout_marginTop="300dp"
-                    android:background="#FFD269" />
-                <!--内容   注：layout_marginBottom 为底部添加一点空间-->
+                    android:layout_height="320dp" />
+
                 <LinearLayout
+                    android:id="@+id/ask_top_2"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/content_padding_10"
-                    android:baselineAligned="false"
-                    android:descendantFocusability="beforeDescendants"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:orientation="vertical">
-
-
-                    <View
-                        android:id="@+id/ask_top_1"
-                        android:layout_width="match_parent"
-                        android:layout_height="320dp" />
-
-                    <LinearLayout
-                        android:id="@+id/ask_top_2"
-                        android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:layout_marginBottom="@dimen/content_padding_20"
-                        android:orientation="horizontal">
-
-                        <RelativeLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1">
+                    android:layout_height="60dp"
+                    android:layout_marginBottom="@dimen/content_padding_20"
+                    android:orientation="horizontal">
 
-                            <TextView
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
-                                android:id="@+id/tv_size"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:text="@string/app_name"
-                                android:textColor="#ffffff"
-                                android:textSize="24sp"
-                                android:textStyle="bold" />
+                        <TextView
+
+                            android:id="@+id/tv_size"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            android:text="@string/app_name"
+                            android:textColor="#ffffff"
+                            android:textSize="24sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_size"
+                            android:layout_centerHorizontal="true"
+                            android:text="@string/friend"
+                            android:textColor="#ffffff"
+                            android:textSize="13sp" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:id="@+id/tv_money_ll"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            android:orientation="horizontal">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_below="@id/tv_size"
-                                android:layout_centerHorizontal="true"
-                                android:text="@string/friend"
-                                android:textColor="#ffffff"
-                                android:textSize="13sp" />
-
-                        </RelativeLayout>
-
-                        <RelativeLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <LinearLayout
-                                android:id="@+id/tv_money_ll"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:orientation="horizontal">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="￥"
-                                    android:textColor="#FCFF00"
-                                    android:textSize="12sp" />
-
-                                <TextView
-                                    android:id="@+id/tv_money"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:textColor="#FCFF00"
-                                    android:textSize="24sp"
-                                    android:textStyle="bold" />
-                            </LinearLayout>
+                                android:text="￥"
+                                android:textColor="#FCFF00"
+                                android:textSize="12sp" />
 
                             <TextView
+                                android:id="@+id/tv_money"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_below="@id/tv_money_ll"
-                                android:layout_centerHorizontal="true"
-                                android:text="@string/reward"
-                                android:textColor="#ffffff"
-                                android:textSize="13sp" />
-
-                        </RelativeLayout>
-
-
-                    </LinearLayout>
-
-                    <android.support.design.widget.TabLayout
-                        android:id="@+id/indicator"
-                        style="@style/style_tab_askgetmoney" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/yellow_FFAD3C" />
-
-                    <com.kfzs.duanduan.view.ViewPagerAutoHeigh
-                        android:id="@+id/pager"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/content_padding_10"
-                        android:layout_marginStart="@dimen/content_padding_10"
-                        android:layout_marginTop="@dimen/content_padding_10"
-                        android:minHeight="@dimen/ask_friend_list_h"
-                        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-                    <!--发放情况-->
-                    <LinearLayout
-                        android:id="@+id/homepage_item_notice_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/content_padding_10"
-                        android:layout_marginStart="@dimen/content_padding_10"
-                        android:layout_marginTop="@dimen/content_padding_10"
-                        android:background="@drawable/x_shap_shadow_bg_rectgangle_purple"
-                        android:orientation="horizontal"
-                        android:padding="@dimen/content_padding_10"
-                        android:visibility="gone">
+                                android:textColor="#FCFF00"
+                                android:textSize="24sp"
+                                android:textStyle="bold" />
+                        </LinearLayout>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="发放情况："
+                            android:layout_below="@id/tv_money_ll"
+                            android:layout_centerHorizontal="true"
+                            android:text="@string/reward"
                             android:textColor="#ffffff"
-                            android:textSize="12sp" />
+                            android:textSize="13sp" />
 
-                        <com.sunfusheng.marqueeview.MarqueeView
-                            android:id="@+id/ask_award_info"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textColor="#ffffff"
-                            android:textSize="12sp"
-                            app:mvAnimDuration="1000"
-                            app:mvDirection="right_to_left"
-                            app:mvInterval="3000"
-                            app:mvSingleLine="true" />
-                    </LinearLayout>
+                    </RelativeLayout>
 
-                    <!--邀请小技巧-->
 
-                    <include layout="@layout/ask_getmoney_act_item_three_notice_layout" />
                 </LinearLayout>
 
+                <android.support.design.widget.TabLayout
+                    android:id="@+id/indicator"
+                    style="@style/style_tab_askgetmoney" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/yellow_FFAD3C" />
+
+                <com.kfzs.duanduan.view.ViewPagerAutoHeigh
+                    android:id="@+id/pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="@dimen/content_padding_10"
+                    android:layout_marginStart="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_10"
+                    android:minHeight="@dimen/ask_friend_list_h"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+                <!--邀请小技巧-->
+
+                <include layout="@layout/ask_getmoney_act_item_three_notice_layout" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/content_padding_10"/>
                 <TextView
-                    android:id="@+id/ask_act_rule"
-                    android:layout_width="wrap_content"
-                    android:layout_height="24dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="6dp"
-                    android:gravity="center"
-                    android:layout_marginTop="32dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:text="活动规则"
-                    android:textColor="#ffffffff"
-                    android:textSize="10sp"
-                    android:background="@drawable/sp_bg_purple_left_radius_12"/>
-            </RelativeLayout>
-        </android.support.v4.widget.NestedScrollView>
-    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
-
-    <include
-        layout="@layout/title"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="#ffffff">
-
-        <TextView
-            android:id="@+id/ask_invite_tv"
-            style="@style/style_button_purple"
-            android:text="立即邀请" />
-    </LinearLayout>
-</RelativeLayout>
+                    android:id="@+id/ask_invite_tv"
+                    style="@style/style_button_purple"
+                    android:text="立即邀请" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/content_padding_10"/>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/ask_act_rule"
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="32dp"
+                android:background="@drawable/sp_bg_purple_left_radius_12"
+                android:gravity="center"
+                android:paddingEnd="6dp"
+                android:paddingStart="10dp"
+                android:text="活动规则"
+                android:textColor="#ffffffff"
+                android:textSize="10sp" />
+        </RelativeLayout>
+    </android.support.v4.widget.NestedScrollView>
+</com.sheep.gamegroup.util.SheepSwipeRefreshLayout>

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

@@ -83,7 +83,7 @@
 
     <string name="last_this_month_rank">查看上月排行</string>
     <string name="last_this_month_rank_top5">上月排行榜top5</string>
-    <string name="this_month_rank">查看这月排行</string>
+    <string name="this_month_rank">查看本月排行</string>
     <string name="this_month_rank_top5">本月排行榜top5</string>
     <string name="you_not_rank_in_top5">你还未上榜，再接再厉</string>
     <string name="congratulation_you_in_rank_top">恭喜你，获得排行榜第%s名</string>