Commit b2229b2f06aaa81fe14c7409846faec74c7e8eb1

Authored by 朱显松
1 parent e62e582e

更新文档提升编译版本

app/build.gradle
@@ -13,7 +13,7 @@ android { @@ -13,7 +13,7 @@ android {
13 } 13 }
14 buildTypes { 14 buildTypes {
15 release { 15 release {
16 - minifyEnabled false 16 + minifyEnabled true
17 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 17 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18 } 18 }
19 } 19 }
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
@@ -13,7 +13,6 @@ import android.opengl.GLSurfaceView; @@ -13,7 +13,6 @@ import android.opengl.GLSurfaceView;
13 import android.os.Build; 13 import android.os.Build;
14 import android.os.Bundle; 14 import android.os.Bundle;
15 import android.os.Handler; 15 import android.os.Handler;
16 -import android.os.SystemClock;  
17 import android.support.v4.app.ActivityCompat; 16 import android.support.v4.app.ActivityCompat;
18 import android.util.Log; 17 import android.util.Log;
19 import android.view.KeyEvent; 18 import android.view.KeyEvent;
@@ -221,6 +220,7 @@ public class StreamActivity extends Activity { @@ -221,6 +220,7 @@ public class StreamActivity extends Activity {
221 mStreamer.resume(); 220 mStreamer.resume();
222 if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) { 221 if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
223 mStreamer.setAudioOnly(false); 222 mStreamer.setAudioOnly(false);
  223 + mStreamer.setMuteAudio(false);
224 } 224 }
225 if (mWaterMarkCheckBox.isChecked()) { 225 if (mWaterMarkCheckBox.isChecked()) {
226 showWaterMark(); 226 showWaterMark();
@@ -233,6 +233,7 @@ public class StreamActivity extends Activity { @@ -233,6 +233,7 @@ public class StreamActivity extends Activity {
233 mStreamer.stopCameraPreview(); 233 mStreamer.stopCameraPreview();
234 if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) { 234 if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
235 mStreamer.setAudioOnly(true); 235 mStreamer.setAudioOnly(true);
  236 + mStreamer.setMuteAudio(true);
236 } 237 }
237 hideWaterMark(); 238 hideWaterMark();
238 } 239 }
build.gradle
@@ -5,7 +5,7 @@ buildscript { @@ -5,7 +5,7 @@ buildscript {
5 jcenter() 5 jcenter()
6 } 6 }
7 dependencies { 7 dependencies {
8 - classpath 'com.android.tools.build:gradle:2.2.2' 8 + classpath 'com.android.tools.build:gradle:2.2.3'
9 9
10 // NOTE: Do not place your application dependencies here; they belong 10 // NOTE: Do not place your application dependencies here; they belong
11 // in the individual module build.gradle files 11 // in the individual module build.gradle files
doc/Android推流SDK说明文档.pdf 0 → 100644
No preview for this file type
doc/推流Android SDK 说明文档.pdf deleted 100644 → 0
No preview for this file type