diff --git a/doc/~$软件泛读、标注和维护报告文档.docx b/doc/~$软件泛读、标注和维护报告文档.docx deleted file mode 100644 index ce41eec..0000000 Binary files a/doc/~$软件泛读、标注和维护报告文档.docx and /dev/null differ diff --git a/doc/开源软件泛读、标注和维护报告文档.docx b/doc/开源软件泛读、标注和维护报告文档.docx index 2a8a682..0ee7b6d 100644 Binary files a/doc/开源软件泛读、标注和维护报告文档.docx and b/doc/开源软件泛读、标注和维护报告文档.docx differ diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java index eb3f8c9..badd52e 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -96,12 +96,12 @@ public class NoteEditActivity extends Activity //NOTE: extends--单继承，但 public TextView tvAlertDate; + // 顶部置顶文本 public TextView tvTopText; + // 顶部长度统计文本 public TextView tvTextNum; - //public EditText editText; - public ImageView ibSetBgColor; } @@ -196,7 +196,6 @@ public class NoteEditActivity extends Activity //NOTE: extends--单继承，但 this.setContentView(R.layout.note_edit); if (savedInstanceState == null && !initActivityState(getIntent())) { - // savedInstanceState? @zhoukexing 2023/12/20 23:45 // 表示之前保存的状态，用于还原数据 @lzk 2024/1/3 23:33 finish(); return; @@ -457,21 +456,29 @@ public class NoteEditActivity extends Activity //NOTE: extends--单继承，但 return true; } + /** + * @Method textFilter + * @Date 2024/1/18 9:45 + * @param oriText + * @Author lenovo + * @Return java.lang.String + * @Description 过滤掉空格换行等不可见字符 + */ private String textFilter(String oriText){ String newText = oriText; newText = newText.replaceAll("\\s", ""); return newText; } + /** + * @method: initResources + * @description: 初始化资源。被onCreate唯一调用 + * @date: 2023/12/18 23:36 + * @author: zhoukexing + * @param: [] + * @return: void + */ private void initResources() { - /** - * @method: initResources - * @description: 初始化资源。被onCreate唯一调用 - * @date: 2023/12/18 23:36 - * @author: zhoukexing - * @param: [] - * @return: void - */ mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java index fc807ba..a856786 100644 --- a/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -220,11 +220,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt protected void onStart() { super.onStart(); Intent intent = getIntent(); + // 如果是搜索引起的实体创建，说明需要展示搜索页面 if (Intent.ACTION_SEARCH.equals(intent.getAction())) { String query = intent.getStringExtra(SearchManager.QUERY); mTitleBar.setText(SEARCH_RESULTS + query); mTitleBar.setVisibility(View.VISIBLE); mAddNewNote.setVisibility(View.GONE); + // 将搜索数据同步 startAsyncNotesSearchListQuery(query); } else startAsyncNotesListQuery(); @@ -453,14 +455,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private void startAsyncNotesListQuery() { String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; + // 按照 Top 降序 mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { String.valueOf(mCurrentFolderId) }, NoteColumns.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); - // DESC 降序 } private void startAsyncNotesSearchListQuery(String query) { + // 模糊匹配 query String selection = NoteColumns.SNIPPET + " LIKE'%" + query +"%'"; mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, diff --git a/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java index 946634b..83fbf31 100644 --- a/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -210,6 +210,14 @@ public class NotesListAdapter extends CursorAdapter { // updateSnippetMap(); // 在数据发生改变时更新 Snippet 到 Position 的映射 } + /** + * @Method changeCursor + * @Date 2024/1/18 15:36 + * @param cursor + * @Author lenovo + * @Return void + * @Description 当cursor改变时调用，需要在这里进行一些数据更新工作 + */ @Override public void changeCursor(Cursor cursor) { super.changeCursor(cursor); @@ -232,6 +240,13 @@ public class NotesListAdapter extends CursorAdapter { // } // } + /** + * @Method calcNotesCount + * @Date 2024/1/18 15:36 + * @Author lenovo + * @Return void + * @Description 计算便签的数目 + */ private void calcNotesCount() { mNotesCount = 0; for (int i = 0; i < getCount(); i++) { diff --git a/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java index d03aa18..85eb88d 100644 --- a/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -30,6 +30,13 @@ import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser.NoteItemBgResources; +/** + * @Package: + * @Class: NotesListItem + * @Author lenovo + * @Date 2024/1/18 15:43 + * @Description: 主页面便签项的类 + */ public class NotesListItem extends LinearLayout { private ImageView mAlert; private ImageView mTop; @@ -97,6 +104,7 @@ public class NotesListItem extends LinearLayout { } } mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); + // 设置置顶图标 if(data.getTop() == 1){ mTop.setImageResource(R.drawable.set_top); mTop.setVisibility(View.VISIBLE);