Merge pull request #31 from beaven11/master

YvesCheung · web-flow · commit af1ac5fe674c · 2021-06-30T20:03:35.000+08:00
fix width adaptation
diff --git a/rollingtextview/src/main/java/com/yy/mobile/rollingtextview/TextColumn.kt b/rollingtextview/src/main/java/com/yy/mobile/rollingtextview/TextColumn.kt
@@ -95,7 +95,11 @@ internal class TextColumn(
             }
 
         //计算当前字符宽度，为第一个字符和最后一个字符的过渡宽度
-        currentWidth = (lastCharWidth - firstCharWidth) * progress.toFloat() + firstCharWidth
+        currentWidth = if (currentChar.toInt() > 0) {
+            (lastCharWidth - firstCharWidth) * progress.toFloat() + firstCharWidth
+        } else {
+            0f
+        }
 
         return PreviousProgress(index, offsetPercentage, progress, currentChar, currentWidth)
     }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,11 @@ internal class TextColumn(`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`//计算当前字符宽度，为第一个字符和最后一个字符的过渡宽度`
`98`		`- currentWidth = (lastCharWidth - firstCharWidth) * progress.toFloat() + firstCharWidth`
	`98`	`+ currentWidth = if (currentChar.toInt() > 0) {`
	`99`	`+ (lastCharWidth - firstCharWidth) * progress.toFloat() + firstCharWidth`
	`100`	`+ } else {`
	`101`	`+ 0f`
	`102`	`+ }`
`99`	`103`
`100`	`104`	`return PreviousProgress(index, offsetPercentage, progress, currentChar, currentWidth)`
`101`	`105`	`}`