Merge pull request #263 from Jhuster/release

release 2.2.4
pili-engineering · Oct 23, 2017 · cc431e2 · cc431e2
2 parents 471dd93 + 422d5b7
commit cc431e2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/PLDroidMediaStreamingDemo/app/build.gradle b/PLDroidMediaStreamingDemo/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.qiniu.pili.droid.streaming.demo"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 63
-        versionName "2.2.3"
+        versionCode 64
+        versionName "2.2.4"
     }
     buildTypes {
         release {
@@ -25,7 +25,7 @@ dependencies {
     compile 'com.journeyapps:zxing-android-embedded:3.0.2@aar'
     compile 'com.google.zxing:core:3.2.0'
     compile 'com.android.support:appcompat-v7:23.0.0'
-    compile files('libs/pldroid-media-streaming-2.2.3.jar')
+    compile files('libs/pldroid-media-streaming-2.2.4.jar')
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'

diff --git a/...pp/libs/pldroid-media-streaming-2.2.3.jar → ...pp/libs/pldroid-media-streaming-2.2.4.jar b/...pp/libs/pldroid-media-streaming-2.2.3.jar → ...pp/libs/pldroid-media-streaming-2.2.4.jar
diff --git a/...app/src/main/java/com/qiniu/pili/droid/streaming/demo/activity/StreamingBaseActivity.java b/...app/src/main/java/com/qiniu/pili/droid/streaming/demo/activity/StreamingBaseActivity.java
@@ -2,9 +2,10 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Point;
 import android.hardware.Camera;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -172,6 +173,12 @@ public void onStateChanged(StreamingState streamingState, Object extra) {
                 mLogContent += "IOERROR\n";
                 mStatusMsgContent = getString(R.string.string_state_ready);
                 setShutterButtonEnabled(true);
+                new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        startStreamingInternal();
+                    }
+                }, 2000);
                 break;
             case DISCONNECTED:
                 /**

diff --git a/ReleaseNotes/release-notes-2.2.4.md b/ReleaseNotes/release-notes-2.2.4.md
@@ -0,0 +1,15 @@
+# PLDroidMediaStreaming Release Notes for 2.2.4
+
+本次更新:
+
+## 版本
+
+- 发布 pldroid-media-streaming-2.2.4.jar
+
+## 缺陷
+
+- 修复使用外部第三方美颜时，预览与推流画面旋转了 90 度的问题
+
+## 其他
+
+- demo 层面添加重连的代码示例
diff --git a/releases/pldroid-media-streaming-2.2.3.jar → releases/pldroid-media-streaming-2.2.4.jar b/releases/pldroid-media-streaming-2.2.3.jar → releases/pldroid-media-streaming-2.2.4.jar