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

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -362,12 +362,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 });
     }
 
-    @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout,
+    @OnClick({ R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout,
             R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task, R.id.card_layout, R.id.icon_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.icon_img_iv:
-                break;
             case R.id.user_layout:
                 break;
             case R.id.withdrawal:

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

@@ -6,6 +6,8 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 
 import com.kfzs.duanduan.event.BigEvent;
+import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -28,6 +30,8 @@ public class TryMakeMoneyact extends BaseActivity {
     ViewPager pager;
     private Activity activity;
 
+    private AdpTryMakemoney mAdapter;
+    private String[] titles = new String[]{"推荐任务", "即将开始"};
     @Override
     protected int getLayoutId() {
         return R.layout.try_makemoney_act_layout;
@@ -35,12 +39,17 @@ public class TryMakeMoneyact extends BaseActivity {
 
     @Override
     public void initView() {
-        EventBus.getDefault().register(this);
         activity = this;
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
                 .setTitleFinish(activity);
+
+        mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
+        mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(1), titles[1]);
+        pager.setAdapter(mAdapter);
+        indicator.setupWithViewPager(pager);
     }
 
     @Override
@@ -51,31 +60,13 @@ public class TryMakeMoneyact extends BaseActivity {
     public void initData() {
     }
 
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case ONFRESH_TRYMAKEMANY_PAGE:
-                initData();
-                break;
-        }
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
-        EventBus.getDefault().unregister(this);
     }
 
     @Override
     protected void onStop() {
         super.onStop();
     }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
 }

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

@@ -0,0 +1,48 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 试玩赚钱
+ * Created by ljy on 2018/4/26.
+ */
+
+public class AdpTryMakemoney extends FragmentPagerAdapter {
+    private Context mContext;
+    private List<Object> mListFragment = new ArrayList<>();
+    private List<Object> mTitles = new ArrayList<>();
+    public AdpTryMakemoney(FragmentManager fm, Context mContext) {
+        super(fm);
+        this.mContext = mContext;
+    }
+    public void add(Fragment fragment, String title) {
+        mListFragment.add(fragment);
+        mTitles.add(title);
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return (Fragment) mListFragment.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mListFragment.size();
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        return super.getItemPosition(object);
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return (CharSequence) mTitles.get(position);
+    }
+}

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

@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.components.DaggerTryMakeMoneyComponent;
@@ -50,7 +51,7 @@ import butterknife.Unbinder;
  * Created by ljy on 2018/4/26.
  */
 
-public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContract.View{
+public class FgtTryMakeMoney extends BaseCompatFragment implements TryMakeMoneyContract.View{
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;
     @BindView(R.id.refresh)
@@ -75,7 +76,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
     };
 
-    static FgtTryMakeMoney newInstance(int type){
+    public static FgtTryMakeMoney newInstance(int type){
         FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
         Bundle bundle = new Bundle();
         bundle.putInt("type", type);
@@ -84,14 +85,28 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
 
     @Override
-    public int getLayoutId() {
-        return R.layout.fgt_try_makemoney_layout;
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // TODO: inflate a fragment view
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
+        Bundle bundle = getArguments();
+        if(bundle != null){
+            type = bundle.getInt("type", 0);
+        }
+        return rootView;
     }
 
     @Override
-    public void onViewCreated() {
+    protected void initView(Bundle savedInstanceState) {
+
+        setContentView(R.layout.fgt_try_makemoney_layout);
+        initView();
+        initListener();
+    }
+    public void initView() {
         EventBus.getDefault().register(this);
         activity = getActivity();
+        ButterKnife.bind(this, mContentView);
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
@@ -110,19 +125,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
         initListener();
         initData();
-    }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-        Bundle bundle = getArguments();
-        if(bundle != null){
-            type = bundle.getInt("type", 0);
-        }
-        return rootView;
     }
+
     public void initListener() {
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
@@ -148,7 +153,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         });
     }
     public void initData() {
-        showProgress(false);
         position = 0;
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(0);
@@ -158,7 +162,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         tryMakeMoneyAdp.setTaskAcceptedEty(null);
         RequestParameEty parameEty = new RequestParameEty();
         parameEty.setHashMap(CommonUtil.getInstance().setHashMap(1,100,1,
-                0,0,0));
+                0,0,type));
         presenter.releaseTask(parameEty);
     }
 
@@ -187,7 +191,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void failAcceptedTask2View(Object o) {
-        hideProgress();
         try {
             BaseMessage baseMessage = (BaseMessage) o;
             switch (baseMessage.getCode()){
@@ -218,7 +221,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public void returnTaskTaskUpdataView(Object o) {
 
-        hideProgress();
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
@@ -235,7 +237,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void failReturnTask2View(Object o) {
-        hideProgress();
         try {
             BaseMessage baseMessage = (BaseMessage) o;
             switch (baseMessage.getCode()){

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

@@ -12,6 +12,11 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/content_padding_10">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="abcdef"/>
+
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerview"
             android:layout_width="match_parent"