修复任务记录删除失败的问题，优化网络连接状态获取的逻辑，修复配置文件的某些配置失效的问题

app/src/main/assets/aria_config.xml

@@ -9,12 +9,12 @@
     <!--设置Aria的日志级别，{@link ALog#LOG_LEVEL_VERBOSE}-->
     <logLevel value="2"/>
     <!-- 是否检查网络 true: 检查网络，false: 不检查网络-->
-    <netCheck value="false"/>
+    <netCheck value="true"/>
     <!--除非无法使用注解，否则不建议使用广播来接受任务状态，true：使用广播接收任务状态，false：不适用广播接收状态 -->
     <!-- http://aria.laoyuyu.me/aria_doc/api/use_broadcast.html -->
     <useBroadcast value="true"/>
     <!--断网的时候是否重试，true：断网也重试；false：断网不重试，直接走失败的回调-->
-    <notNetRetry value="true"/>
+    <notNetRetry value="false"/>
   </app>
 
 

app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java

@@ -34,9 +34,10 @@ public class HttpDownloadModule extends BaseViewModule {
 
   private final String defUrl =
       "http://hzdown.muzhiwan.com/2017/05/08/nl.noio.kingdom_59104935e56f0.apk";
+      //"http://202.98.201.103:7000/vrs/TPK/ZTC440402001Z.tpk";
   private final String defFilePath =
       Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getPath()
-          + "/test.apk";
+          + "/ZTC440402001Z.tpk";
 
   private MutableLiveData<DownloadEntity> liveData = new MutableLiveData<>();
   private DownloadEntity singDownloadInfo;

app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java

@@ -26,6 +26,7 @@ import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;
 
@@ -310,6 +311,10 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
     //Aria.download(this).unRegister();
   }
 
+  @Override public boolean dispatchTouchEvent(MotionEvent ev) {
+    return super.dispatchTouchEvent(ev);
+  }
+
   @Override protected void dataCallback(int result, Object data) {
     super.dataCallback(result, data);
     if (result == ModifyUrlDialog.MODIFY_URL_DIALOG_RESULT) {

app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDownloadActivity.java

@@ -31,7 +31,9 @@ import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.download.m3u8.IBandWidthUrlConverter;
+import com.arialyy.aria.core.download.m3u8.ITsMergeHandler;
 import com.arialyy.aria.core.download.m3u8.IVodTsUrlConverter;
+import com.arialyy.aria.core.download.m3u8.M3U8KeyInfo;
 import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
@@ -201,6 +203,8 @@ public class M3U8VodDownloadActivity extends BaseActivity<ActivityM3u8VodBinding
           Toast.LENGTH_SHORT)
           .show();
       getBinding().setStateStr(getString(R.string.start));
+      getBinding().setSpeed("");
+      Log.d(TAG, "fail");
     }
   }
 
@@ -261,6 +265,11 @@ public class M3U8VodDownloadActivity extends BaseActivity<ActivityM3u8VodBinding
             return newUrls;
           }
         })
+        .setMergeHandler(new ITsMergeHandler() {
+          @Override public boolean merge(@Nullable M3U8KeyInfo keyInfo, List<String> tsPath) {
+            return false;
+          }
+        })
         .start();
   }