From e0e4ce83be8fa62907d35055ddb8236cadd8e5b9 Mon Sep 17 00:00:00 2001 From: xingxing Date: Fri, 3 Mar 2017 12:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=94=E8=AE=B0=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=A4=AA=E5=A4=9A=20=E9=A2=84=E8=A7=88=E5=87=BA?= =?UTF-8?q?=E7=8E=B0anr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/houxg/leamonax/adapter/NoteAdapter.java | 4 ++-- .../main/java/org/houxg/leamonax/service/NoteService.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java b/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java index f9f4e44..18d8fdd 100644 --- a/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java +++ b/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java @@ -202,9 +202,9 @@ public class NoteAdapter extends RecyclerView.Adapter { } } if (note.isMarkDown()) { - holder.contentTv.setText(note.getContent()); + holder.contentTv.setText(note.getNoteAbstract()); } else { - Spanned spannedContent = Html.fromHtml(note.getContent()); + Spanned spannedContent = Html.fromHtml(note.getNoteAbstract()); String contentStr = spannedContent.toString(); contentStr = contentStr.replaceAll("\\n\\n+", "\n"); holder.contentTv.setText(contentStr); diff --git a/app/src/main/java/org/houxg/leamonax/service/NoteService.java b/app/src/main/java/org/houxg/leamonax/service/NoteService.java index 0ec38b7..37cae60 100644 --- a/app/src/main/java/org/houxg/leamonax/service/NoteService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteService.java @@ -104,12 +104,15 @@ public class NoteService { localId = localNote.getId(); } remoteNote.setIsDirty(false); + String content; if (remoteNote.isMarkDown()) { - remoteNote.setContent(convertToLocalImageLinkForMD(localId, remoteNote.getContent())); + content = convertToLocalImageLinkForMD(localId, remoteNote.getContent()); } else { - remoteNote.setContent(convertToLocalImageLinkForRichText(localId, remoteNote.getContent())); + content = convertToLocalImageLinkForRichText(localId, remoteNote.getContent()); } XLog.i(TAG + "content=" + remoteNote.getContent()); + remoteNote.setContent(content); + remoteNote.setNoteAbstract(content.length() < 500 ? content : content.substring(0, 500)); remoteNote.update(); handleFile(localId, remoteNote.getNoteFiles()); updateTagsToLocal(localId, remoteNote.getTagData());