小bug修改

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

@@ -17,6 +17,14 @@ import java.io.File;
  */
 
 public class CommonUtil {
+    public static String START_TASK = "开始任务";
+    public static String GET_TASK = "领取任务";
+    public static String START_PLAY = "开始试玩";
+    public static String CONTINUE_DOWNLOAD = "继续下载";
+    public static String START_DOWNLOAD = "开始下载";
+    public static String FAIL_DOWNLOAD = "下载失败";
+    public static String START_INSTALL = "开始安装";
+    public static String OPEN_APPLY = "打开应用";
     private static CommonUtil commonUtil;
 
     public static CommonUtil getInstance(){

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

@@ -34,6 +34,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskState;
 import com.sheep.gamegroup.presenter.TaskDialogContract;
 import com.sheep.gamegroup.presenter.TaskDialogPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
@@ -86,9 +87,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     private List<TaskState> stateList = new ArrayList<>();//状态列表
     private TaskStateAdapter stateAdapter;
 
-    private int type;//0,开始任务 1,开始试玩 2,开始下载 3，开始安装;4,信用卡跳转
+    private int type;//0,领取任务 1,开始试玩 2,开始下载 3，开始安装;4,信用卡跳转
     private boolean isDownLoad = false;//是否下载
-    private String buttonStr = "开始任务";//是否下载
+    private String buttonStr = CommonUtil.GET_TASK;
     private Activity activity;
 
     /**
@@ -191,15 +192,20 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 开始任务或者下载游戏、试玩
      */
     private void startStask() {
-        if(task_entity.getTask_type() == 1 && (TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http"))){
-            G.showToast("下载地址错误!");
-            return;
+        DownloadTarget task = null;
+        //Todo 暂时判断信用卡，也许以后会增加其他类型，服务器传过来
+        if(task_entity.getTask_type() != 2){
+            if(TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http")){
+                G.showToast("下载地址错误!");
+                return;
+            }
+            task = Aria.download(this).load(task_entity.getDownload_link());
         }
-        DownloadTarget task = Aria.download(this).load(task_entity.getDownload_link());
+
         String filePath = DIR+ File.separator+task_entity.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
         try{
             switch (type){
-                case 0://开始任务
+                case 0://领取任务
                     JSONObject object = new JSONObject();
 
                     object.put("device_id",DeviceUtil.getDeviceId(activity));
@@ -230,9 +236,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
                     if(isDownLoad){
                         if(task_entity.getTask_type() != 3){
-                            start_task_tv.setText("打开应用");
+                            start_task_tv.setText(CommonUtil.OPEN_APPLY);
                         }else {
-                            start_task_tv.setText("开始试玩");
+                            start_task_tv.setText(CommonUtil.START_PLAY);
                         }
                         type = 1;
                         toTestPlay();
@@ -246,10 +252,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         type = 2;
                     }
                     break;
-                case 4:
+                case 4://信用卡
                     Jump2View.getInstance()
                             .goHomePageView(activity, 3);
-                    finish();
+//                    finish();
                     break;
             }
         }catch (Exception e){
@@ -268,17 +274,17 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      */
     private void setBtnState(){
         type = 0;
-        if(task_entity.getRunTask() == 0){//开始任务
-            buttonStr = "开始任务";
+        if(task_entity.getRunTask() == 0){//领取任务
+            buttonStr = CommonUtil.GET_TASK;
             type = 0;
         }else if(task_entity.getTask_type() == 2){//信用卡业务
             type = 4;
-            buttonStr = "信用卡注册";
+            buttonStr = CommonUtil.START_TASK;
         }
         else{
             //Todo 以后整理，现在加了个type=3
             if(isDownLoad && task_entity.getTask_type() != 3){
-                buttonStr = "开始试玩";
+                buttonStr = CommonUtil.START_PLAY;;
                 type = 1;
             } else {
                 type = 2;
@@ -290,32 +296,26 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         buttonStr = task.getPercent() +"%";
                         break;
                     case IEntity.STATE_STOP:
-                        buttonStr = "继续下载";
+                        buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
                         break;
-//                    case IEntity.STATE_WAIT:
-//                        task.setFilePath(filePath);
-//                        task.start();
-//                        mDownloadTaskService.addDownloadTask(downLoadInfo);
-//                        buttonStr = task.getPercent() +"%";
-//                        break;
                     case IEntity.STATE_COMPLETE:
                         isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
                         if(isDownLoad){
-                            buttonStr = "开始试玩";
+                            buttonStr = CommonUtil.START_PLAY;
                             type = 1;
                         }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, task_entity.getPackage_names(), ""))){
-                            buttonStr = "开始安装";
+                            buttonStr = CommonUtil.START_INSTALL;
                             type = 3;
                         }else{
                             task.resetState();
-                            buttonStr = "开始下载";
+                            buttonStr = CommonUtil.START_DOWNLOAD;
                         }
                         break;
                     case IEntity.STATE_FAIL:
-                        buttonStr = "下载失败";
+                        buttonStr = CommonUtil.FAIL_DOWNLOAD;
                         break;
                     default:
-                        buttonStr = "开始下载";
+                        buttonStr = CommonUtil.START_DOWNLOAD;
                         break;
                 }
             }
@@ -407,7 +407,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Download.onTaskStop void taskStop(DownloadTask task) {
         if(task.getKey().equals(task_entity.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_PAUSE);
-            start_task_tv.setText("继续下载");
+            start_task_tv.setText(CommonUtil.CONTINUE_DOWNLOAD);
         }
     }
 
@@ -424,7 +424,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Download.onTaskFail void taskFail(DownloadTask task) {
         if(task.getKey().equals(task_entity.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_FAIL);
-            start_task_tv.setText("下载失败");
+            start_task_tv.setText(CommonUtil.FAIL_DOWNLOAD);
         }
     }
 
@@ -432,9 +432,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         if(task.getKey().equals(task_entity.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
             //在这里处理任务完成的状态
-            start_task_tv.setText("开始安装");
+            start_task_tv.setText(CommonUtil.START_INSTALL);
             type = 3;
-            PackageUtil.installApk(activity, task.getDownloadPath());
+//            PackageUtil.installApk(activity, task.getDownloadPath());
         }
     }
 }