Merge pull request #254 from ksvc/v4.4.0-20061

V4.4.0 20061

demo/AndroidManifest.xml

@@ -18,6 +18,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
@@ -53,9 +54,24 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.ksyun.media.streamer.demo.CameraActivity"
+            android:name="com.ksyun.media.streamer.demo.BaseCameraActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.RiseAnimation">
+        </activity>
+        <activity
+            android:name="com.ksyun.media.streamer.demo.StdCameraActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.RiseAnimation">
+        </activity>
+        <activity
+            android:name="com.ksyun.media.streamer.demo.FloatCameraActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.RiseAnimation">
         </activity>
         <activity android:name="com.ksyun.media.streamer.demo.FloatViewActivity"

demo/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 allprojects {
@@ -20,6 +20,10 @@ 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.google.code.gson:gson:2.7'
+    compile 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    compile 'com.h6ah4i.android.widget.verticalseekbar:verticalseekbar:0.7.2'
 }
 
 android {

demo/res/drawable/camera_exposure_icon.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/camera_exposure_disable"
+        android:state_enabled="false"/>
+    <item android:drawable="@drawable/camera_exposure_highlight"
+        android:state_pressed="true"/>
+    <item android:drawable="@drawable/camera_exposure_normal"/>
+</selector>

demo/res/drawable/recorder_flash_icon.xml → demo/res/drawable/camera_flash_icon.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/record_flash_disable"
+    <item android:drawable="@drawable/camera_flash_disable"
         android:state_enabled="false"/>
-    <item android:drawable="@drawable/record_flash_highlighted"
+    <item android:drawable="@drawable/camera_flash_highlight"
         android:state_pressed="true"/>
-    <item android:drawable="@drawable/record_flash_normal"/>
+    <item android:drawable="@drawable/camera_flash_normal"/>
 </selector>

demo/res/drawable/camera_switch_icon.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/camera_switch_disable"
+        android:state_enabled="false"/>
+    <item android:drawable="@drawable/camera_switch_highlight"
+        android:state_pressed="true"/>
+    <item android:drawable="@drawable/camera_switch_normal"/>
+</selector>

demo/res/drawable/recorder_add_icon.xml → demo/res/drawable/screen_cap_icon.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/record_add_disable"
+    <item android:drawable="@drawable/screen_cap_disable"
         android:state_enabled="false"/>
-    <item android:drawable="@drawable/record_add_highlight"
+    <item android:drawable="@drawable/screen_cap_highlight"
         android:state_pressed="true"/>
-    <item android:drawable="@drawable/record_add_normal"/>
+    <item android:drawable="@drawable/screen_cap_normal"/>
 </selector>

demo/res/drawable/view_add_icon.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/view_add_disable"
+        android:state_enabled="false"/>
+    <item android:drawable="@drawable/view_add_highlight"
+        android:state_pressed="true"/>
+    <item android:drawable="@drawable/view_add_normal"/>
+</selector>

demo/res/layout/audio_func_fragment.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/bgm"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="#11123456"
+            android:checked="false"
+            android:text="背景音乐"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </CheckBox>
+
+        <TextView
+            android:id="@+id/bgm_filter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:background="#11123456"
+            android:text="bgm升降调"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </TextView>
+
+        <TextView
+            android:id="@+id/audio_filter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:background="#11123456"
+            android:text="@string/audio_filter_selected"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </TextView>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/audio_preview"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="#11123456"
+            android:checked="false"
+            android:text="耳返"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </CheckBox>
+
+        <CheckBox
+            android:id="@+id/mute"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="#11123456"
+            android:checked="false"
+            android:text="静音"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </CheckBox>
+
+        <CheckBox
+            android:id="@+id/ns"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="#11123456"
+            android:checked="false"
+            android:text="降噪"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </CheckBox>
+
+        <CheckBox
+            android:id="@+id/audio_ld"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="#11123456"
+            android:checked="false"
+            android:text="低延迟"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </CheckBox>
+    </LinearLayout>
+</LinearLayout>

demo/res/layout/base_camera_actionbar.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              android:layout_gravity="center_vertical"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/switch_cam"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:scaleType="centerInside"
+        android:src="@drawable/camera_switch_icon"/>
+
+    <ImageView
+        android:id="@+id/flash"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:scaleType="centerInside"
+        android:src="@drawable/camera_flash_icon">
+    </ImageView>
+</LinearLayout>

demo/res/layout/base_camera_activity.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ff000000" >
+
+    <android.opengl.GLSurfaceView
+        android:id="@+id/gl_surface_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true" />
+
+    <Chronometer
+        android:id="@+id/chronometer"
+        android:layout_width="wrap_content"
+        android:layout_height="46dp"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentTop="true"
+        android:format="%s"
+        android:gravity="center"
+        android:textColor="@color/font_color_35"
+        android:textSize="@dimen/font_size_38px" />
+
+    <include
+        android:id="@+id/actionbar"
+        android:layout_width="wrap_content"
+        android:layout_height="46dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
+        layout="@layout/base_camera_actionbar" />
+
+    <TextView
+        android:id="@+id/url"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/actionbar"
+        android:layout_marginTop="4dp"
+        android:gravity="center"
+        android:textColor="@color/font_color_35"
+        android:textSize="@dimen/font_size_36px" />
+
+    <TextView
+        android:id="@+id/debug_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/url"
+        android:layout_marginTop="8dp"
+        android:gravity="left"
+        android:textColor="@color/font_color_41"
+        android:textSize="@dimen/font_size_22px" />
+
+    <TextView
+        android:id="@+id/start_stream_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:gravity="center"
+        android:background="#11123456"
+        android:text="@string/click_to_shoot"
+        android:textColor="@color/font_color_35"
+        android:textSize="@dimen/font_size_36px">
+    </TextView>
+</RelativeLayout>