Skip to content

修复文本中包含换行符，导致结算不正确的bug #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

修复文本中包含换行符，导致结算不正确的bug #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
028f474
修复文本中包含换行符，导致结算不正确的bug
Jun 5, 2018
ab577f9
优化换行符逻辑
qinci Jun 5, 2018
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
35 changes: 23 additions & 12 deletions library/src/main/java/cn/carbs/android/expandabletextview/library/ExpandableTextView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,25 +260,36 @@ private CharSequence getNewTextByConfig(){
indexEndTrimmed = indexEnd;
}

String currentLineText = mOrigText.subSequence(indexStart, indexEndTrimmed).toString();
int remainWidth = getValidLayout().getWidth() -
(int) (mTextPaint.measureText(mOrigText.subSequence(indexStart, indexEndTrimmed).toString()) + 0.5);
(int) (mTextPaint.measureText(currentLineText) + 0.5);
float widthTailReplaced = mTextPaint.measureText(getContentOfString(mEllipsisHint)
+ (mShowToExpandHint ? (getContentOfString(mToExpandHint) + getContentOfString(mGapToExpandHint)) : ""));

int indexEndTrimmedRevised = indexEndTrimmed;
if (remainWidth > widthTailReplaced) {
int extraOffset = 0;
int extraWidth = 0;
while (remainWidth > widthTailReplaced + extraWidth) {
extraOffset++;
if (indexEndTrimmed + extraOffset <= mOrigText.length()) {
extraWidth = (int) (mTextPaint.measureText(
mOrigText.subSequence(indexEndTrimmed, indexEndTrimmed + extraOffset).toString()) + 0.5);
} else {
break;
//currentLineText 如果已经是单独一行，则不需要处理
if (!currentLineText.endsWith("\n")) {
//让按钮尽可能靠最右边走
int extraOffset = 0;
int extraWidth = 0;
String tempText;
while (remainWidth > widthTailReplaced + extraWidth) {
extraOffset++;
if (indexEndTrimmed + extraOffset <= mOrigText.length()) {
tempText = mOrigText.subSequence(indexEndTrimmed, indexEndTrimmed + extraOffset).toString();
extraWidth = (int) (mTextPaint.measureText(tempText) + 0.5);
if (tempText.endsWith("\n")) {
//fix by shenqinci 修复文本中间主动换行导致计算不正确的bug
//（无法提前结束,只根据extraOffset截取，导致text已经包含非本行的text）
break;
}
} else {
break;
}
}
indexEndTrimmedRevised += extraOffset - 1;
}
indexEndTrimmedRevised += extraOffset - 1;
} else {
int extraOffset = 0;
int extraWidth = 0;
Expand Down Expand Up @@ -536,4 +547,4 @@ private TouchableSpan getPressedSpan(TextView textView, Spannable spannable, Mot
return touchedSpan;
}
}
}
}