Skip to content

Commit

Permalink
VideoPlayView
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaomolong authored and xiaomolong committed Apr 22, 2016
1 parent 7ea5f78 commit c76004e
Show file tree
Hide file tree
Showing 37 changed files with 1,154 additions and 30 deletions.
11 changes: 10 additions & 1 deletion .idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion AndroidSamples.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
Expand Down
43 changes: 32 additions & 11 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
Expand All @@ -28,7 +25,7 @@
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/retrolambda/debug" />
<output-test url="file://$MODULE_DIR$/build/retrolambda/debugAndroidTest" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
Expand All @@ -50,6 +47,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
Expand All @@ -64,21 +68,36 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/palette-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.reactivex/rxandroid/1.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
Expand All @@ -96,14 +115,16 @@
<orderEntry type="library" exported="" name="rxandroid-1.1.0" level="project" />
<orderEntry type="library" exported="" name="rxjava-1.1.0" level="project" />
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
<orderEntry type="library" exported="" name="converter-gson-2.0.0-beta4" level="project" />
<orderEntry type="library" exported="" name="disklrucache-2.0.2" level="project" />
<orderEntry type="library" exported="" name="converter-gson-2.0.0-beta4" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="android-android-23" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
<orderEntry type="module" module-name="videoPlayViewLibrary" exported="" />
</component>
</module>
5 changes: 1 addition & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,12 @@ dependencies {
compile 'com.android.support:palette-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:design:23.1.1'

compile 'io.reactivex:rxandroid:1.1.0'
compile 'io.reactivex:rxjava:1.1.0'
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4'

compile 'com.github.bumptech.glide:glide:3.7.0'

compile 'com.squareup.okhttp3:okhttp:3.2.0'

compile 'com.jakewharton:disklrucache:2.0.2'
compile project(':libraries:videoPlayViewLibrary')
}
17 changes: 11 additions & 6 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:name=".photograph.PhotographActivity"
android:label="@string/title_activity_photograph" />
<activity
android:name=".download.DownloadActivity"
android:name=".downloadnotify.DownloadActivity"
android:label="@string/title_activity_download" />
<activity
android:name=".xscrollview.XScrollViewActivity"
Expand Down Expand Up @@ -76,10 +76,15 @@
<!-- </intent-filter> -->
</activity>
<activity android:name=".rxjava.RxBusActivity" />
<activity android:name=".OkHttpActivity"></activity>
<activity android:name=".CustomInputActivity">
</activity>
<activity android:name=".disklrucache.DiskLruCacheActivity">
<activity android:name=".OkHttpActivity" />
<activity android:name=".CustomInputActivity" />
<activity android:name=".disklrucache.DiskLruCacheActivity" />
<activity
android:name=".videoplay.VideoPlayViewActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="sensor"
android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -88,4 +93,4 @@
</activity>
</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion ...oidsamples/download/DownloadActivity.java → ...ples/downloadnotify/DownloadActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wuxiaolong.androidsamples.download;
package com.wuxiaolong.androidsamples.downloadnotify;

import android.app.Notification;
import android.app.PendingIntent;
Expand Down
2 changes: 1 addition & 1 deletion ...amples/download/DownloadBaseActivity.java → .../downloadnotify/DownloadBaseActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wuxiaolong.androidsamples.download;
package com.wuxiaolong.androidsamples.downloadnotify;

import android.app.NotificationManager;
import android.app.PendingIntent;
Expand Down
2 changes: 1 addition & 1 deletion ...samples/download/DownloadingActivity.java → ...s/downloadnotify/DownloadingActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wuxiaolong.androidsamples.download;
package com.wuxiaolong.androidsamples.downloadnotify;

import android.os.Bundle;
import android.view.Menu;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/wuxiaolong/androidsamples/utils/AppConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.os.Environment;

import com.wuxiaolong.androidsamples.download.DownloadActivity;
import com.wuxiaolong.androidsamples.downloadnotify.DownloadActivity;
import com.wuxiaolong.androidsamples.photograph.PhotographActivity;


Expand Down
Loading

0 comments on commit c76004e

Please sign in to comment.