修改部分小bug

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

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -9,14 +8,12 @@ import android.os.Message;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -24,17 +21,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.duanduan.ActDownloadMgr;
-import com.kfzs.duanduan.adp.DownloadMgrAdapter;
 import com.kfzs.duanduan.bean.DownloadStatus;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventDownloadHandler;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.services.KFDownloadServices;
-import com.kfzs.duanduan.utils.dlg.DeviceUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
 import com.sheep.gamegroup.di.components.DaggerTaskDialogComponent;
 import com.sheep.gamegroup.di.modules.TaskDialogModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -45,32 +37,20 @@ 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.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
-import com.sheep.gamegroup.view.customview.SProgress;
-import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
-import com.sheep.jiuyan.samllsheep.download.DownloadManager;
-import com.sheep.jiuyan.samllsheep.download.DownloadState;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.wlf.filedownloader.DownloadFileInfo;
 import org.wlf.filedownloader.FileDownloader;
-import org.wlf.filedownloader.listener.OnDetectBigUrlFileListener;
-import org.wlf.filedownloader.listener.OnDownloadFileChangeListener;
-import org.wlf.filedownloader.listener.OnFileDownloadStatusListener;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -138,14 +118,34 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                  case 3://安装apk
 
                      if(PackageUtil.isAppInstalled(activity, task_entity.getPackage_names())){
-//                PackageUtil.startApp(SheepApp.mContext, task_entity.getPackage_names());
-                         start_task_tv.setText("开始试玩");
+                        if(task_entity.getTask_type() != 3){
+                             start_task_tv.setText("打开应用");
+                         }else {
+                            start_task_tv.setText("开始试玩");
+                        }
+
                          type = 1;
-                     }else{
+                     }
+                     else{
 //                         PackageUtil.installApk(activity, downLoadInfo.getMApkPath()+"");
                          start_task_tv.setText("开始安装");
                          type = 3;
                      }
+                     new Thread(){
+                         @Override
+                         public void run() {
+                             super.run();
+                             try {
+                                 JSONObject jsonObject = new JSONObject();
+                                 jsonObject.put("device_id",DeviceUtil.getDeviceId(SheepApp.mContext)+"");
+                                 jsonObject.put("id",downLoadInfo.getMGameID());
+                                 NetUtil.getNetUtil().sendAppDownload(activity, jsonObject);
+
+                             } catch (Exception e) {
+                                 e.printStackTrace();
+                             }
+                         }
+                     }.start();
                      break;
                 case 4://被删除，重新下载
 
@@ -280,7 +280,11 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 case 3://开始安装
                     isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
                     if(isDownLoad){
-                        buttonStr = "开始试玩";
+                        if(task_entity.getTask_type() != 3){
+                            start_task_tv.setText("打开应用");
+                        }else {
+                            start_task_tv.setText("开始试玩");
+                        }
                         type = 1;
                         toTestPlay();
                         return;
@@ -325,7 +329,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             buttonStr = "信用卡注册";
         }
         else{
-            if(isDownLoad){
+            //Todo 以后整理，现在加了个type=3
+            if(isDownLoad && task_entity.getTask_type() != 3){
                 buttonStr = "开始试玩";
                 type = 1;
             }else if(mDownloadTaskService.isDownloadExists(task_entity.getDownload_link())){