root
/
pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working on txt import

This commit is contained in:
mwang 2019-02-27 23:31:52 +08:00
parent 37e87afbbe
commit ba0dfc5ba6
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zhuike/src/main/java/com/deiniu/zhuike/utils/PageFactory.java
View File

@ -502,11 +502,11 @@ public class PageFactory {
mBookUtil.setPostition(currentPage.getEnd()); mBookUtil.setPostition(currentPage.getEnd());
TRPage trPage = new TRPage(); TRPage trPage = new TRPage();
trPage.setBegin(currentPage.getEnd() + 1); trPage.setBegin(currentPage.getEnd() -1);
Log.e("begin",currentPage.getEnd() + 1 + ""); Log.e(TAG,"page postion next begin:" + (currentPage.getEnd() + 1) + "");
trPage.setLines(getNextLines()); trPage.setLines(getNextLines());
Log.e("end",mBookUtil.getPosition() + ""); Log.e(TAG,"page postion next end:" +mBookUtil.getPosition() + "");
trPage.setEnd(mBookUtil.getPosition()); trPage.setEnd(mBookUtil.getPosition()-1);
return trPage; return trPage;
} }
@ -515,9 +515,9 @@ public class PageFactory {
TRPage trPage = new TRPage(); TRPage trPage = new TRPage();
trPage.setEnd(mBookUtil.getPosition() - 1); trPage.setEnd(mBookUtil.getPosition() - 1);
Log.e("end",mBookUtil.getPosition() - 1 + ""); Log.e(TAG,"page postion pre end:" + (mBookUtil.getPosition() - 1 )+ "");
trPage.setLines(getPreLines()); trPage.setLines(getPreLines());
Log.e("begin",mBookUtil.getPosition() + ""); Log.e(TAG,"page postion pre begin:" +mBookUtil.getPosition() + "");
trPage.setBegin(mBookUtil.getPosition()); trPage.setBegin(mBookUtil.getPosition());
return trPage; return trPage;
} }
@ -553,6 +553,8 @@ public class PageFactory {
width = 0; width = 0;
// height += paragraphSpace; // height += paragraphSpace;
if (lines.size() == mLineCount){ if (lines.size() == mLineCount){
Log.e(TAG,String.format("lines count limit a %s,lines size %s",mLineCount,lines.size()));
line ="";
break; break;
} }
} }
@ -562,6 +564,11 @@ public class PageFactory {
if (width > mVisibleWidth) { if (width > mVisibleWidth) {
width = widthChar; width = widthChar;
lines.add(line); lines.add(line);
if (lines.size() == mLineCount){
Log.e(TAG,String.format("lines count limit b %s,lines size %s",mLineCount,lines.size()));
line ="";
break;
}
line = word + ""; line = word + "";
} else { } else {
line += word; line += word;
@ -569,12 +576,20 @@ public class PageFactory {
} }
if (lines.size() == mLineCount){ if (lines.size() == mLineCount){
Log.e(TAG,String.format("lines count limit c %s,lines size %s",mLineCount,lines.size()));
if (!line.isEmpty()){ if (!line.isEmpty()){
mBookUtil.setPostition(mBookUtil.getPosition() - 1); mBookUtil.setPostition(mBookUtil.getPosition() - line.length()-2);// mBookUtil.setPostition(mBookUtil.getPosition() - 1);
} }
break; break;
} }
} }
if (lines.size() == mLineCount) {
Log.e(TAG, String.format("lines count limit d %s,lines size %s", mLineCount, lines.size()));
Log.e(TAG, String.format("lines count limit d %s,line is \n %s", mLineCount, line));
if (!line.isEmpty()) {
mBookUtil.setPostition(mBookUtil.getPosition() - line.length() - 2);// mBookUtil.setPostition(mBookUtil.getPosition() - 1);
}
}
if (!line.isEmpty() && lines.size() < mLineCount){ if (!line.isEmpty() && lines.size() < mLineCount){
@ -586,9 +601,9 @@ public class PageFactory {
} }
// lines.add(line); // lines.add(line);
} }
//for (String str : lines){ for (String str : lines){
// Log.e(TAG,str + " "); Log.e(TAG,str + " ");
// } }
return lines; return lines;
} }