Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -79,6 +79,7 @@ public class AddPuplicParameIntercept implements Interceptor {
         Request r = oldRequest.newBuilder()
                 .addHeader("Authorization", TextUtils.isEmpty(id) ? "" : id)//header 会覆盖以前的  header
                 .addHeader("X-Device-Id", TextUtils.isEmpty(deviceId) ? "" : deviceId)//header 会覆盖以前的  header
+                .addHeader("platform", "andriod")//header 会覆盖以前的  header
                 .method(method, body)
                 .url(b.build())
                 .build();

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpTryMakemoney.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentStatePagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,7 +14,7 @@ import java.util.List;
  * Created by ljy on 2018/4/26.
  */
 
-public class AdpTryMakemoney extends FragmentPagerAdapter {
+public class AdpTryMakemoney extends FragmentStatePagerAdapter {
     private Context mContext;
     private List<Object> mListFragment = new ArrayList<>();
     private List<Object> mTitles = new ArrayList<>();
@@ -38,7 +39,7 @@ public class AdpTryMakemoney extends FragmentPagerAdapter {
 
     @Override
     public int getItemPosition(Object object) {
-        return super.getItemPosition(object);
+        return POSITION_NONE;
     }
 
     @Override

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

@@ -73,6 +73,7 @@ public class FgtTryMakeMoney extends BaseCompatFragment implements TryMakeMoneyC
 
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
             tryMakeMoneyAdp.notifyDataSetChanged();
+            recyclerview.setAdapter(tryMakeMoneyAdp);
         }
     };