Skip to content

Commit

Permalink
修复隐藏后弹幕暂停的问题
Browse files Browse the repository at this point in the history
lh123 committed Nov 16, 2016
1 parent 34f9f31 commit 77be36b
Showing 8 changed files with 30 additions and 22 deletions.
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

3 changes: 1 addition & 2 deletions .idea/gradle.xml

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

16 changes: 16 additions & 0 deletions .idea/misc.xml

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

8 changes: 4 additions & 4 deletions DanmakuLibrary/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
compileSdkVersion 25
buildToolsVersion "24.0.3"

defaultConfig {
minSdkVersion 15
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "1.0"

@@ -27,5 +27,5 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
compile 'com.android.support:support-annotations:24.2.1'
compile 'com.android.support:support-annotations:25.0.0'
}
Original file line number Diff line number Diff line change
@@ -411,9 +411,7 @@ protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
for (int i = 0; i < mDanmakuTracks.size(); i++) {
DanmakuTrack track = mDanmakuTracks.get(i);
if (mShowDanmaku) {
track.draw(canvas);
}
track.draw(canvas);
}
if (mShowDebugInfo) {
drawDebugInfo(canvas);
@@ -581,7 +579,9 @@ private void draw(Canvas canvas) {
ListIterator<DanmakuWrapped> iterator = mDanmakus.getHeadIterator();
while (iterator.hasNext()) {
DanmakuWrapped danmaku = iterator.next();
danmaku.draw(canvas, y);
if (mShowDanmaku) {
danmaku.draw(canvas, y);
}
if (danmaku.danmaku.getType() == 1) {
if (danmaku.isDisAppear()) {
mScrapDanmakus.add(danmaku);
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
compileSdkVersion 25
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.lh.danmakuview"
minSdkVersion 15
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
@@ -22,6 +22,6 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:appcompat-v7:25.0.0'
compile project(':DanmakuLibrary')
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}

0 comments on commit 77be36b

Please sign in to comment.