CNLive Android Team / StreamDemoQN · Commits

Commit 82764fae4a38217656d8fc51dea872714d229272

Authored by 王琳
1 parent ea267647

添加推流SDK文档

Inline Side-by-side
Showing 25 changed files with 43 additions and 43 deletions
app/build.gradle
  View file @82764fa
... ... @@ -4,7 +4,7 @@ android {
4 4 compileSdkVersion 24
5 5 buildToolsVersion "24.0.3"
6 6 defaultConfig {
7   - applicationId "com.cnlive.demo.stream"
  7 + applicationId "com.cnlive.demo.streamqn"
8 8 minSdkVersion 16
9 9 targetSdkVersion 24
10 10 versionCode 1
... ...
app/libs/libcnlivestream.jar
View file @82764fa
No preview for this file type
app/src/androidTest/java/com/cnlive/demo/stream/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/com/cnlive/demo/streamqn/ExampleInstrumentedTest.java
  View file @82764fa
1   -package com.cnlive.demo.stream;
  1 +package com.cnlive.demo.streamqn;
2 2  
3 3 import android.content.Context;
4 4 import android.support.test.InstrumentationRegistry;
... ...
app/src/main/AndroidManifest.xml
  View file @82764fa
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3   - package="com.cnlive.demo.stream">
  3 + package="com.cnlive.demo.streamqn">
4 4  
5 5 <uses-permission android:name="android.permission.INTERNET" />
6 6 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
... ... @@ -14,20 +14,20 @@
14 14 <uses-feature android:glEsVersion="0x00020000" android:required="true" />
15 15  
16 16 <application
17   - android:name=".CNStreamApplication"
  17 + android:name="com.cnlive.demo.streamqn.CNStreamApplication"
18 18 android:allowBackup="true"
19 19 android:icon="@mipmap/ic_launcher"
20 20 android:label="@string/app_name"
21 21 android:supportsRtl="true"
22 22 android:theme="@style/AppTheme">
23   - <activity android:name=".MainActivity">
  23 + <activity android:name="com.cnlive.demo.streamqn.MainActivity">
24 24 <intent-filter>
25 25 <action android:name="android.intent.action.MAIN" />
26 26  
27 27 <category android:name="android.intent.category.LAUNCHER" />
28 28 </intent-filter>
29 29 </activity>
30   - <activity android:name=".BaseStreamActivity"
  30 + <activity android:name="com.cnlive.demo.streamqn.BaseStreamActivity"
31 31 android:configChanges="orientation|screenSize"></activity>
32 32 </application>
33 33  
... ...
app/src/main/java/com/cnlive/demo/stream/BaseStreamActivity.java renamed to app/src/main/java/com/cnlive/demo/streamqn/BaseStreamActivity.java
  View file @82764fa
1   -package com.cnlive.demo.stream;
  1 +package com.cnlive.demo.streamqn;
2 2  
3 3 import android.app.Activity;
4 4 import android.app.AlertDialog;
... ... @@ -22,9 +22,9 @@ import android.widget.ImageView;
22 22 import android.widget.SeekBar;
23 23 import android.widget.Toast;
24 24  
25   -import com.cnlive.demo.stream.gles.FBO;
26   -import com.cnlive.demo.stream.ui.CameraPreviewFrameView;
27   -import com.cnlive.demo.stream.ui.RotateLayout;
  25 +import com.cnlive.demo.streamqn.gles.FBO;
  26 +import com.cnlive.demo.streamqn.ui.CameraPreviewFrameView;
  27 +import com.cnlive.demo.streamqn.ui.RotateLayout;
28 28  
29 29 import com.cnlive.libs.lib_cnstream.CNCameraSetting;
30 30 import com.cnlive.libs.lib_cnstream.CNMicrophoneSetting;
... ...
app/src/main/java/com/cnlive/demo/stream/Config.java renamed to app/src/main/java/com/cnlive/demo/streamqn/Config.java
  View file @82764fa
1   -package com.cnlive.demo.stream;
  1 +package com.cnlive.demo.streamqn;
2 2  
3 3 import android.content.pm.ActivityInfo;
4 4  
... ...
app/src/main/java/com/cnlive/demo/stream/MainActivity.java renamed to app/src/main/java/com/cnlive/demo/streamqn/MainActivity.java
  View file @82764fa
1   -package com.cnlive.demo.stream;
  1 +package com.cnlive.demo.streamqn;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
... ...
app/src/main/java/com/cnlive/demo/stream/filter/AbstractFilter.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/AbstractFilter.java
  View file @82764fa
1   -package com.cnlive.demo.stream.filter;
  1 +package com.cnlive.demo.streamqn.filter;
2 2  
3 3 import android.content.Context;
4 4  
... ...
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilter.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilter.java
  View file @82764fa
1   -package com.cnlive.demo.stream.filter;
  1 +package com.cnlive.demo.streamqn.filter;
2 2  
3 3 import android.content.Context;
4 4 import android.opengl.GLES11Ext;
5 5 import android.opengl.GLES20;
6 6  
7   -import com.cnlive.demo.stream.R;
8   -import com.cnlive.demo.stream.gles.GlUtil;
  7 +import com.cnlive.demo.streamqn.R;
  8 +import com.cnlive.demo.streamqn.gles.GlUtil;
9 9  
10 10 import java.nio.FloatBuffer;
11 11  
... ...
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilterBeauty.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilterBeauty.java
  View file @82764fa
1   -package com.cnlive.demo.stream.filter;
  1 +package com.cnlive.demo.streamqn.filter;
2 2  
3 3 import android.content.Context;
4 4 import android.opengl.GLES20;
5 5  
6   -import com.cnlive.demo.stream.R;
7   -import com.cnlive.demo.stream.gles.GlUtil;
  6 +import com.cnlive.demo.streamqn.R;
  7 +import com.cnlive.demo.streamqn.gles.GlUtil;
8 8  
9 9 import java.nio.FloatBuffer;
10 10  
... ...
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilterMosaic.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilterMosaic.java
  View file @82764fa
1   -package com.cnlive.demo.stream.filter;
  1 +package com.cnlive.demo.streamqn.filter;
2 2  
3 3 import android.content.Context;
4 4 import android.opengl.GLES20;
5 5  
6   -import com.cnlive.demo.stream.R;
7   -import com.cnlive.demo.stream.gles.GlUtil;
  6 +import com.cnlive.demo.streamqn.R;
  7 +import com.cnlive.demo.streamqn.gles.GlUtil;
8 8  
9 9 import java.nio.FloatBuffer;
10 10  
... ...
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilterToneCurve.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilterToneCurve.java
  View file @82764fa
1   -package com.cnlive.demo.stream.filter;
  1 +package com.cnlive.demo.streamqn.filter;
2 2  
3 3 import android.content.Context;
4 4 import android.graphics.Point;
5 5 import android.graphics.PointF;
6 6 import android.opengl.GLES20;
7 7  
8   -import com.cnlive.demo.stream.R;
9   -import com.cnlive.demo.stream.gles.GlUtil;
  8 +import com.cnlive.demo.streamqn.R;
  9 +import com.cnlive.demo.streamqn.gles.GlUtil;
10 10  
11 11 import java.io.IOException;
12 12 import java.io.InputStream;
... ...
app/src/main/java/com/cnlive/demo/stream/filter/IFilter.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/IFilter.java
  View file @82764fa
1   -package com.cnlive.demo.stream.filter;
  1 +package com.cnlive.demo.streamqn.filter;
2 2  
3 3 import java.nio.FloatBuffer;
4 4  
... ...
app/src/main/java/com/cnlive/demo/stream/gles/Drawable2d.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/Drawable2d.java
  View file @82764fa
1   -package com.cnlive.demo.stream.gles;
  1 +package com.cnlive.demo.streamqn.gles;
2 2  
3 3 import java.nio.FloatBuffer;
4 4  
... ...
app/src/main/java/com/cnlive/demo/stream/gles/FBO.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/FBO.java
  View file @82764fa
1   -package com.cnlive.demo.stream.gles;
  1 +package com.cnlive.demo.streamqn.gles;
2 2  
3 3 import android.content.Context;
4 4 import android.opengl.GLES20;
5 5 import android.util.Log;
6 6  
7   -import com.cnlive.demo.stream.Config;
8   -import com.cnlive.demo.stream.R;
9   -import com.cnlive.demo.stream.filter.CameraFilterBeauty;
  7 +import com.cnlive.demo.streamqn.Config;
  8 +import com.cnlive.demo.streamqn.R;
  9 +import com.cnlive.demo.streamqn.filter.CameraFilterBeauty;
10 10  
11 11  
12 12 /**
... ...
app/src/main/java/com/cnlive/demo/stream/gles/FullFrameRect.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/FullFrameRect.java
  View file @82764fa
1   -package com.cnlive.demo.stream.gles;
  1 +package com.cnlive.demo.streamqn.gles;
2 2  
3 3 /**
4 4 * Created by jerikc on 16/2/23.
5 5 */
6 6 import android.opengl.Matrix;
7 7  
8   -import com.cnlive.demo.stream.filter.IFilter;
  8 +import com.cnlive.demo.streamqn.filter.IFilter;
9 9  
10 10 /**
11 11 * This class essentially represents a viewport-sized sprite that will be rendered with
... ...
app/src/main/java/com/cnlive/demo/stream/gles/GlUtil.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/GlUtil.java
  View file @82764fa
1   -package com.cnlive.demo.stream.gles;
  1 +package com.cnlive.demo.streamqn.gles;
2 2  
3 3 import android.content.Context;
4 4 import android.graphics.Bitmap;
... ...
app/src/main/java/com/cnlive/demo/stream/ui/CameraPreviewFrameView.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/CameraPreviewFrameView.java
  View file @82764fa
1   -package com.cnlive.demo.stream.ui;
  1 +package com.cnlive.demo.streamqn.ui;
2 2  
3 3 import android.content.Context;
4 4 import android.opengl.GLSurfaceView;
... ...
app/src/main/java/com/cnlive/demo/stream/ui/FocusIndicatorRotateLayout.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/FocusIndicatorRotateLayout.java
  View file @82764fa
1   -package com.cnlive.demo.stream.ui;
  1 +package com.cnlive.demo.streamqn.ui;
2 2  
3 3 import android.annotation.TargetApi;
4 4 import android.content.Context;
... ... @@ -6,7 +6,7 @@ import android.os.Build;
6 6 import android.util.AttributeSet;
7 7 import android.util.Log;
8 8  
9   -import com.cnlive.demo.stream.R;
  9 +import com.cnlive.demo.streamqn.R;
10 10  
11 11  
12 12 // A view that indicates the focus area or the metering area.
... ...
app/src/main/java/com/cnlive/demo/stream/ui/Rotatable.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/Rotatable.java
  View file @82764fa
1   -package com.cnlive.demo.stream.ui;
  1 +package com.cnlive.demo.streamqn.ui;
2 2  
3 3 /**
4 4 * Created by jerikc on 16/2/5.
... ...
app/src/main/java/com/cnlive/demo/stream/ui/RotateLayout.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/RotateLayout.java
  View file @82764fa
1   -package com.cnlive.demo.stream.ui;
  1 +package com.cnlive.demo.streamqn.ui;
2 2  
3 3 import android.annotation.TargetApi;
4 4 import android.content.Context;
... ...
app/src/main/res/layout/activity_stream.xml
  View file @82764fa
... ... @@ -14,7 +14,7 @@
14 14 android:layout_alignParentTop="true"
15 15 android:layout_centerHorizontal="true">
16 16  
17   - <com.cnlive.demo.stream.ui.CameraPreviewFrameView
  17 + <com.cnlive.demo.streamqn.ui.CameraPreviewFrameView
18 18 android:id="@+id/cameraPreview_surfaceView"
19 19 android:layout_width="match_parent"
20 20 android:layout_height="match_parent"
... ...
app/src/main/res/layout/focus_indicator.xml
  View file @82764fa
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<com.cnlive.demo.stream.ui.FocusIndicatorRotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2 +<com.cnlive.demo.streamqn.ui.FocusIndicatorRotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:id="@+id/focus_indicator_rotate_layout"
4 4 android:layout_width="wrap_content"
5 5 android:layout_height="wrap_content"
... ... @@ -9,4 +9,4 @@
9 9 android:id="@+id/focus_indicator"
10 10 android:layout_width="120dp"
11 11 android:layout_height="120dp" />
12   -</com.cnlive.demo.stream.ui.FocusIndicatorRotateLayout>
13 12 \ No newline at end of file
  13 +</com.cnlive.demo.streamqn.ui.FocusIndicatorRotateLayout>
14 14 \ No newline at end of file
... ...
app/src/test/java/com/cnlive/demo/stream/ExampleUnitTest.java renamed to app/src/test/java/com/cnlive/demo/streamqn/ExampleUnitTest.java
  View file @82764fa
1   -package com.cnlive.demo.stream;
  1 +package com.cnlive.demo.streamqn;
2 2  
3 3 import org.junit.Test;
4 4  
... ...
doc/Android推流文档.pdf 0 → 100644
View file @82764fa
No preview for this file type