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

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

@@ -3,8 +3,10 @@ package com.sheep.gamegroup.view.activity;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -89,6 +91,8 @@ public class ActInvitation extends BaseActivity {
     View act_invitation_rl;
     @BindView(R.id.act_invitation_cvp)
     ViewPager viewPager;
+    @BindView(R.id.main_layout)
+    ConstraintLayout main_layout;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -106,6 +110,10 @@ public class ActInvitation extends BaseActivity {
     @SuppressLint("ClickableViewAccessibility")
     @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) );
+
+        }
     }
 
     public void initListener() {

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

@@ -82,7 +82,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
     public void initData() {
 //        showProgress();
 
-        initAskTop5(0, 0);
+        initAskTop5(start_time, end_time);
     }
 
     private void initAskTop5View() {

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="30dp"

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

@@ -81,8 +81,8 @@
     <string name="homepage_cash">现金任务:%s元</string>
     <string name="homepage_welfare">游戏福利:%s元</string>
 
-    <string name="last_this_month_rank">上月排行</string>
+    <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>
 </resources>