Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNStreamDemo

朱显松
2 parents 5d6c1b04 71da057d
Showing 7 changed files with 60 additions and 47 deletions
app/build.gradle
app/proguard-rules.pro
app/src/androidTest/java/com/cnlive/libs/ApplicationTest.java
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
app/src/test/java/com/cnlive/libs/ExampleUnitTest.java
doc/Android推流SDK说明文档.pdf
doc/推流SDK说明文档.pdf
@@ -3,18 +3,34 @@ apply plugin: &#39;com.android.application&#39;
 android {
     compileSdkVersion 25
     buildToolsVersion '25.0.0'
-
     defaultConfig {
         applicationId "com.cnlive.demo.stream"
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
+    }
+
+    signingConfigs {
+        myConfig {
+            storeFile file("streamdemo4.jks")
+            storePassword "123456"
+            keyAlias "streamdemo"
+            keyPassword "123456"
+        }
     }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.myConfig
+        }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable true
         }
     }
 }
--keepattributes Signature
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\android_sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
  
--dontwarn com.cnlive.**
--keep class com.cnlive.** {*;}
--dontwarn com.ksyun.**
--keep class com.ksyun.** { *;}
 -dontwarn com.ksy.**
--keep class com.ksy.** { *;}
 \ No newline at end of file
+-dontwarn com.ksyun.**
+
+-keep class com.ksy.**{*;}
+-keep class com.ksyun.**{*;}
+
+-keep class com.cnlive.libs.**{*;}
+
+-keep class io.rong.** {*;}
+ -keep class * implements io.rong.imlib.model.MessageContent {*;}
+ -dontwarn io.rong.push.**
+ -dontnote com.xiaomi.**
+ -dontnote com.google.android.gms.gcm.**
+ -dontnote io.rong.**
+  -keep public class * extends android.content.BroadcastReceiver
+
+  -dontwarn com.shiliantong.**
+  -dontwarn com.slt.**
+  -keep class com.shiliantong.**{*;}
+  -keep class com.slt.**{*;}
 \ No newline at end of file
-package com.cnlive.libs;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
 \ No newline at end of file
@@ -526,19 +526,14 @@ public class StreamActivity extends Activity {
     }
  
     private void onBeautyChecked(boolean isChecked) {
-        if (isChecked) {
-            if (mStreamer.getVideoEncodeMethod() ==
-                    IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT) {
-                mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
-                        DENOISE.getFilter());
-                mStreamer.setEnableImgBufBeauty(true);
-            } else {
-//                showChooseFilter();
-                mBeautyChooseView.setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
-            }
+        if (mStreamer.getVideoEncodeMethod() ==
+                IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT) {
+            mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
+                    DENOISE.getFilter());
+            mStreamer.setEnableImgBufBeauty(true);
         } else {
-            mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), BEAUTY_DISABLE.getFilter());
-            mStreamer.setEnableImgBufBeauty(false);
+//                showChooseFilter();
+            mBeautyChooseView.setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
         }
     }
  
-package com.cnlive.libs;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
 \ No newline at end of file