Explorar o código

使用3.3.16版本的aria,不支持307,不支持User-Agent

zengjiebin %!s(int64=7) %!d(string=hai) anos
pai
achega
18815469ab

+ 0 - 2
.idea/gradle.xml

@@ -8,8 +8,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/Aria" />
-            <option value="$PROJECT_DIR$/AriaAnnotations" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/datashare" />
             <option value="$PROJECT_DIR$/kfzslibrary" />

+ 4 - 3
app/build.gradle

@@ -267,9 +267,10 @@ dependencies {
 //    compile('com.arialyy.aria:aria-core:3.4') {
 //        exclude group: 'com.android.support'
 //    }
-    compile project(':Aria')
-
-    annotationProcessor 'com.arialyy.aria:aria-compiler:3.2.14'
+    compile('com.arialyy.aria:aria-core:3.3.16') {
+        exclude group: 'com.android.support'
+    }
+    annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.16'
     compile 'com.sunfusheng:marqueeview:1.3.3'
     compile 'com.github.nanchen2251:CompressHelper:1.0.5'
     compile files('libs/alipaySdk-20170922.jar')

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java

@@ -379,7 +379,7 @@ public class DownloadTaskService {
         if(TextUtils.isEmpty(downLoadInfo.getMPackageName())){
             filePath = DIR+ File.separator+downLoadInfo.getMGameName()+ ClassFileHelper.FILE_SUFFIX;
         }
-        task.setDownloadPath(filePath).start();
+        task.setFilePath(filePath).start();
         //发送红点
         EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
     }

+ 3 - 8
app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -232,10 +232,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     if(task.getTaskState() == IEntity.STATE_RUNNING){
                         task.stop();
                     } else if(task.getTaskState() == IEntity.STATE_FAIL){
-                        task.cancel(true);
-                        task.cancel(true);
-                        task.removeRecord();
-                        task.removeRecord();
+                        task.resetState();
                     } else {
 //                        task.setFilePath(filePath);
 //                        task.start();
@@ -266,8 +263,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
                         ApkUtils.installApk(activity, filePath);
                     }else{
-                        task.cancel(true);
-                        task.removeRecord();
+                        task.resetState();
 //                        task.setFilePath(filePath);
 //                        task.start();
                         mDownloadTaskService.start(downLoadInfo);
@@ -352,8 +348,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                             buttonStr = CommonUtil.START_INSTALL;
                             type = 3;
                         }else{
-                            task.cancel(true);
-                            task.removeRecord();
+                            task.resetState();
                             buttonStr = CommonUtil.START_DOWNLOAD;
                         }
                         break;

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

@@ -385,8 +385,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         buttonStr = CommonUtil.START_INSTALL;
                     } else {
                         type = 1;
-                        task.cancel(true);
-                        task.removeRecord();
+                        task.resetState();
                         buttonStr = CommonUtil.START_DOWNLOAD;
 
                     }
@@ -460,10 +459,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             if (task.getTaskState() == IEntity.STATE_RUNNING) {
                                 task.stop();
                             } else if (task.getTaskState() == IEntity.STATE_FAIL) {
-                                task.cancel(true);
-                                task.cancel(true);
-                                task.removeRecord();
-                                task.removeRecord();
+                                task.resetState();
                             } else {
     //                            task.setFilePath(filePath);
     //                            task.start();

+ 1 - 1
settings.gradle

@@ -1 +1 @@
-include ':app', ':datashare', ':view', ':kfzslibrary', ':ucrop', ':Aria', ':AriaAnnotations'
+include ':app', ':datashare', ':view', ':kfzslibrary', ':ucrop'//, ':Aria', ':AriaAnnotations'