Commit 90676b3576ce80287894283e39f1b3c0ddefd3f3

Authored by 朱显松
1 parent 39963ae6

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

Showing 36 changed files with 73 additions and 5 deletions
.idea/gradle.xml
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 <set> 9 <set>
10 <option value="$PROJECT_DIR$" /> 10 <option value="$PROJECT_DIR$" />
11 <option value="$PROJECT_DIR$/app" /> 11 <option value="$PROJECT_DIR$/app" />
  12 + <option value="$PROJECT_DIR$/lib_advideo" />
12 </set> 13 </set>
13 </option> 14 </option>
14 <option name="resolveModulePerSourceSet" value="false" /> 15 <option name="resolveModulePerSourceSet" value="false" />
.idea/modules.xml
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 <modules> 4 <modules>
5 <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" /> 5 <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" />
6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
  7 + <module fileurl="file://$PROJECT_DIR$/lib_advideo/lib_advideo.iml" filepath="$PROJECT_DIR$/lib_advideo/lib_advideo.iml" />
7 </modules> 8 </modules>
8 </component> 9 </component>
9 </project> 10 </project>
10 \ No newline at end of file 11 \ No newline at end of file
app/build.gradle
@@ -22,7 +22,8 @@ android { @@ -22,7 +22,8 @@ android {
22 } 22 }
23 23
24 dependencies { 24 dependencies {
25 - compile fileTree(dir: 'libs', include: ['*.jar']) 25 + compile fileTree(include: ['*.jar'], dir: 'libs')
26 testCompile 'junit:junit:4.12' 26 testCompile 'junit:junit:4.12'
27 compile 'com.android.support:appcompat-v7:25.0.0' 27 compile 'com.android.support:appcompat-v7:25.0.0'
  28 + compile project(':lib_advideo')
28 } 29 }
app/libs/libcnlivevideo.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/video/SltVideoActivity.java
@@ -9,10 +9,10 @@ import android.widget.Button; @@ -9,10 +9,10 @@ import android.widget.Button;
9 import android.widget.SeekBar; 9 import android.widget.SeekBar;
10 import android.widget.TextView; 10 import android.widget.TextView;
11 11
12 -import com.cnlive.libs.video.video.SltVideoView; 12 +import com.cnlive.libs.video.slt.SltVideoView;
  13 +import com.cnlive.libs.video.slt.base.ISltVideoView;
13 import com.cnlive.libs.video.video.base.IMediaPlayer; 14 import com.cnlive.libs.video.video.base.IMediaPlayer;
14 import com.cnlive.libs.video.video.base.ISltDataSource; 15 import com.cnlive.libs.video.video.base.ISltDataSource;
15 -import com.cnlive.libs.video.video.base.ISltVideoView;  
16 16
17 import java.text.DecimalFormat; 17 import java.text.DecimalFormat;
18 import java.text.NumberFormat; 18 import java.text.NumberFormat;
app/src/main/jniLibs/armeabi/libRongIMLib.so deleted 100644 → 0
No preview for this file type
app/src/main/jniLibs/armeabi/libksyplayer.so deleted 100644 → 0
No preview for this file type
app/src/main/res/layout/activity_slt_video.xml
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 android:layout_height="match_parent" 9 android:layout_height="match_parent"
10 android:background="@android:color/black"> 10 android:background="@android:color/black">
11 11
12 - <com.cnlive.libs.video.video.SltVideoView 12 + <com.cnlive.libs.video.slt.SltVideoView
13 android:id="@+id/videoview" 13 android:id="@+id/videoview"
14 android:layout_width="match_parent" 14 android:layout_width="match_parent"
15 android:layout_height="match_parent" 15 android:layout_height="match_parent"
lib_advideo/.gitignore 0 → 100644
  1 +/build
lib_advideo/build.gradle 0 → 100644
  1 +apply plugin: 'com.android.library'
  2 +
  3 +android {
  4 + compileSdkVersion 25
  5 + buildToolsVersion "25.0.2"
  6 +
  7 + defaultConfig {
  8 + minSdkVersion 16
  9 + targetSdkVersion 25
  10 + versionCode 1
  11 + versionName "1.0"
  12 +
  13 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  14 +
  15 + }
  16 + buildTypes {
  17 + release {
  18 + minifyEnabled false
  19 + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  20 + }
  21 + }
  22 +}
  23 +
  24 +dependencies {
  25 + compile fileTree(dir: 'libs', include: ['*.jar'])
  26 +}
app/libs/glide-3.7.0.jar renamed to lib_advideo/libs/glide-3.7.0.jar
No preview for this file type
app/libs/gson-2.2.4.jar renamed to lib_advideo/libs/gson-2.2.4.jar
No preview for this file type
lib_advideo/libs/libcnliveadvideo.jar 0 → 100644
No preview for this file type
app/libs/volley.jar renamed to lib_advideo/libs/volley.jar
No preview for this file type
lib_advideo/proguard-rules.pro 0 → 100644
  1 +# Add project specific ProGuard rules here.
  2 +# By default, the flags in this file are appended to flags specified
  3 +# in D:\AndroidSDK/tools/proguard/proguard-android.txt
  4 +# You can edit the include path and order by changing the proguardFiles
  5 +# directive in build.gradle.
  6 +#
  7 +# For more details, see
  8 +# http://developer.android.com/guide/developing/tools/proguard.html
  9 +
  10 +# Add any project specific keep options here:
  11 +
  12 +# If your project uses WebView with JS, uncomment the following
  13 +# and specify the fully qualified class name to the JavaScript interface
  14 +# class:
  15 +#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
  16 +# public *;
  17 +#}
  18 +
  19 +# Uncomment this to preserve the line number information for
  20 +# debugging stack traces.
  21 +#-keepattributes SourceFile,LineNumberTable
  22 +
  23 +# If you keep the line number information, uncomment this to
  24 +# hide the original source file name.
  25 +#-renamesourcefileattribute SourceFile
lib_advideo/src/main/AndroidManifest.xml 0 → 100644
  1 +<manifest xmlns:android="http://schemas.android.com/apk/res/android"
  2 +
  3 + package="com.cnlive.libs">
  4 +
  5 + <application android:allowBackup="true" android:label="@string/app_name"
  6 + android:supportsRtl="true">
  7 +
  8 + </application>
  9 +
  10 +</manifest>
app/src/main/assets/img/collection.png renamed to lib_advideo/src/main/assets/img/collection.png

1.95 KB

app/src/main/assets/img/comments.png renamed to lib_advideo/src/main/assets/img/comments.png

2.1 KB

app/src/main/assets/img/coordinates.png renamed to lib_advideo/src/main/assets/img/coordinates.png

1.66 KB

app/src/main/assets/img/dibiao.png renamed to lib_advideo/src/main/assets/img/dibiao.png

1.18 KB

app/src/main/assets/img/icon01.png renamed to lib_advideo/src/main/assets/img/icon01.png

2.04 KB

app/src/main/assets/img/move.png renamed to lib_advideo/src/main/assets/img/move.png

1.45 KB

app/src/main/assets/img/play.png renamed to lib_advideo/src/main/assets/img/play.png

4.28 KB

app/src/main/assets/img/round_icon.png renamed to lib_advideo/src/main/assets/img/round_icon.png

2.79 KB

app/src/main/assets/img/scan.png renamed to lib_advideo/src/main/assets/img/scan.png

1.19 KB

app/src/main/assets/img/share.png renamed to lib_advideo/src/main/assets/img/share.png

1.65 KB

app/src/main/assets/img/slt_back_webview.png renamed to lib_advideo/src/main/assets/img/slt_back_webview.png

835 Bytes

app/src/main/assets/img/slt_close.png renamed to lib_advideo/src/main/assets/img/slt_close.png

1.25 KB

app/src/main/assets/img/slt_content.png renamed to lib_advideo/src/main/assets/img/slt_content.png

2.49 KB

app/src/main/assets/img/stop.png renamed to lib_advideo/src/main/assets/img/stop.png

3.99 KB

app/src/main/assets/img/thumb.png renamed to lib_advideo/src/main/assets/img/thumb.png

241 Bytes

app/src/main/assets/img/tip_img.png renamed to lib_advideo/src/main/assets/img/tip_img.png

2.89 KB

app/src/main/assets/img/you_jiantou.png renamed to lib_advideo/src/main/assets/img/you_jiantou.png

911 Bytes

app/src/main/assets/img/zuo_jiantou.png renamed to lib_advideo/src/main/assets/img/zuo_jiantou.png

949 Bytes

lib_advideo/src/main/res/values/strings.xml 0 → 100644
  1 +<resources>
  2 + <string name="app_name">lib_advideo</string>
  3 +</resources>
settings.gradle
1 -include ':app' 1 +include ':app', ':lib_advideo'