游戏详情中的福利列表添加赏金福利

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -270,6 +270,11 @@ public interface ApiService {
     @GET(ApiKey.GET_ALL_WELFARE)
     Observable<BaseMessage> getAppWelfare(@Query("page") int page, @Query("per_page") int per_page, @Query("app_id") int app_id);
     /**
+     * 获取游戏对应的福利与赏金福利
+     */
+    @GET(ApiKey.GET_ALL_WELFARE_AND_MONEY_REWARD)
+    Observable<BaseMessage> getAppWelfareAndMoneyReward(@Query("page") int page, @Query("per_page") int per_page, @Query("app_id") int app_id);
+    /**
      * 获取游戏福利专区中的全部福利
      */
     @GET(ApiKey.GET_MY_WELFARE)
@@ -1832,4 +1837,16 @@ public interface ApiService {
     Observable<BaseMessage> postUserForm(@Body JSONObject jsonObject);
 
 //---------------------------end 小绵羊3.5.0新增 ---------------------------------------
+
+    /**
+     * 判断用户是否是会长
+     */
+    @GET("app/user/is_president/{invitation_code}")
+    Observable<BaseMessage> getUserIsPresident(@Path("invitation_code") String invitation_code);
+
+    /**
+     * 通过绵羊号判断用户是否是会长或会长下面用户
+     */
+    @GET("app/user/is_shou_you")
+    Observable<BaseMessage> getUserIsShouYou(@Query("invitation_code") String invitation_code);
 }

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -2,13 +2,18 @@ package com.sheep.gamegroup.module.game.fragment;
 
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WebParams;
+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.KeyEventUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -22,6 +27,10 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import rx.functions.Action1;
+
 /**
  * Created by realicing on 2019/1/18.
  * realicing@sina.com
@@ -51,6 +60,8 @@ public class FgtGameCenter extends BaseFragment {
     ImageButton searchBtn;
     @BindView(R.id.my_walfare_btn)
     Button myWalfareBtn;
+    @BindView(R.id.fgt_gc_hb_500_yuan_drl)
+    View fgt_gc_hb_500_yuan_drl;
 
 
     private void initView() {
@@ -80,6 +91,29 @@ public class FgtGameCenter extends BaseFragment {
 
             }
         });
+        ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
+        CommonUtil.getInstance().callActionWithUserInfo(userEntity -> {
+            String code = userEntity.getParent_code();
+            if(TextUtils.isEmpty(code)){
+                code = userEntity.getInvitation_code();
+            }
+        SheepApp.getInstance().getNetComponent().getApiService().getUserIsShouYou(code)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean result = baseMessage.getData(Boolean.class);
+                        ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, result);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
+                    }
+                });
+        });
+
     }
 
     private void initData() {

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameWelfare.java

@@ -147,12 +147,12 @@ public class FgtGameWelfare extends BaseRefreshLoadMoreFragment {
     }
 
     private String getKey() {
-        return ApiKey.pageKeyUrl(ApiKey.GET_ALL_WELFARE, page, per_page) + "&app_id="+appId;
+        return ApiKey.pageKeyUrl(ApiKey.GET_ALL_WELFARE_AND_MONEY_REWARD, page, per_page) + "&app_id="+appId;
     }
 
     //从网络获取发布的任务列表
     private void getReleaseFromNetWork() {
-        SheepApp.getInstance().getNetComponent().getApiService().getAppWelfare(page, per_page, appId)
+        SheepApp.getInstance().getNetComponent().getApiService().getAppWelfareAndMoneyReward(page, per_page, appId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

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

@@ -2935,7 +2935,7 @@ public class Jump2View {
      * 小绵羊3.4.10新增 -- 游戏组游戏详情 界面
      */
     public void goPlayGameDetailAndCheckWelfare(Activity activity, Intent intent, int appId) {
-        SheepApp.getInstance().getNetComponent().getApiService().getAppWelfare(1, DataUtil.PER_PAGE, appId)
+        SheepApp.getInstance().getNetComponent().getApiService().getAppWelfareAndMoneyReward(1, DataUtil.PER_PAGE, appId)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

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

@@ -122,7 +122,14 @@ public class MiddleSchemeAct extends Activity {
                         G.showToast(e.getMessage());
                 }
                 break;
-            //sheep://small.kfzs.com/xmy?type=jss&data={"Type":1}
+                //跳转试玩赚钱
+                //sheep://small.kfzs.com/xmy?type=jss&data={"Type":1}
+                //跳转连续任务
+                //sheep://small.kfzs.com/xmy?type=jss&data={"Type":6}
+                //跳转办卡赚钱
+                //sheep://small.kfzs.com/xmy?type=jss&data={"Type":3}
+                //跳转游戏详情 "Id": 351, "name": "神都夜行录",
+                //sheep://small.kfzs.com/xmy?type=jss&data={"Type":16,"Ext":"{\"id\":351}"}
             case "jump_slide_show"://跳转banner(主页banner或者游戏banner)
             case "jss":
                 try {
@@ -138,6 +145,7 @@ public class MiddleSchemeAct extends Activity {
             //跳转绑定手机号
             //sheep://small.kfzs.com/xmy?type=run_app&className=com.sheep.gamegroup.view.activity.ChangeTelAct
             //sheep://small.kfzs.com/xmy?type=run&className=com.sheep.gamegroup.view.activity.ActInvitation 邀请赚钱界面
+            //sheep://small.kfzs.com/xmy?type=run&className=com.sheep.gamegroup.view.activity.ActSignCardRecord 我的战绩界面
             case "run_app":
             case "run":
                 String packageName = uri.getQueryParameter("packageName");

app/src/main/java/org/afinal/simplecache/ApiKey.java

@@ -99,6 +99,7 @@ public class ApiKey {
     public static final String FIND = "app/find";
     //获取全部福利
     public static final String GET_ALL_WELFARE = "app/release_task?platform=1&task_type=1019";
+    public static final String GET_ALL_WELFARE_AND_MONEY_REWARD = "app/release_task?platform=1&task_type=1019,1020";
     //获取我的福利
     public static final String GET_MY_WELFARE = "app/accepted_task?status=0&task_type=1019";