Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.

Wire feature #211

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Wire feature #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
091cdb7
update wire version
Jun 18, 2019
115b00b
update wire version with local
Jun 18, 2019
2a9dfc4
Merge branch 'master' into wire_feature
Dec 16, 2019
81d6836
Merge branch 'master' into wire_feature
Dec 16, 2019
45eb672
修改线程池
Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,17 @@ android {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/MANIFEST.MF'
}

lintOptions {
abortOnError false
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.squareup.wire:wire-runtime:2.3.0-RC1'
provided fileTree(include: ['*.jar'], dir: 'libs')
// implementation 'com.squareup.wire:wire-runtime:3.0.0-alpha01'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.squareup.okio:okio:2.2.2'
}
repositories {
mavenCentral()
Expand Down
Binary file added library/libs/wire-runtime-jvm-3.0.0-alpha02.jar
View file
Open in desktop
Binary file not shown.
55 changes: 41 additions & 14 deletions library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ class SVGADynamicEntity {

internal var dynamicBoringLayoutText: HashMap<String, BoringLayout> = hashMapOf()

internal var dynamicDrawer: HashMap<String, (canvas: Canvas, frameIndex: Int) -> Boolean> = hashMapOf()

internal var dynamicDrawer: HashMap<String, (canvas: Canvas, frameIndex: Int) -> Boolean> =
hashMapOf()


//点击事件回调map
internal var mClickMap : HashMap<String, IntArray> = hashMapOf()
internal var mClickMap: HashMap<String, IntArray> = hashMapOf()
internal var dynamicIClickArea: HashMap<String, IClickAreaListener> = hashMapOf()

internal var dynamicDrawerSized: HashMap<String, (canvas: Canvas, frameIndex: Int, width: Int, height: Int) -> Boolean> = hashMapOf()
internal var dynamicDrawerSized: HashMap<String, (canvas: Canvas, frameIndex: Int, width: Int, height: Int) -> Boolean> =
hashMapOf()


internal var isTextDirty = false
Expand All @@ -50,7 +51,30 @@ class SVGADynamicEntity {

fun setDynamicImage(url: String, forKey: String) {
val handler = android.os.Handler()
SVGAParser.threadPoolExecutor.execute {
// SVGAParser.threadPoolExecutor.execute {
// (URL(url).openConnection() as? HttpURLConnection)?.let {
// try {
// it.connectTimeout = 20 * 1000
// it.requestMethod = "GET"
// it.connect()
// it.inputStream.use { stream ->
// BitmapFactory.decodeStream(stream)?.let {
// handler.post { setDynamicImage(it, forKey) }
// }
// }
// } catch (e: Exception) {
// e.printStackTrace()
// } finally {
// try {
// it.disconnect()
// } catch (disconnectException: Throwable) {
// // ignored here
// }
// }
// }
//
// }
SVGAExecutorService.executorTask(Runnable {
(URL(url).openConnection() as? HttpURLConnection)?.let {
try {
it.connectTimeout = 20 * 1000
Expand All @@ -71,7 +95,7 @@ class SVGADynamicEntity {
}
}
}
}
})
}

fun setDynamicText(text: String, textPaint: TextPaint, forKey: String) {
Expand All @@ -87,8 +111,8 @@ class SVGADynamicEntity {

fun setDynamicText(layoutText: BoringLayout, forKey: String) {
this.isTextDirty = true
BoringLayout.isBoring(layoutText.text,layoutText.paint)?.let {
this.dynamicBoringLayoutText.put(forKey,layoutText)
BoringLayout.isBoring(layoutText.text, layoutText.paint)?.let {
this.dynamicBoringLayoutText.put(forKey, layoutText)
}
}

Expand All @@ -97,13 +121,13 @@ class SVGADynamicEntity {
}

fun setClickArea(clickKey: List<String>) {
for(itemKey in clickKey){
dynamicIClickArea.put(itemKey,object : IClickAreaListener{
for (itemKey in clickKey) {
dynamicIClickArea.put(itemKey, object : IClickAreaListener {
override fun onResponseArea(key: String, x0: Int, y0: Int, x1: Int, y1: Int) {
mClickMap.let {
if(it.get(key) == null){
it.put(key, intArrayOf(x0,y0,x1,y1))
}else{
if (it.get(key) == null) {
it.put(key, intArrayOf(x0, y0, x1, y1))
} else {
it.get(key)?.let {
it[0] = x0
it[1] = y0
Expand Down Expand Up @@ -136,7 +160,10 @@ class SVGADynamicEntity {
})
}

fun setDynamicDrawerSized(drawer: (canvas: Canvas, frameIndex: Int, width: Int, height: Int) -> Boolean, forKey: String) {
fun setDynamicDrawerSized(
drawer: (canvas: Canvas, frameIndex: Int, width: Int, height: Int) -> Boolean,
forKey: String
) {
this.dynamicDrawerSized.put(forKey, drawer)
}

Expand Down
29 changes: 29 additions & 0 deletions library/src/main/java/com/opensource/svgaplayer/SVGAExecutorService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.opensource.svgaplayer

import java.util.concurrent.Executor

/**
* Created by huangzhilong on 2019-07-23.
* 设置线程池,没设置则new thread（原来逻辑）
*/

class SVGAExecutorService {

companion object {

private var mExecutorService: Executor? = null

fun setExecutorService(executorService: Executor?) {
mExecutorService = executorService
}

fun executorTask(runnable: Runnable) {
if (mExecutorService != null) {
mExecutorService?.execute(runnable)
} else {
var thread = Thread(runnable)
thread.start()
}
}
}
}
83 changes: 57 additions & 26 deletions library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ open class SVGAImageView : ImageView {

private var animator: ValueAnimator? = null

private var mItemClickAreaListener : SVGAClickAreaListener? = null
private var mItemClickAreaListener: SVGAClickAreaListener? = null

constructor(context: Context?) : super(context) {
setSoftwareLayerType()
Expand All @@ -51,12 +51,15 @@ open class SVGAImageView : ImageView {
attrs?.let { loadAttrs(it) }
}

constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs,
defStyleAttr) {
setSoftwareLayerType()
attrs?.let { loadAttrs(it) }
}

constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
constructor(
context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int
) : super(context, attrs, defStyleAttr, defStyleRes) {
setSoftwareLayerType()
attrs?.let { loadAttrs(it) }
}
Expand All @@ -75,22 +78,44 @@ open class SVGAImageView : ImageView {
}

private fun loadAttrs(attrs: AttributeSet) {
val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0)
val typedArray =
context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0)
loops = typedArray.getInt(R.styleable.SVGAImageView_loopCount, 0)
clearsAfterStop = typedArray.getBoolean(R.styleable.SVGAImageView_clearsAfterStop, true)
val antiAlias = typedArray.getBoolean(R.styleable.SVGAImageView_antiAlias, true)
val autoPlay = typedArray.getBoolean(R.styleable.SVGAImageView_autoPlay, true)
typedArray.getString(R.styleable.SVGAImageView_fillMode)?.let {
if (it == "0") {
fillMode = FillMode.Backward
}
else if (it == "1") {
} else if (it == "1") {
fillMode = FillMode.Forward
}
}
typedArray.getString(R.styleable.SVGAImageView_source)?.let {
val parser = SVGAParser(context)
Thread {
// Thread {
// val callback: SVGAParser.ParseCompletion = object : SVGAParser.ParseCompletion {
// override fun onComplete(videoItem: SVGAVideoEntity) {
// [email protected] {
// videoItem.antiAlias = antiAlias
// setVideoItem(videoItem)
// (drawable as? SVGADrawable)?.scaleType = scaleType
// if (autoPlay) {
// startAnimation()
// }
// }
// }
//
// override fun onError() {}
// }
// if (it.startsWith("http://") || it.startsWith("https://")) {
// parser.parse(URL(it), callback)
// } else {
// parser.parse(it, callback)
// }
// }.start()

SVGAExecutorService.executorTask(Runnable {
val callback: SVGAParser.ParseCompletion = object : SVGAParser.ParseCompletion {
override fun onComplete(videoItem: SVGAVideoEntity) {
[email protected] {
Expand All @@ -105,13 +130,16 @@ open class SVGAImageView : ImageView {

override fun onError() {}
}
if(it.startsWith("http://") || it.startsWith("https://")) {
if (it.startsWith("http://") || it.startsWith("https://")) {
parser.parse(URL(it), callback)
} else {
parser.parse(it, callback)
}
}.start()

})
}


typedArray.recycle()
}

Expand All @@ -127,7 +155,8 @@ open class SVGAImageView : ImageView {
drawable.videoItem.let {
var durationScale = 1.0
val startFrame = Math.max(0, range?.location ?: 0)
val endFrame = Math.min(it.frames - 1, ((range?.location ?: 0) + (range?.length ?: Int.MAX_VALUE) - 1))
val endFrame = Math.min(it.frames - 1,
((range?.location ?: 0) + (range?.length ?: Int.MAX_VALUE) - 1))
val animator = ValueAnimator.ofInt(startFrame, endFrame)
try {
val animatorClass = Class.forName("android.animation.ValueAnimator")
Expand All @@ -140,46 +169,51 @@ open class SVGAImageView : ImageView {
if (durationScale == 0.0) {
it.setFloat(animatorClass, 1.0f)
durationScale = 1.0
Log.e("SVGAPlayer", "The animation duration scale has been reset to 1.0x, because you closed it on developer options.")
Log.e("SVGAPlayer",
"The animation duration scale has been reset to 1.0x, because you closed it on developer options.")
}
}
}
} catch (e: Exception) {}
} catch (e: Exception) {
}
animator.interpolator = LinearInterpolator()
animator.duration = ((endFrame - startFrame + 1) * (1000 / it.FPS) / durationScale).toLong()
animator.duration =
((endFrame - startFrame + 1) * (1000 / it.FPS) / durationScale).toLong()
animator.repeatCount = if (loops <= 0) 99999 else loops - 1
animator.addUpdateListener {
drawable.currentFrame = animator.animatedValue as Int
callback?.onStep(drawable.currentFrame, ((drawable.currentFrame + 1).toDouble() / drawable.videoItem.frames.toDouble()))
callback?.onStep(drawable.currentFrame,
((drawable.currentFrame + 1).toDouble() / drawable.videoItem.frames.toDouble()))
}
animator.addListener(object : Animator.AnimatorListener {
override fun onAnimationRepeat(animation: Animator?) {
callback?.onRepeat()
}

override fun onAnimationEnd(animation: Animator?) {
isAnimating = false
stopAnimation()
if (!clearsAfterStop) {
if (fillMode == FillMode.Backward) {
drawable.currentFrame = startFrame
}
else if (fillMode == FillMode.Forward) {
} else if (fillMode == FillMode.Forward) {
drawable.currentFrame = endFrame
}
}
callback?.onFinished()
}

override fun onAnimationCancel(animation: Animator?) {
isAnimating = false
}

override fun onAnimationStart(animation: Animator?) {
isAnimating = true
}
})
if (reverse) {
animator.reverse()
}
else {
} else {
animator.start()
}
this.animator = animator
Expand Down Expand Up @@ -225,7 +259,8 @@ open class SVGAImageView : ImageView {
if (andPlay) {
startAnimation()
animator?.let {
it.currentPlayTime = (Math.max(0.0f, Math.min(1.0f, (frame.toFloat() / drawable.videoItem.frames.toFloat()))) * it.duration).toLong()
it.currentPlayTime = (Math.max(0.0f, Math.min(1.0f,
(frame.toFloat() / drawable.videoItem.frames.toFloat()))) * it.duration).toLong()
}
}
}
Expand All @@ -239,30 +274,26 @@ open class SVGAImageView : ImageView {
stepToFrame(frame, andPlay)
}

fun setOnAnimKeyClickListener(clickListener : SVGAClickAreaListener){
fun setOnAnimKeyClickListener(clickListener: SVGAClickAreaListener) {
mItemClickAreaListener = clickListener
}

@SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent?): Boolean {
event?.let {
if(event.action == MotionEvent.ACTION_DOWN){
if (event.action == MotionEvent.ACTION_DOWN) {
val drawable = drawable as? SVGADrawable ?: return false
for((key,value) in drawable.dynamicItem.mClickMap){
for ((key, value) in drawable.dynamicItem.mClickMap) {
if (event.x >= value[0] && event.x <= value[2] && event.y >= value[1] && event.y <= value[3]) {
mItemClickAreaListener?.let {
it.onClick(key)
return true
}
}
}



}
}

return super.onTouchEvent(event)
}

}
Loading