Merge remote-tracking branch 'origin/master'

# Conflicts: # build.gradle

Merge remote-tracking branch 'origin/master'
# Conflicts: # build.gradle
王琳
2 parents f97d940e b2229b2f
Showing 3 changed files with 3 additions and 2 deletions
app/build.gradle
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
doc/Android推流SDK说明文档.pdf
@@ -13,7 +13,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -13,7 +13,6 @@ import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.SystemClock;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.widget.AppCompatSeekBar;
 import android.support.v7.widget.AppCompatSpinner;
@@ -367,6 +366,7 @@ public class StreamActivity extends Activity {
         mStreamer.resume();
         if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
             mStreamer.setAudioOnly(false);
+            mStreamer.setMuteAudio(false);
         }
         if (mWaterMarkCheckBox.isChecked()) {
             showWaterMark();
@@ -379,6 +379,7 @@ public class StreamActivity extends Activity {
         mStreamer.stopCameraPreview();
         if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
             mStreamer.setAudioOnly(true);
+            mStreamer.setMuteAudio(true);
         }
         hideWaterMark();
     }