Merge pull request #1 from ctiao/master

new
Merge pull request #2 from ctiao/master

update
Merge remote-tracking branch 'upstream/master'
ac danmaku player and view
setZOrderOnTop(true);
Merge branch 'master' of https://github.com/ctiao/DanmakuFlameMaster into ctiao-master

Conflicts:
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/controller/CacheManagingDrawTask.java
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/controller/DrawTask.java
Merge branch 'master' of https://github.com/ctiao/DanmakuFlameMaster into ctiao-master

Conflicts:
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/parser/android/AcFunDanmakuParser.java
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/parser/android/JSONSource.java
	Sample/src/main/java/com/sample/MainActivity.java
Merge https://github.com/ctiao/DanmakuFlameMaster into upstream

Conflicts:
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/parser/android/AcFunDanmakuParser.java
Merge branch 'upstream'
uri.toString()
Load String data
add enum DMSiteType and update sample file
Merge pull request #5 from ctiao/master

update it
acfun text size
1. throws Exception when parsing wrong; 

2.http URL connection;
quit handler if parsing wrong
reset holder if surface destroyed; and drawDanmakus before sleep
Merge branch 'master' of https://github.com/ctiao/DanmakuFlameMaster

Conflicts:
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/controller/CacheManagingDrawTask.java
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/loader/android/BiliDanmakuLoader.java
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/parser/android/AcFunDanmakuParser.java
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/ui/widget/DanmakuSurfaceView.java
暂时不置为null...
Merge commit '01bc116b3fed6e6a536b60564a9a4627d0752ddc'

Conflicts:
	DanmakuFlameMaster/src/main/java/master/flame/danmaku/ui/widget/DanmakuSurfaceView.java