更改SDK引入方式，视频广告与SDK分离

朱显松
1 parent 39963ae6
Showing 36 changed files with 73 additions and 5 deletions
.idea/gradle.xml
.idea/modules.xml
app/build.gradle
app/libs/libcnlivevideo.jar
app/src/main/java/com/cnlive/demo/video/SltVideoActivity.java
app/src/main/jniLibs/armeabi/libRongIMLib.so
app/src/main/jniLibs/armeabi/libksyplayer.so
app/src/main/res/layout/activity_slt_video.xml
lib_advideo/.gitignore
lib_advideo/build.gradle
app/libs/glide-3.7.0.jar → lib_advideo/libs/glide-3.7.0.jar
app/libs/gson-2.2.4.jar → lib_advideo/libs/gson-2.2.4.jar
lib_advideo/libs/libcnliveadvideo.jar
app/libs/volley.jar → lib_advideo/libs/volley.jar
lib_advideo/proguard-rules.pro
lib_advideo/src/main/AndroidManifest.xml
app/src/main/assets/img/collection.png → lib_advideo/src/main/assets/img/collection.png
app/src/main/assets/img/comments.png → lib_advideo/src/main/assets/img/comments.png
app/src/main/assets/img/coordinates.png → lib_advideo/src/main/assets/img/coordinates.png
app/src/main/assets/img/dibiao.png → lib_advideo/src/main/assets/img/dibiao.png
@@ -9,6 +9,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/lib_advideo" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/lib_advideo/lib_advideo.iml" filepath="$PROJECT_DIR$/lib_advideo/lib_advideo.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
@@ -22,7 +22,8 @@ android {
 }
  
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.0.0'
+    compile project(':lib_advideo')
 }
@@ -9,10 +9,10 @@ import android.widget.Button;
 import android.widget.SeekBar;
 import android.widget.TextView;
  
-import com.cnlive.libs.video.video.SltVideoView;
+import com.cnlive.libs.video.slt.SltVideoView;
+import com.cnlive.libs.video.slt.base.ISltVideoView;
 import com.cnlive.libs.video.video.base.IMediaPlayer;
 import com.cnlive.libs.video.video.base.ISltDataSource;
-import com.cnlive.libs.video.video.base.ISltVideoView;
  
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -9,7 +9,7 @@
         android:layout_height="match_parent"
         android:background="@android:color/black">
  
-        <com.cnlive.libs.video.video.SltVideoView
+        <com.cnlive.libs.video.slt.SltVideoView
             android:id="@+id/videoview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+/build
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\AndroidSDK/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 *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+    package="com.cnlive.libs">
+
+    <application android:allowBackup="true" android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
+<resources>
+    <string name="app_name">lib_advideo</string>
+</resources>
-include ':app'
+include ':app', ':lib_advideo'