抢任务名称字段修改、添加3.2.0版本号

app/src/main/AndroidManifest.xml

@@ -568,7 +568,7 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ActFindGame"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActFindInformation"
-            android:screenOrientation="portrait"
+            android:hardwareAccelerated="true"
             android:configChanges="orientation|screenSize|keyboardHidden"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActReservation"
             android:screenOrientation="portrait"/>

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -679,7 +679,7 @@ public class TaskEty implements Serializable, IDownload {
     public static final int TASK_TYPE_GAME_SHEEP = 1002;
     public static final int TASK_TYPE_GAME_TECENT = 1003;
     public static final int TASK_TYPE_GAME_XIAO_MI = 1004;
-    public static final int TASK_TYPE_APPLET = 1006;
+    public static final int TASK_TYPE_APPLET = 1007;
     public static final int TASK_TYPE_GAME_OTHER = 1099;
     //open_mode 连续任务类型
     public static final int OPEN_MODE_TYPE_APP = 1;

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -52,12 +52,6 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
             if(e instanceof Exception){
                 //访问获得对应的Exception
                 ExceptionHandle.ResponeThrowable throwable = ExceptionHandle.handleException(e);
-                //token 过期
-                if(throwable.code == 401){
-                    SpUtils.saveToken(SheepApp.getInstance(), "");
-                    Jump2View.getInstance().gotoLoginAgain(SheepApp.getInstance().getGameCode());
-                    return;
-                }
 
                 BaseMessage baseMessage = null;
                 if(throwable.message.startsWith("{")){//json
@@ -73,6 +67,12 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                     baseMessage = new BaseMessage();
                     baseMessage.setMsg(throwable.message);
                 }
+                //token 过期
+                if(throwable.code == 401){
+                    SpUtils.saveToken(SheepApp.getInstance(), "");
+                    Jump2View.getInstance().gotoLoginAgain(baseMessage.getMsg());
+                    return;
+                }
                 //未绑定手机号
                 if(throwable.code == 302 && baseMessage.getCode() == 30001){
                     Jump2View.getInstance().goBindPhone(SheepApp.getInstance(), baseMessage.getCode());

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

@@ -1191,7 +1191,7 @@ public class Jump2View {
     public void gotoLoginAgain(String o) {
         SpUtils.saveToken(SheepApp.getInstance(),"");
         DataUtil.getInstance().clearData();
-        G.showToast("请重新登录");
+        G.showToast(TextUtils.isEmpty(o)?"请重新登录":o);
         ActivityManager.getInstance().finishAllActivity();
         Jump2View.getInstance().goLoginView(SheepApp.getInstance(), o);
     }

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

@@ -217,7 +217,7 @@ public class ViewUtil {
                         mRobTask = robTask;
                         SpUtils.saveOrder("order", mRobTask.getOrder());
                         tvDutyMoney.setText("+"+mRobTask.getM().getBonus() + "元");//设置任务奖励金额
-                        tvTitel.setText(mRobTask.getM().getTask().getTask_name());//设置任务名字
+                        tvTitel.setText(mRobTask.getM().getName()+"");//设置任务名字--getTask().getTask_name()
                         GlideImageLoader.setImage(ivIcon, mRobTask.getM().getTask().getIcon());//设置任务图标
                     } catch (Exception e) {
                     }

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.fragment;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -254,6 +255,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
             @Override
             public void onLoadMore() {
+/*
                 boolean noMoreRelease = true;
                 boolean noMoreReleaseBegin = true;
 
@@ -284,6 +286,45 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                     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 (newState == RecyclerView.SCROLL_STATE_IDLE) {//滑动到了底部
+                    boolean noMoreRelease = true;
+                    boolean noMoreReleaseBegin = true;
+
+                    if(isGetRelease) {
+                        if (ListUtil.size(releaseEtyLists) >= per_page * releasePage) {
+                            releasePage += 1;
+                            noMoreRelease = false;
+                            //先加载缓存
+                            getReleaseFromACache(0);
+                            //再加载网络数据
+                            getReleaseFromNetWork(0);
+                        }
+                    }
+                    if(isGetReleaseBegin) {
+                        if (ListUtil.size(releaseEtyListsBegin) >= per_page * releaseBeginPage) {
+                            releaseBeginPage += 1;
+                            noMoreReleaseBegin = false;
+                            //先加载缓存
+                            getReleaseFromACache(1);
+                            //再加载网络数据
+                            getReleaseFromNetWork(1);
+                        }
+                    }
+                    if(noMoreRelease && noMoreReleaseBegin){
+                        view_list.setNoMore(true);
+                        noMore = true;
+                        notifyBottomLine(true);
+                        if (isFromHome)
+                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SET_BOTTOM_LINE));
+                    }
+                }
             }
         });
     }

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.1.5
-VERSION_CODE=3001005
+VERSION_NAME=3.2.0
+VERSION_CODE=3002000
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18