Merge pull request #200 from jpxiong/release_v2.1.0-beta

Release v2.1.0-beta
pili-engineering · Oct 28, 2016 · 5d832e5 · 5d832e5
2 parents 98c3c6f + f19027e
commit 5d832e5
Show file tree

Hide file tree

Showing 36 changed files with 1,296 additions and 9 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 40
-        versionName "2.0.4-1"
+        versionCode 48
+        versionName "2.1.0-8"
     }
     buildTypes {
         release {
@@ -24,7 +24,7 @@ dependencies {
     compile 'com.qiniu:happy-dns:0.2.+'
     compile 'com.qiniu.pili:pili-android-qos:0.8.+'
     compile 'com.android.support:appcompat-v7:23.0.0'
-    compile files('libs/pldroid-media-streaming-2.0.4.jar')
+    compile files('libs/pldroid-media-streaming-2.1.0.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/PLDroidMediaStreamingDemo/app/libs/pldroid-media-streaming-2.0.4.jar b/PLDroidMediaStreamingDemo/app/libs/pldroid-media-streaming-2.0.4.jar
diff --git a/PLDroidMediaStreamingDemo/app/libs/pldroid-media-streaming-2.1.0.jar b/PLDroidMediaStreamingDemo/app/libs/pldroid-media-streaming-2.1.0.jar
diff --git a/PLDroidMediaStreamingDemo/app/src/main/AndroidManifest.xml b/PLDroidMediaStreamingDemo/app/src/main/AndroidManifest.xml
@@ -48,6 +48,25 @@
             android:theme="@android:style/Theme.Holo.Light.NoActionBar"
             android:label="@string/title_activity_audio_streaming" >
         </activity>
+
+        <activity
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+            android:configChanges="orientation|screenSize"
+            android:name=".ScreenRecorderActivity"
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar" >
+        </activity>
+
+        <activity
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+            android:configChanges="orientation|screenSize"
+            android:name=".ExtCapStreamingActivity"
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar" >
+        </activity>
+
+        <activity
+            android:name="com.qiniu.pili.droid.streaming.screen.ScreenCaptureRequestActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/PLDroidMediaStreamingDemo/app/src/main/java/com/qiniu/pili/droid/streaming/demo/Config.java b/PLDroidMediaStreamingDemo/app/src/main/java/com/qiniu/pili/droid/streaming/demo/Config.java
@@ -13,11 +13,11 @@ public class Config {
     public static final int ENCODING_LEVEL = StreamingProfile.VIDEO_ENCODING_HEIGHT_480;
     public static final int SCREEN_ORIENTATION = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
 
+    public static final String VERSION_HINT = BuildConfig.VERSION_NAME;
+
     public static final String EXTRA_PUBLISH_URL_PREFIX = "URL:";
     public static final String EXTRA_PUBLISH_JSON_PREFIX = "JSON:";
 
-    public static final String VERSION_HINT = "v2.0.4";
-
     public static final String EXTRA_KEY_PUB_URL = "pub_url";
 
     public static final String HINT_ENCODING_ORIENTATION_CHANGED =