Browse Source

Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

zhanghai 8 years ago
parent
commit
daa000da59

+ 6 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -169,6 +169,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
             bottom_btn_layout.setVisibility(View.VISIBLE);
 
         }
+        if(taskEty.getTask_type() == 2){
+            btnTaskItem.setText("信用卡注册");
+        }else
         if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
             btnTaskItem.setText("开始游戏");
         }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
@@ -230,7 +233,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
             int thisRun = taskEty.getRunTask();
             if (thisRun == 1) {//接受了任务
                 llInfos.addView(getStep("领取任务", "已完成", 0));
-                if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+                if(taskEty.getTask_type() == 2){//信用卡
+                    llInfos.addView(getStep("信用卡注册", "待完成", 0));
+                }else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
                     llInfos.addView(getStep("下载游戏", "已完成", 0));
                     llInfos.addView(getStep("完成任务", "进行中", 1));
                 } else {