游戏任务中的我的游戏中的预约游戏修改

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

@@ -388,7 +388,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
-        tryMakeMoneyAdp.setTaskAcceptedEty(null);
 
         RequestParameEty parameEty = new RequestParameEty();
         parameEty.setHashMap(

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

@@ -39,6 +39,10 @@ public class OrienteeringDetail implements Serializable{
     private int task_id;
     private int release_task_id;
 
+    private int is_reservation;//是否预约任务 0不是 1是
+    private boolean can_download;//是否可以下载
+    private int appointment_time;//预约时间
+
     public int getRelease_task_id() {
         return release_task_id;
     }
@@ -110,6 +114,36 @@ public class OrienteeringDetail implements Serializable{
         this.id = id;
     }
 
+    public int getIs_reservation() {
+        return is_reservation;
+    }
+
+    public void setIs_reservation(int is_reservation) {
+        this.is_reservation = is_reservation;
+    }
+
+    public boolean isCan_download() {
+        return can_download;
+    }
+
+    public void setCan_download(boolean can_download) {
+        this.can_download = can_download;
+    }
+
+    public int getAppointment_time() {
+        return appointment_time;
+    }
+
+    public void setAppointment_time(int appointment_time) {
+        this.appointment_time = appointment_time;
+    }
+
+
+
+
+
+
+
 
 
 
@@ -119,4 +153,29 @@ public class OrienteeringDetail implements Serializable{
     public boolean equals(Object obj) {
         return obj instanceof OrienteeringDetail && ((OrienteeringDetail) obj).id == id;
     }
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 是否是游戏任务中的预约任务
+     * @return
+     */
+    public boolean isGameReservation() {
+        return is_reservation == 1;//是否预约任务 0不是 1是
+    }
+    /**
+     * 是否游戏任务中的预约任务还不可以下载
+     * @return
+     */
+    public boolean isGameReservationCantDownload() {
+        return isGameReservation() && !can_download;
+    }
 }

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

@@ -141,14 +141,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     public void setIs_succession(int is_succession){
         this.is_succession = is_succession;
     }
-    /**
-     * 传入正在运行的任务
-     * @param taskAcceptedEty
-     */
-    public void setTaskAcceptedEty(TaskAcceptedEty taskAcceptedEty) {
-        this.taskAcceptedEty = taskAcceptedEty;
-    }
-    private TaskAcceptedEty taskAcceptedEty;
 
 
     /**
@@ -177,10 +169,11 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
-                if(etyList.get(i) == null || etyList.get(i).getPackage_name() == null){
+                final OrienteeringDetail item = ListUtil.getIndex(etyList, i);
+                if(item == null){
                     return;
                 }
-                viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                viewHolder.itemView.setTag(TAG_ID_TEMP, item.getId());
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
                 viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
@@ -192,7 +185,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }
                 detail_task_tv.setText("去充值");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                        "可定向消费:" + etyList.get(i).getBalance() +"元");
+                        "可定向消费:" + item.getBalance() +"元");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setTextColor(context.getResources().getColor(R.color.red_fd2d54));
                 viewHolder.itemView.findViewById(R.id.item_date_question_img).setVisibility(View.VISIBLE);
                 viewHolder.itemView.findViewById(R.id.item_date_question_img).setOnClickListener(new View.OnClickListener() {
@@ -200,30 +193,68 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     public void onClick(View v) {
 
                         ViewUtil.showMsgDialog(context,
-                                "游戏总金额"+ etyList.get(i).getBalance() +"元，按比例"+ etyList.get(i).getRatio() +"%进行消费，最低消费"+ etyList.get(i).getMin_amount() +"元。\n" +
+                                "游戏总金额"+ item.getBalance() +"元，按比例"+ item.getRatio() +"%进行消费，最低消费"+ item.getMin_amount() +"元。\n" +
                                         "\n" +
-                                        "例如（消费100元可用"+ etyList.get(i).getRatio() +"元小绵羊定向消费金额）",
+                                        "例如（消费100元可用"+ item.getRatio() +"元小绵羊定向消费金额）",
                                 "定向消费详情",
                                 false);
                     }
                 });
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
-                //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
+                //CommonUtil.getInstance().getCharSequence(context, item.getName(), "")
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(item.getName()+"");
                 final TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
                 task_type_tv.setVisibility(View.VISIBLE);
                 viewHolder.itemView.findViewById(R.id.item_money).setVisibility(View.GONE);
+
+                Glide.with(context)
+                        .load(item.getIcon()+"")
+                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
+                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+
+                if(item.isGameReservationCantDownload()){
+                    task_type_tv.setEnabled(false);
+                    detail_task_tv.setEnabled(false);
+                    viewHolder.itemView.setEnabled(true);
+                    task_type_tv.setText("已预约");
+                    task_type_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                    detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+
+                    viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Jump2View.getInstance().goGameTaskDetailView(context,  item.getRelease_task_id(), item.getGame_id(),1);
+                            UMConfigUtils.IdEvent.TASK.commit(item.getRelease_task_id());
+
+                        }
+                    });
+                    return;
+                }
+                if(TextUtils.isEmpty(item.getPackage_name())){
+                    task_type_tv.setEnabled(false);
+                    detail_task_tv.setEnabled(false);
+                    viewHolder.itemView.setEnabled(false);
+                    task_type_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                    detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                    task_type_tv.setText(R.string.error_package_link);
+                    return;
+                }
+                task_type_tv.setEnabled(true);
+                detail_task_tv.setEnabled(true);
+                viewHolder.itemView.setEnabled(true);
+                task_type_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
+                detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
                 //领取任务
-                final boolean isInstall = PackageUtil.isAppInstalled(SheepApp.mContext, etyList.get(i).getPackage_name());
-                boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(etyList.get(i).getPackage_name()));
+                final boolean isInstall = PackageUtil.isAppInstalled(SheepApp.mContext, item.getPackage_name());
+                boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(item.getPackage_name()));
                 final DownloadTaskService mDownloadTaskService = new DownloadTaskService(context);
 
                 String taskTypeTvValue;
                 if(isInstall){//已经安装
                     taskTypeTvValue = "启动游戏";
                 }else{
-                    DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(etyList.get(i).getDownload_url());
+                    DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(item.getDownload_url());
                     if(downLoadInfo == null) {
                         taskTypeTvValue = "下载游戏";
                     }else {
@@ -253,9 +284,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     }
                 }
                 task_type_tv.setText(taskTypeTvValue+"");
-                task_type_tv.findViewWithTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + etyList.get(i).getDownload_url());
-//                ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
-//                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
+                task_type_tv.findViewWithTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + item.getDownload_url());
+//                ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ item.getLast_num()+"份");
+//                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ item.getBonus() +"元");
                 //任务领取
                 task_type_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -263,15 +294,15 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         try{
                             switch (task_type_tv.getText().toString().trim() +""){
                                 case "安装游戏":
-                                    ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(etyList.get(i).getPackage_name()));
-                                    PackageUtil.startApp(SheepApp.mContext, etyList.get(i).getPackage_name());
+                                    ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(item.getPackage_name()));
+                                    PackageUtil.startApp(SheepApp.mContext, item.getPackage_name());
                                     break;
                                 case "启动游戏":
-                                    ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(etyList.get(i).getPackage_name()));
-                                    PackageUtil.startApp(SheepApp.mContext, etyList.get(i).getPackage_name());
+                                    ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(item.getPackage_name()));
+                                    PackageUtil.startApp(SheepApp.mContext, item.getPackage_name());
                                     break;
                                 default:
-                                    final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(etyList.get(i));
+                                    final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(item);
                                     mDownloadTaskService.start(downLoadInfo);
                                     new Thread(new Runnable() {
                                         @Override
@@ -295,26 +326,18 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     @Override
                     public void onClick(View v) {
 
-                        ViewUtil.showGamePayAccount((Activity) context, etyList.get(i).getGame_id());
+                        ViewUtil.showGamePayAccount((Activity) context, item.getGame_id());
                     }
                 });
-                Glide.with(context)
-                        .load(etyList.get(i).getIcon()+"")
-                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        OrienteeringDetail item = ListUtil.getIndex(etyList, i);
-                        if(item == null){
-                            return;
-                        }
-                        Jump2View.getInstance().goGameTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id(),1);
+                        Jump2View.getInstance().goGameTaskDetailView(context,  item.getRelease_task_id(), item.getGame_id(),1);
                         UMConfigUtils.IdEvent.TASK.commit(item.getRelease_task_id());
 
                     }
                 });
-//                TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getTask());
+//                TestUtil.setDebugDownLoad(context, viewHolder.itemView, item.getTask());
             }
 
             @Override

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

@@ -182,7 +182,6 @@ public class FgtGameMakeMoney extends BaseFragment implements TryMakeMoneyContra
         for (int i = 0; i < 3; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
-        tryMakeMoneyAdp.setTaskAcceptedEty(null);
         tryMakeMoneyAdp.setIs_succession(is_succession);
         if(activity instanceof GamemakeMoneyAct) {
             gridViewEntity = ((GamemakeMoneyAct) activity).getTabValue();

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

@@ -190,7 +190,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         for (int i = 0; i < 3; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
-        tryMakeMoneyAdp.setTaskAcceptedEty(null);
         tryMakeMoneyAdp.setIs_succession(is_succession);
         gridViewEntity = activity.getTabValue();
         if(activity instanceof  TryMakeMoneyact)