添加我的福利列表接口

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

@@ -264,6 +264,11 @@ public interface ApiService {
      */
     @GET(ApiKey.GET_ALL_WELFARE)
     Observable<BaseMessage> getAllWelfare(@Query("page") int page, @Query("per_page") int per_page);
+    /**
+     * 获取游戏福利专区中的全部福利
+     */
+    @GET(ApiKey.GET_MY_WELFARE)
+    Observable<BaseMessage> getMyWelfare(@Query("page") int page, @Query("per_page") int per_page);
 
     /**
      * 邀请赚钱

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

@@ -207,7 +207,7 @@ public class TaskAcceptedEty implements Serializable{
     public static final int IS_SUCCESSION_ALL = 3;//所有
     public static final int SHOW_GAME_TASK_NO = 0;//不获取游戏任务
     public static final int SHOW_GAME_TASK_YES = 1;//要获取游戏任务
-    //status  1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了
+    //status  1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了,10 已发放福利
     public static final int STATUS_ACCEPTED_TASK = 1;
     public static final int STATUS_RUNNING = 2;
     public static final int STATUS_FINISHED = 3;
@@ -217,6 +217,7 @@ public class TaskAcceptedEty implements Serializable{
     public static final int STATUS_SUBMIT = 7;
     public static final int STATUS_OFF_LINE = 8;
     public static final int STATUS_AT_LEAST_COMPLETE_ONE = 9;
+    public static final int STATUS_RELEASED_BENEFITS = 10;
     //canSubmit 失败或者下线后，是否可以再次提交截图 2 不可以 1 可以
     public static final int ALLOW_SUBMIT_NO = 2;
     public static final int ALLOW_SUBMIT_YES = 1;

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

@@ -9,6 +9,8 @@ import com.sheep.gamegroup.module.game.adapter.AdpMyWelfare;
 import com.sheep.gamegroup.view.fragment.BaseListFragment2;
 import com.sheep.jiuyan.samllsheep.R;
 
+import org.afinal.simplecache.ApiKey;
+
 import java.util.Locale;
 
 import io.reactivex.Observable;
@@ -26,12 +28,12 @@ public class FgtMyWelfare extends BaseListFragment2<TaskAcceptedEty> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return String.format(Locale.CHINA, "app/game_consumption/my_voucher?page=%d&per_page=%d", page, per_page);
+        return ApiKey.pageKeyUrl(ApiKey.GET_MY_WELFARE, page, per_page);
     }
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getMyWelfareList(page, per_page);
+        return apiService.getMyWelfare(page, per_page);
     }
 
     @Override

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

@@ -99,6 +99,8 @@ 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_MY_WELFARE = "app/accepted_task?status=0&task_type=1019";
 
     public static final String getPackageVersion(String package_name, String type, int version){
         return String.format(Locale.CHINA, "%s?package_name=%s&type=%s&version=%d", getPackageVersion, package_name, type, version);