修复游戏任务下载状态不正确的问题

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

@@ -266,33 +266,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     type = 10;
                     btnTaskItem.setText(CommonUtil.START_TASK);
                     break;
-                case 1002:
-                case 1003:
-                    if(game_type == 1){
-                        boolean isInstalled = PackageUtil.isAppInstalled(SheepApp.getInstance(), taskEty.getPackage_names());
-                        boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()));
-                        if (isInstalled) {
-                            btnUpImag.setText(CommonUtil.GAME_RECHAGE);
-                            btnTaskItem.setText("启动游戏");
-                            type = DownloadTaskService.STATUS_INSTALLED;
-                        } else {
-                            type = isExistApk ? DownloadTaskService.STATUS_FINISH : DownloadTaskService.STATUS_INIT;
-                            btnUpImag.setVisibility(View.GONE);
-                            btnTaskItem.setText(isExistApk ? CommonUtil.GAME_INSTALL : CommonUtil.GAME_DOWNLOAD);
-                        }
-                    } else {
-                        boolean isInstalled = PackageUtil.isAppInstalled(SheepApp.getInstance(), taskEty.getPackage_names());
-                        boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()));
-                        if (isInstalled) {
-                            btnTaskItem.setVisibility(View.GONE);
-                            btnUpImag.setText("领取奖励");
-                        } else {
-                            type = isExistApk ? DownloadTaskService.STATUS_FINISH : DownloadTaskService.STATUS_INIT;
-                            btnUpImag.setVisibility(View.GONE);
-                            btnTaskItem.setText(isExistApk ? CommonUtil.GAME_INSTALL : CommonUtil.GAME_DOWNLOAD);
-                        }
-                    }
-                    break;
                 case 2:
                 case 1001:
                     break;
@@ -370,6 +343,47 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             public void call(Object o) {
                 if(o instanceof Integer){
                     type = (int) o;
+                    if(taskEty.isGameTask()) {//游戏任务
+                        switch (type){
+                            case DownloadTaskService.STATUS_INIT:
+                                btnUpImag.setVisibility(View.GONE);
+                                btnTaskItem.setText(CommonUtil.GAME_DOWNLOAD);
+                                break;
+                            case DownloadTaskService.STATUS_FINISH:
+                                btnUpImag.setVisibility(View.GONE);
+                                btnTaskItem.setText(CommonUtil.GAME_INSTALL);
+                                break;
+                            case DownloadTaskService.STATUS_INSTALLED:
+                                if (game_type == 1) {
+                                    btnUpImag.setText(CommonUtil.GAME_RECHAGE);
+                                    btnTaskItem.setText("启动游戏");
+                                } else {
+                                    btnTaskItem.setVisibility(View.GONE);
+                                    btnUpImag.setText("领取奖励");
+                                }
+                                break;
+
+                        }
+                    } else {
+                        switch (taskEty.getInspect_type()) {// 1自动审核　2手动审核 3,应用自动审核
+                            case 1:
+                                btnUpImag.setVisibility(View.GONE);
+                                break;
+                            case 2:
+                                if (taskEty.hasChildInReview()) {//只要有一个子任务在审核中，就不能进行其它操作
+                                    btnTaskItem.setEnabled(false);
+                                    btnTaskItem.setText("审核中");
+                                }
+                                if (type == DownloadTaskService.STATUS_INIT)
+                                    btnUpImag.setVisibility(View.GONE);
+                                break;
+                            case 3:
+                                if (type != DownloadTaskService.STATUS_INSTALLED)
+                                    btnUpImag.setVisibility(View.GONE);
+                                btnUpImag.setText("领取奖励");
+                                break;
+                        }
+                    }
                 } else if( o instanceof String){
                     btnTaskItem.setText((String) o);
                 } else if( o instanceof Boolean){
@@ -377,22 +391,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 }
             }
         });
-        switch (taskEty.getInspect_type()){// 1自动审核　2手动审核 3,应用自动审核
-            case 1:
-                btnUpImag.setVisibility(View.GONE);
-                break;
-            case 2:
-                if(taskEty.hasChildInReview()){//只要有一个子任务在审核中，就不能进行其它操作
-                    btnTaskItem.setEnabled(false);
-                    btnTaskItem.setText("审核中");
-                }
-                if(type == DownloadTaskService.STATUS_INIT)
-                    btnUpImag.setVisibility(View.GONE);
-                break;
-            case 3:
-                btnUpImag.setText("领取奖励");
-                break;
-        }
     }
 
     private void loadOld() {

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

@@ -97,30 +97,34 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         switch (gameTaskOrderEnty.getStatus()){
             case 0:
             default:
-                holder.order_type_tv.setText("订单状态："+ "未完成");
+                holder.order_type_tv.setText("订单状态：未完成");
                 holder.pay_layout.setVisibility(View.VISIBLE);
                 holder.pay_tyoe_show_tv.setVisibility(View.GONE);
                 break;
             case 1:
-                holder.order_type_tv.setText("订单状态："+ "未完成");
+                holder.order_type_tv.setText("订单状态：未完成");
                 holder.pay_tyoe_show_tv.setText("放弃支付");
                 break;
             case 2:
-                holder.order_type_tv.setText("订单状态："+ "未完成");
+                holder.order_type_tv.setText("订单状态：未完成");
                 holder.pay_tyoe_show_tv.setText("充值中");
                 break;
             case 3:
-                holder.order_type_tv.setText("订单状态："+ "未完成");
+                holder.order_type_tv.setText("订单状态：未完成");
                 holder.pay_tyoe_show_tv.setText("充值中");
                 break;
             case 4:
-                holder.order_type_tv.setText("订单状态："+ "未完成");
-                holder.pay_tyoe_show_tv.setText("支付失败");
+                holder.order_type_tv.setText("订单状态：未完成");
+                holder.pay_tyoe_show_tv.setText("充值中");
                 break;
             case 5:
-                holder.order_type_tv.setText("订单状态："+ "已完成");
+                holder.order_type_tv.setText("订单状态：已完成");
                 holder.pay_tyoe_show_tv.setText("支付成功");
                 break;
+            case 6:
+                holder.order_type_tv.setText("订单状态：订单失败");
+                holder.pay_tyoe_show_tv.setText("已退款");
+                break;
 
         }