游戏首页默认不显示商城限时抢购

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

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

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpAllWelfare.java

@@ -8,8 +8,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 
@@ -17,21 +20,26 @@ import java.util.List;
  * Created by realicing on 2019/3/26.
  * realicing@sina.com
  */
-public class AdpAllWelfare extends BaseQuickAdapter<Release_task, BaseViewHolder> {
-    public AdpAllWelfare(int layoutResId, @Nullable List<Release_task> data) {
-        super(layoutResId, data);
+public class AdpAllWelfare extends AdbCommonRecycler<Release_task> {
+    public AdpAllWelfare(@Nullable List<Release_task> data) {
+        super(SheepApp.getInstance(), data);
     }
 
     @Override
-    protected void convert(BaseViewHolder baseViewHolder, Release_task release_task) {
-        ImageView item_icon_iv = baseViewHolder.itemView.findViewById(R.id.item_icon_iv);
-        ImageView item_level_iv = baseViewHolder.itemView.findViewById(R.id.item_level_iv);
-        TextView item_name_tv = baseViewHolder.itemView.findViewById(R.id.item_name_tv);
-        TextView item_time_tv = baseViewHolder.itemView.findViewById(R.id.item_time_tv);
-        TextView item_info_tv = baseViewHolder.itemView.findViewById(R.id.item_info_tv);
-        TextView item_value_tv = baseViewHolder.itemView.findViewById(R.id.item_value_tv);
-        TextView item_btn_tv = baseViewHolder.itemView.findViewById(R.id.item_btn_tv);
-        TextView item_vip_tv = baseViewHolder.itemView.findViewById(R.id.item_vip_tv);
+    public int getViewIdByType(int type) {
+        return R.layout.item_hp_refresh_welfare;
+    }
+
+    @Override
+    public void convert(ViewHolder holder, Release_task release_task) {
+        ImageView item_icon_iv = holder.itemView.findViewById(R.id.item_icon_iv);
+        ImageView item_level_iv = holder.itemView.findViewById(R.id.item_level_iv);
+        TextView item_name_tv = holder.itemView.findViewById(R.id.item_name_tv);
+        TextView item_time_tv = holder.itemView.findViewById(R.id.item_time_tv);
+        TextView item_info_tv = holder.itemView.findViewById(R.id.item_info_tv);
+        TextView item_value_tv = holder.itemView.findViewById(R.id.item_value_tv);
+        TextView item_btn_tv = holder.itemView.findViewById(R.id.item_btn_tv);
+        TextView item_vip_tv = holder.itemView.findViewById(R.id.item_vip_tv);
 
         if(release_task == null){
             return;

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpMyWelfare.java

@@ -6,6 +6,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.util.ViewHolder;
+import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 
@@ -13,13 +17,18 @@ import java.util.List;
  * Created by realicing on 2019/3/26.
  * realicing@sina.com
  */
-public class AdpMyWelfare extends BaseQuickAdapter<TaskAcceptedEty, BaseViewHolder> {
-    public AdpMyWelfare(int layoutResId, @Nullable List<TaskAcceptedEty> data) {
-        super(layoutResId, data);
+public class AdpMyWelfare extends AdbCommonRecycler<TaskAcceptedEty> {
+    public AdpMyWelfare(@Nullable List<TaskAcceptedEty> data) {
+        super(SheepApp.getInstance(), data);
     }
 
     @Override
-    protected void convert(BaseViewHolder baseViewHolder, TaskAcceptedEty release_task) {
+    public int getViewIdByType(int type) {
+        return R.layout.item_all_welfare;
+    }
+
+    @Override
+    public void convert(ViewHolder holder, TaskAcceptedEty taskAcceptedEty) {
 
     }
 }

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

@@ -4,14 +4,11 @@ import android.support.v7.widget.RecyclerView;
 
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.DownloadWelfare;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.module.game.adapter.AdpAllWelfare;
-import com.sheep.gamegroup.view.adapter.DownloadWelfareAdapter;
 import com.sheep.gamegroup.view.fragment.BaseListFragment2;
-import com.sheep.jiuyan.samllsheep.R;
 
-import java.util.Locale;
+import org.afinal.simplecache.ApiKey;
 
 import io.reactivex.Observable;
 
@@ -23,17 +20,17 @@ import io.reactivex.Observable;
 public class FgtAllWelfare extends BaseListFragment2<Release_task> {
     @Override
     protected RecyclerView.Adapter getAdapter() {
-        return new AdpAllWelfare(R.layout.item_hp_refresh_welfare, list);
+        return new AdpAllWelfare(list);
     }
 
     @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_ALL_WELFARE, page, per_page);
     }
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getMyWelfareList(page, per_page);
+        return apiService.getAllWelfare(page, per_page);
     }
 
     @Override

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

@@ -21,7 +21,7 @@ import io.reactivex.Observable;
 public class FgtMyWelfare extends BaseListFragment2<TaskAcceptedEty> {
     @Override
     protected RecyclerView.Adapter getAdapter() {
-        return new AdpMyWelfare(R.layout.item_all_welfare, list);
+        return new AdpMyWelfare(list);
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/module/game/util/PromoteGoodsHelper.java

@@ -42,6 +42,12 @@ public class PromoteGoodsHelper {
         initView();
     }
 
+    @BindView(R.id.hp_gwe_tv1)
+    TextView hp_gwe_tv1;
+    @BindView(R.id.hp_gwe_tv2)
+    TextView hp_gwe_tv2;
+
+
     @BindView(R.id.item_icon_iv)
     ImageView item_icon_iv;
     @BindView(R.id.item_remainder_time)
@@ -82,6 +88,9 @@ public class PromoteGoodsHelper {
 
     //初始化刷新福利
     private void initView() {
+        ViewUtil.setText(hp_gwe_tv1, "商品限时抢购");
+        ViewUtil.setText(hp_gwe_tv2, "去购物");
+        ViewUtil.setVisibility(play_game_promote_goods, false);
         refreshData();
     }
 

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

@@ -335,6 +335,17 @@ public class StringUtils {
         }
         return stringBuilder.toString();
     }
+    //组装参数
+    public static String addParams(String baseUrl, Object...params) {
+        StringBuilder stringBuilder = new StringBuilder(baseUrl);
+        for (int i = 0; i + 1 < params.length;) {
+            stringBuilder.append(i == 0 && !baseUrl.contains("?") ? "?" : "&");
+            stringBuilder.append(params[i++]);
+            stringBuilder.append("=");
+            stringBuilder.append(params[i++]);
+        }
+        return stringBuilder.toString();
+    }
 
 
     //默认类型，只包含文本

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

@@ -1,5 +1,8 @@
 package org.afinal.simplecache;
 
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.js.BaseActWeb;
+
 import java.util.Locale;
 
 /**
@@ -94,15 +97,17 @@ public class ApiKey {
     public static final String PROMOTE_GOODS = "app/yf_shop/promote_goods";
     //获取游戏列表
     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 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);
     }
     public static final String pageKeyUrl(String baseUrl, int page, int per_page){
-        return String.format(Locale.CHINA, "%s?page=%d&per_page=%d", baseUrl, page, per_page);
+        return StringUtils.addParams(baseUrl, "page", page, "per_page", per_page);
     }
     public static final String pageKeyUrl2(String baseUrl, int page, int per_page){
-        return String.format(Locale.CHINA, "%s?page_no=%d&page_size=%d", baseUrl, page, per_page);
+        return StringUtils.addParams(baseUrl, "page_no", page, "page_size", per_page);
     }
 
     public static String release_task(int page, int per_page, int about_to_begin, String task_type, int is_succession) {