Merge pull request #69 from ksvc/updateVer_to_1.4.7

update version to 1.4.7
ksvc · Oct 18, 2017 · 1c62fb6 · 1c62fb6
2 parents afe6768 + d5f6482
commit 1c62fb6
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/demo/app/build.gradle b/demo/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.ksyun.media.shortvideo.demo"
         minSdkVersion 19
         targetSdkVersion 24
-        versionCode 146
-        versionName "1.4.6"
+        versionCode 147
+        versionName "1.4.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     sourceSets {
@@ -40,8 +40,8 @@ dependencies {
     compile 'com.facebook.fresco:fresco:1.4.0'
     compile 'com.facebook.fresco:animated-gif:1.4.0'
     compile 'com.facebook.fresco:animated-webp:1.4.0'
-    compile 'com.ksyun.media:libksysv-java:1.4.6'
-    compile 'com.ksyun.media:libksysv-arm64:1.4.6'
-    compile 'com.ksyun.media:libksysv-armv7a:1.4.6'
-    compile 'com.ksyun.media:libksysv-x86:1.4.6'
+    compile 'com.ksyun.media:libksysv-java:1.4.7'
+    compile 'com.ksyun.media:libksysv-arm64:1.4.7'
+    compile 'com.ksyun.media:libksysv-armv7a:1.4.7'
+    compile 'com.ksyun.media:libksysv-x86:1.4.7'
 }
diff --git a/demo/app/src/main/java/com/ksyun/media/shortvideo/demo/PublishActivity.java b/demo/app/src/main/java/com/ksyun/media/shortvideo/demo/PublishActivity.java
@@ -608,7 +608,7 @@ public boolean onInfo(IMediaPlayer iMediaPlayer, int what, int extra) {
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            if (mUploadWindow.isShowing()) {
+                            if (mUploadWindow != null && mUploadWindow.isShowing()) {
                                 mUploadWindow.dismiss();
                             }
                         }

diff --git a/libs/libsv/arm64-v8a/libksylive.so b/libs/libsv/arm64-v8a/libksylive.so
diff --git a/libs/libsv/armeabi-v7a/libksylive.so b/libs/libsv/armeabi-v7a/libksylive.so
diff --git a/libs/libsv/armeabi/libksylive.so b/libs/libsv/armeabi/libksylive.so
diff --git a/libs/libsv/ksylive.jar b/libs/libsv/ksylive.jar
diff --git a/libs/libsv/libksysv.jar b/libs/libsv/libksysv.jar
diff --git a/libs/libsv/x86/libksylive.so b/libs/libsv/x86/libksylive.so