liujiangyao 7 rokov pred
rodič
commit
b881ce5fd1

+ 1 - 1
app/build.gradle

@@ -273,7 +273,7 @@ dependencies {
     compile files('libs/compresshelper-release.jar')
     compile 'com.haibin:calendarview:3.4.4'
 
-    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.5.1'
+    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-14'
 }
 
 static def releaseTime() {

+ 0 - 5
app/src/main/java/com/sheep/gamegroup/view/adapter/AdbMidong.java

@@ -14,15 +14,10 @@ import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.model.entity.AdDataSon;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-import org.afinal.simplecache.ACache;
 
 import java.util.List;
 import java.util.Locale;

+ 16 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment2.java

@@ -107,6 +107,8 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         //设置 Footer 为 球脉冲 样式
         refreshLayout.setRefreshFooter(new ClassicsFooter(activity).setSpinnerStyle(SpinnerStyle.Scale));
         refreshLayout.setEnableAutoLoadMore(true);
+        refreshLayout.setEnableLoadMore(true);
+        refreshLayout.setEnableLoadMoreWhenContentNotFull(true);//内容不满屏幕的时候也开启加载更多
         refreshLayout.setFooterTriggerRate(1);
     }
     protected View bottomLine;
@@ -142,6 +144,20 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
                 },1000);
             }
         });
+        view_list.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {//滑动到了底部
+                    if(ListUtil.size(list) >= per_page*page){
+
+                        refreshLayout.autoLoadMore();
+                    }
+
+                }
+            }
+        });
         click_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

+ 0 - 14
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java

@@ -2,35 +2,25 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
 import android.graphics.Paint;
-import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.SpannableString;
 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.RelativeLayout;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.model.entity.AskAward;
 import com.sheep.gamegroup.model.entity.AskTop;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
-import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
-import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -41,13 +31,9 @@ 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;
 
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
-
 /**
  * Created by ljy on 2018/8/17.
  */

+ 2 - 4
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtRouser.java

@@ -233,11 +233,9 @@ public class FgtRouser extends BaseFragment {
                                 return;
                             }
 
-                            String deeplink;
-                            if(BuildConfig.DEBUG){
+                            String deeplink = item.getDeeplink()+"";
+                            if(BuildConfig.DEBUG && TextUtils.isEmpty(deeplink)){
                                 deeplink = "snssdk143://detail?groupid=6584333623434936835&gd_label=click_schema_hxhg15";
-                            }else {
-                                deeplink = item.getDeeplink()+"";
                             }
                             Intent intent = Intent.parseUri(deeplink, Intent.URI_INTENT_SCHEME);
 

+ 2 - 2
app/src/main/res/layout/rouser_item.xml

@@ -39,9 +39,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="试玩"
-                    android:textSize="11sp"
+                    android:textSize="@dimen/text_size_1"
                     android:textColor="@color/black_6_3"
-                    android:padding="@dimen/content_padding_1"
+                    android:padding="@dimen/content_padding_2"
                     android:layout_toRightOf="@+id/linearlayout"
                     android:layout_marginRight="@dimen/content_padding_3"/>
                 <TextView