Merge branch 'tasks'

# Conflicts:
#	mvchelper_library/src/main/java/com/shizhefei/task/TaskHelper.java

Author: LuckyJayce

README.md

@@ -732,6 +732,16 @@ Activity负责调度，代码如下
 	  //taskHelper.destory();//执行释放操作
       //taskHelper.cancelAll();//取消全部
 
+## 4.结构
+ task 任务，子类IAsyncTask异步任务，ITask同步任务
+ ICallback task开始、progress、结果的事件回调
+ ResponseSender 用于task执行的结果通知给ICallback
+ TaskExecutor task执行者,实现类SyncDataSourceExecutor，AsyncDataSourceExecutor，SyncTaskExecutor，AsyncTaskExecutor
+ TaskExecutors 负责创建TaskExecutor
+ TaskHelper 执行多个TaskExecutor
+
+ taskHelper 调用TaskExecutors创建TaskExecutor，TaskExecutor执行task，通过ResponseSender通知ICallback
+
 ## 注意：  
         1.权限：  
 	        android.permission.INTERNET  

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.shizhefei.mvc.demo"
@@ -55,7 +55,7 @@ dependencies {
     compile project(':mvchelper_testcase')
     compile project(':mvccoolhelper')
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    compile 'com.squareup.leakcanary:leakcanary-android:1.5'
+//    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+//    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 }

app/src/main/java/com/shizhefei/test/controllers/MainActivity.java

@@ -21,11 +21,17 @@
 import android.util.Log;
 import android.view.View;
 
+import com.shizhefei.mvc.RequestHandle;
+import com.shizhefei.mvc.ResponseSender;
 import com.shizhefei.task.Code;
+import com.shizhefei.task.IAsyncTask;
 import com.shizhefei.task.ICallback;
 import com.shizhefei.task.TaskHandle;
 import com.shizhefei.task.TaskHelper;
+import com.shizhefei.task.function.Func1;
 import com.shizhefei.task.imp.MemoryCacheStore;
+import com.shizhefei.task.tasks.LinkTask;
+import com.shizhefei.task.tasks.Tasks;
 import com.shizhefei.test.controllers.mvchelpers.CoolActivity;
 import com.shizhefei.test.controllers.mvchelpers.NormalActivity;
 import com.shizhefei.test.controllers.mvchelpers.PullrefshActivity;
@@ -214,7 +220,7 @@ public void onClickTaskDemo(View view) {
      * @param view
      */
     public void onClickTaskOpDemo(View view) {
-       startActivity(new Intent(getApplicationContext(), TaskOpActivity.class));
+        startActivity(new Intent(getApplicationContext(), TaskOpActivity.class));
     }
 
 

build.gradle

@@ -6,10 +6,10 @@ buildscript {
 //        maven {
 //            url "https://plugins.gradle.org/m2/"
 //        }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 //        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.9"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,6 +19,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

mvccoolhelper/build.gradle

@@ -1,9 +1,8 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'//添加
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 9
@@ -26,16 +25,16 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     provided 'com.shizhefei:CoolRefreshView:1.0.1'
-    provided 'com.android.support:support-v4:23.4.0'
+    provided 'com.android.support:support-v4:25.0.1'
     compile project(':mvchelper_library')
 }
 
-//添加
-publish {
-    userOrg = 'luckyjayce'//bintray.com用户名
-    groupId = 'com.shizhefei'//jcenter上的路径
-    artifactId = 'MVCHelper-CoolRefresh'//项目名称
-    publishVersion = rootProject.ext.VERSION_NAME//版本号
-    desc = '实现下拉刷新，滚动底部自动加载更多，分页加载，自动切换显示网络失败布局，暂无数据布局，支持任意view，支持切换主流下拉刷新框架，真正的android MVC架构,listview,RecyclerView,refresh,loadmore'//描述，不重要
-    website = 'https://github.com/LuckyJayce/MVCHelper'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
-}
+////添加
+//publish {
+//    userOrg = 'luckyjayce'//bintray.com用户名
+//    groupId = 'com.shizhefei'//jcenter上的路径
+//    artifactId = 'MVCHelper-CoolRefresh'//项目名称
+//    publishVersion = rootProject.ext.VERSION_NAME//版本号
+//    desc = '实现下拉刷新，滚动底部自动加载更多，分页加载，自动切换显示网络失败布局，暂无数据布局，支持任意view，支持切换主流下拉刷新框架，真正的android MVC架构,listview,RecyclerView,refresh,loadmore'//描述，不重要
+//    website = 'https://github.com/LuckyJayce/MVCHelper'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
+//}

mvchelper_library/build.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'//添加
 android {
-    compileSdkVersion 24
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 9
@@ -25,15 +24,15 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    provided 'com.android.support:recyclerview-v7:24.0.0'
+    provided 'com.android.support:recyclerview-v7:25.0.1'
 }
 
-//添加
-publish {
-    userOrg = 'luckyjayce'//bintray.com用户名
-    groupId = 'com.shizhefei'//jcenter上的路径
-    artifactId = 'MVCHelper-Library'//项目名称
-    publishVersion = rootProject.ext.VERSION_NAME//版本号
-    desc = '实现下拉刷新，滚动底部自动加载更多，分页加载，自动切换显示网络失败布局，暂无数据布局，支持任意view，支持切换主流下拉刷新框架，真正的android MVC架构,listview,RecyclerView,refresh,loadmore'//描述，不重要
-    website = 'https://github.com/LuckyJayce/MVCHelper'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
-}
+////添加
+//publish {
+//    userOrg = 'luckyjayce'//bintray.com用户名
+//    groupId = 'com.shizhefei'//jcenter上的路径
+//    artifactId = 'MVCHelper-Library'//项目名称
+//    publishVersion = rootProject.ext.VERSION_NAME//版本号
+//    desc = '实现下拉刷新，滚动底部自动加载更多，分页加载，自动切换显示网络失败布局，暂无数据布局，支持任意view，支持切换主流下拉刷新框架，真正的android MVC架构,listview,RecyclerView,refresh,loadmore'//描述，不重要
+//    website = 'https://github.com/LuckyJayce/MVCHelper'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
+//}

mvchelper_library/src/main/java/com/shizhefei/task/TaskExecutors.java

@@ -2,7 +2,6 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 
 import com.shizhefei.mvc.IAsyncDataSource;
 import com.shizhefei.mvc.IDataSource;
@@ -137,11 +136,6 @@ protected DATA doInBackground(Object... params) {
             try {
                 return executeImp(responseSender);
             } catch (Exception e) {
-                if (e instanceof InterruptedException) {
-                    Log.d("TaskHelper", realTask.toString() + e);
-                } else {
-                    e.printStackTrace();
-                }
                 responseSender.sendError(e);
             }
             return null;
@@ -394,11 +388,11 @@ public boolean isRunning() {
         private void onPreExecute() {
             if (Looper.myLooper() != Looper.getMainLooper()) {
                 handler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            onPreExecuteMainThread();
-                        }
-                    });
+                    @Override
+                    public void run() {
+                        onPreExecuteMainThread();
+                    }
+                });
             } else {
                 onPreExecuteMainThread();
             }
@@ -420,11 +414,11 @@ public void run() {
         private void onPostExecute(final Code code, final Exception exception, final DATA data) {
             if (Looper.myLooper() != Looper.getMainLooper()) {
                 handler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            onPostExecuteMainThread(code, exception, data);
-                        }
-                    });
+                    @Override
+                    public void run() {
+                        onPostExecuteMainThread(code, exception, data);
+                    }
+                });
             } else {
                 onPostExecuteMainThread(code, exception, data);
             }