修复任务偶尔不执行

Author: VeiZhang

AndroidExecLibrary/bintray.gradle

@@ -1,3 +1,4 @@
+def bintray = rootProject.ext.bintray
 /*********************上传jCenter依赖*********************/
 apply plugin: 'com.novoda.bintray-release'
 
@@ -26,12 +27,12 @@ publish {
     bintrayKey = key
     dryRun = false
     userOrg = org
-    groupId = 'com.excellence'
+    groupId = bintray.groupId
     artifactId = 'exec'
-    publishVersion = '1.1.1'
+    publishVersion = bintray.publishVersion
     desc = 'android命令执行'
-    website = 'https://github.com/VeiZhang/AndroidExec'
-    licences = ['Apache-2.0']
+    website = bintray.website
+    licences = bintray.licences
 }
 
 /**读取bintray.key文件的key**/

AndroidExecLibrary/src/main/java/com/excellence/exec/CommandTask.java

@@ -217,7 +217,7 @@ void deploy() {
             return;
         }
         mStatus = STATUS_RUNNING;
-        mCommandTask = Observable.timer(mTimeDelay, mTimeUnit).subscribeOn(Schedulers.io()).subscribe(new Consumer<Long>() {
+        mCommandTask = Observable.timer(mTimeDelay, mTimeUnit).observeOn(Schedulers.io()).subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long aLong) throws Exception {
                 if (mStatus == STATUS_INTERRUPT) {

README.md

@@ -83,6 +83,7 @@ Process process = new ProcessBuilder("command").command("arg").redirectErrorStre
 
 | 版本 | 描述 |
 | --- | ---- |
+| [1.1.2][Exec1.1.2] | 修复任务偶尔不执行 **2019-8-15** |
 | [1.1.1][Exec1.1.1] | 修改低版本机型中任务销毁时导致的阻塞 **2019-4-29** |
 | [1.1.0][Exec1.1.0] | 使用Builder模式创建命令任务，修复崩溃异常 **2018-9-3** |
 | [1.0.0][Exec1.0.0] | 集成命令行执行 **2018-8-17** |
@@ -97,6 +98,7 @@ Process process = new ProcessBuilder("command").command("arg").redirectErrorStre
 
 <!-- 版本 -->
 
+[Exec1.1.2]:https://bintray.com/veizhang/maven/exec/1.1.2
 [Exec1.1.1]:https://bintray.com/veizhang/maven/exec/1.1.1
 [Exec1.1.0]:https://bintray.com/veizhang/maven/exec/1.1.0
 [Exec1.0.0]:https://bintray.com/veizhang/maven/exec/1.0.0

config.gradle

@@ -3,15 +3,23 @@ import java.util.regex.Matcher
 import java.util.regex.Pattern
 
 ext {
+    // 上传bintray的配置
+    bintray = [
+            groupId       : "com.excellence",
+            publishVersion: "1.1.2",
+            website       : "https://github.com/VeiZhang/AndroidExec",
+            licences      : ['Apache-2.0']
+    ]
+
     // 插件
     plugins = [
-            application       : "com.android.application",
-            library           : "com.android.library",
-            maven             : "com.github.dcendents.android-maven",
-            bintray           : "com.jfrog.bintray",
-            novoda            : "com.novoda.bintray-release",
-            greendao          : "org.greenrobot.greendao",
-            "greendao-gradle" : "org.greenrobot:greendao-gradle-plugin:3.2.2"
+            application      : "com.android.application",
+            library          : "com.android.library",
+            maven            : "com.github.dcendents.android-maven",
+            bintray          : "com.jfrog.bintray",
+            novoda           : "com.novoda.bintray-release",
+            greendao         : "org.greenrobot.greendao",
+            "greendao-gradle": "org.greenrobot:greendao-gradle-plugin:3.2.2"
     ]
 
     // 配置
@@ -25,96 +33,119 @@ ext {
             versionName             : getVersionName(),
 
             /*************************自定义配置*************************/
-            androidSupportSdkVersion: "23.0.0"
+            androidSupportSdkVersion: "23.0.0",
+
+            retrofit2               : "2.5.0",
+            leakcanary              : "1.6.3",
+            exoplayer               : "2.8.3",
+            ffmpeg                  : "1.2.1",
+            "imageloader"           : "1.0.0",
     ]
 
     // 依赖
     dependencies = [
             /*************************原生依赖*************************/
-            "appcompat-v7"      : "com.android.support:appcompat-v7:${android["androidSupportSdkVersion"]}",
-            "support-v4"        : "com.android.support:support-v4:${android["androidSupportSdkVersion"]}",
-            "cardview-v7"       : "com.android.support:cardview-v7:${android["androidSupportSdkVersion"]}",
-            "recyclerview-v7"   : "com.android.support:recyclerview-v7:${android["androidSupportSdkVersion"]}",
-            "design"            : "com.android.support:design:${android["androidSupportSdkVersion"]}",
-            "annotations"       : "com.android.support:support-annotations:${android["androidSupportSdkVersion"]}",
-            "gridlayout-v7"     : "com.android.support:gridlayout-v7:${android["androidSupportSdkVersion"]}",
-            "constraint-layout" : "com.android.support.constraint:constraint-layout:1.1.2",
+            "appcompat-v7"                    : "com.android.support:appcompat-v7:${android["androidSupportSdkVersion"]}",
+            "support-v4"                      : "com.android.support:support-v4:${android["androidSupportSdkVersion"]}",
+            "cardview-v7"                     : "com.android.support:cardview-v7:${android["androidSupportSdkVersion"]}",
+            "recyclerview-v7"                 : "com.android.support:recyclerview-v7:${android["androidSupportSdkVersion"]}",
+            "design"                          : "com.android.support:design:${android["androidSupportSdkVersion"]}",
+            "annotations"                     : "com.android.support:support-annotations:${android["androidSupportSdkVersion"]}",
+            "gridlayout-v7"                   : "com.android.support:gridlayout-v7:${android["androidSupportSdkVersion"]}",
+            "constraint-layout"               : "com.android.support.constraint:constraint-layout:1.1.2",
 
             /*************************第三方依赖*************************/
             // https://github.com/square/retrofit
-            "retrofit2"           : "com.squareup.retrofit2:retrofit:2.4.0",
-            "converter-scalars"   : "com.squareup.retrofit2:converter-scalars:2.4.0",
-            "converter-gson"      : "com.squareup.retrofit2:converter-gson:2.4.0",
-            "adapter-rxjava"      : "com.squareup.retrofit2:adapter-rxjava:2.4.0",
-            "adapter-rxjava2"     : "com.squareup.retrofit2:adapter-rxjava2:2.4.0",
+            "retrofit2"                       : "com.squareup.retrofit2:retrofit:${android["retrofit2"]}",
+            "converter-scalars"               : "com.squareup.retrofit2:converter-scalars:${android["retrofit2"]}",
+            "converter-gson"                  : "com.squareup.retrofit2:converter-gson:${android["retrofit2"]}",
+            "adapter-rxjava"                  : "com.squareup.retrofit2:adapter-rxjava:${android["retrofit2"]}",
+            "adapter-rxjava2"                 : "com.squareup.retrofit2:adapter-rxjava2:${android["retrofit2"]}",
             // https://github.com/square/okhttp
-            "okhttp"              : "com.squareup.okhttp3:okhttp:3.11.0",
+            "okhttp"                          : "com.squareup.okhttp3:okhttp:3.14.2",
             // https://github.com/greenrobot/greenDAO
-            "greendao"            : "org.greenrobot:greendao:3.2.2",
+            "greendao"                        : "org.greenrobot:greendao:3.2.2",
             // https://github.com/yuweiguocn/GreenDaoUpgradeHelper
-            "greendao-helper"     : "com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0",
+            "greendao-helper"                 : "io.github.yuweiguocn:GreenDaoUpgradeHelper:2.2.1",
             // https://github.com/bumptech/glide
-            "glide"               : "com.github.bumptech.glide:glide:4.8.0",
+            "glide"                           : "com.github.bumptech.glide:glide:4.9.0",
             // https://github.com/square/picasso
-            "picasso"             : "com.squareup.picasso:picasso:2.71828",
+            "picasso"                         : "com.squareup.picasso:picasso:2.71828",
             // https://github.com/facebook/fresco
-            "fresco"              : "com.facebook.fresco:fresco:1.10.0",
+            "fresco"                          : "com.facebook.fresco:fresco:2.0.0",
             // https://github.com/greenrobot/EventBus
-            "eventbus"            : "org.greenrobot:eventbus:3.1.1",
+            "eventbus"                        : "org.greenrobot:eventbus:3.1.1",
             // https://github.com/BuglyDevTeam/Bugly-Android
-            "bugly"               : "com.tencent.bugly:crashreport:2.6.6.1",
-            "bugly-native"        : "com.tencent.bugly:nativecrashreport:3.3.1",
+            "bugly"                           : "com.tencent.bugly:crashreport:3.0.0",
+            "bugly-native"                    : "com.tencent.bugly:nativecrashreport:3.7.1",
             // https://bintray.com/android/android-utils/com.android.volley.volley
-            "volley"              : "com.android.volley:volley:1.1.1",
+            "volley"                          : "com.android.volley:volley:1.1.1",
             // https://github.com/ReactiveX/RxJava
-            "rxjava"              : "io.reactivex:rxjava:1.3.8",
-            "rxjava2"             : "io.reactivex.rxjava2:rxjava:2.2.3",
-            "rxandroid"           : "io.reactivex:rxandroid:2.1.0",
-            "rxandroid2"          : 'io.reactivex.rxjava2:rxandroid:2.1.0',
+            "rxjava"                          : "io.reactivex:rxjava:1.3.8",
+            "rxjava2"                         : "io.reactivex.rxjava2:rxjava:2.2.9",
+            "rxandroid"                       : "io.reactivex:rxandroid:2.1.1",
+            "rxandroid2"                      : 'io.reactivex.rxjava2:rxandroid:2.1.1',
             // https://github.com/JakeWharton/RxBinding
-            "rxbinding"           : 'com.jakewharton.rxbinding2:rxbinding:2.2.0',
+            "rxbinding"                       : 'com.jakewharton.rxbinding2:rxbinding:2.2.0',
             // https://github.com/google/gson
-            "gson"                : "com.google.code.gson:gson:2.8.5",
+            "gson"                            : "com.google.code.gson:gson:2.8.5",
             // https://github.com/alibaba/fastjson
-            "fastjson"            : "com.alibaba:fastjson:1.1.70.android",
+            "fastjson"                        : "com.alibaba:fastjson:1.1.70.android",
             // https://github.com/apache/commons-lang
-            "commons-lang3"       : "org.apache.commons:commons-lang3:3.8",
+            "commons-lang3"                   : "org.apache.commons:commons-lang3:3.9",
             // https://github.com/square/leakcanary
-            "leakcanary"          : "com.squareup.leakcanary:leakcanary-android:1.6.2",
-            "leakcanary-release"  : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.2",
-            "leakcanary-fragment" : "com.squareup.leakcanary:leakcanary-support-fragment:1.6.2",
+            "leakcanary"                      : "com.squareup.leakcanary:leakcanary-android:${android["leakcanary"]}",
+            "leakcanary-release"              : "com.squareup.leakcanary:leakcanary-android-no-op:${android["leakcanary"]}",
+            "leakcanary-fragment"             : "com.squareup.leakcanary:leakcanary-support-fragment:${android["leakcanary"]}",
             // https://github.com/YoKeyword/Fragmentation
-            "fragmentation"       : "me.yokeyword:fragmentation:1.3.6",
+            "fragmentation"                   : "me.yokeyword:fragmentation:1.3.7",
             // https://github.com/airbnb/lottie-android，2.8.0+是为了兼容AndroidX，没有用到AndroidX，则使用版本2.7.0，否则莫名其妙会报错
-            "lottie"              : "com.airbnb.android:lottie:2.7.0",
+            "lottie"                          : "com.airbnb.android:lottie:2.7.0",
+            // https://github.com/google/ExoPlayer，2.8.4+是为了兼容AndroidX
+            "exoplayer"                       : "com.google.android.exoplayer:exoplayer:${android["exoplayer"]}",
+            "exoplayer-core"                  : "com.google.android.exoplayer:exoplayer-core:${android["exoplayer"]}",
+            "exoplayer-dash"                  : "com.google.android.exoplayer:exoplayer-dash:${android["exoplayer"]}",
+            "exoplayer-hls"                   : "com.google.android.exoplayer:exoplayer-hls:${android["exoplayer"]}",
+            "exoplayer-smoothstreaming"       : "com.google.android.exoplayer:exoplayer-smoothstreaming:${android["exoplayer"]}",
+            "exoplayer-ui"                    : "com.google.android.exoplayer:exoplayer-ui:${android["exoplayer"]}",
+            "exoplayer-extension-gvr"         : "com.google.android.exoplayer:extension-gvr:${android["exoplayer"]}",
+            "exoplayer-extension-mediasession": "com.google.android.exoplayer:extension-mediasession:${android["exoplayer"]}",
+            "exoplayer-extension-okhttp"      : "com.google.android.exoplayer:extension-okhttp:${android["exoplayer"]}",
+            "exoplayer-extension-rtmp"        : "com.google.android.exoplayer:extension-rtmp:${android["exoplayer"]}",
 
             /*************************个人依赖*************************/
             // https://github.com/VeiZhang/BaseToolsLibrary
-            "basetools"           : "com.excellence:basetools:1.2.6",
+            "basetools"                       : "com.excellence:basetools:1.2.6",
             // https://github.com/VeiZhang/Permission
-            "permission"          : "com.excellence:permission:1.0.1",
+            "permission"                      : "com.excellence:permission:1.0.2",
             // https://github.com/VeiZhang/RetrofitClient
-            "retrofit-client"     : "com.excellence:retrofit:1.0.5",
-            "retrofit-client2"    : "com.excellence.retrofit:retrofit2:2.0.0",
+            "retrofit-client"                 : "com.excellence:retrofit:1.0.5",
+            "retrofit-client2"                : "com.excellence.retrofit:retrofit2:2.0.0",
             // https://github.com/VeiZhang/QSkinLoader
-            "skinloader"          : "com.excellence:skinloader:1.2.2",
+            "skinloader"                      : "com.excellence:skinloader:1.2.2",
             // https://github.com/VeiZhang/ToastKit
-            "toast"               : "com.excellence:toast:1.1.0",
+            "toast"                           : "com.excellence:toast:1.1.0",
             // https://github.com/VeiZhang/MailSender
-            "mailsender"          : "com.excellence:mailsender:1.0.0",
+            "mailsender"                      : "com.excellence:mailsender:1.0.0",
             // https://github.com/VeiZhang/Downloader
-            "downloader"          : "com.excellence:downloader:1.2.0",
+            "downloader"                      : "com.excellence:downloader:1.2.0",
             // https://github.com/VeiZhang/AppStatistics
-            "app-statistics"      : "com.excellence:app-statistics:1.0.1",
+            "app-statistics"                  : "com.excellence:app-statistics:1.0.1",
             // https://github.com/VeiZhang/AndroidExec
-            "exec"                : "com.excellence:exec:1.1.0",
+            "exec"                            : "com.excellence:exec:1.1.1",
             // https://github.com/VeiZhang/AndroidFFmpeg
-            "ffmpeg"              : "com.excellence:ffmpeg:1.1.0",
+            "ffmpeg"                          : "com.excellence:ffmpeg:${android["ffmpeg"]}",
+            "ffmpeg-java"                     : "com.excellence:ffmpeg-java:${android["ffmpeg"]}",
+            "ffmpeg-armeabi"                  : "com.excellence:ffmpeg-armeabi:${android["ffmpeg"]}",
+            "ffmpeg-armv7a"                   : "com.excellence:ffmpeg-armv7a:${android["ffmpeg"]}",
+            "ffmpeg-x86"                      : "com.excellence:ffmpeg-x86:${android["ffmpeg"]}",
             // https://github.com/VeiZhang/ImageLoader
-            "imageloader"         : "com.excellence:imageloader:1.0.0",
-            "imageloader-fresco"  : "com.excellence:imageloader-fresco:1.0.0",
-            "imageloader-picasso" : "com.excellence:imageloader-picasso:1.0.0",
-            "imageloader-glide"   : "com.excellence:imageloader-glide:1.0.0"
+            "imageloader"                     : "com.excellence:imageloader:${android["imageloader"]}",
+            "imageloader-fresco"              : "com.excellence:imageloader-fresco:${android["imageloader"]}",
+            "imageloader-picasso"             : "com.excellence:imageloader-picasso:${android["imageloader"]}",
+            "imageloader-glide"               : "com.excellence:imageloader-glide:${android["imageloader"]}",
+            // https://github.com/VeiZhang/DIY-EpgView
+            "epgview"                         : "com.excellence:diy-epgview:1.0.2"
     ]
 }
 
@@ -173,12 +204,12 @@ def getVersionCode() {
 /***********************读取Git信息***********************/
 
 /**
- * 读取最近的一次git tag
+ * 读取当前分支最近的一次git tag
  * @return tag
  */
 def getGitTag() {
     try {
-        def process = ("git describe --abbrev=0 --tags origin").execute()
+        def process = ("git describe --abbrev=0 --tags").execute()
         def tag = process.text.trim()
         return tag
     } catch (e) {