diff --git a/README.md b/README.md index 970ab47..cb51a42 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ +<<<<<<< HEAD +<<<<<<< HEAD # gitProject1 -1.精读小米便签源代码，写泛读报告 \ No newline at end of file +1.精读小米便签源代码，写泛读报告 +======= +<<<<<<< HEAD +<<<<<<< HEAD +# gitProject1 +abc +======= +# gitProject1 +>>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249 +>>>>>>> 56b7401c41e8a93705075c2dec372535147025bf +======= +# gitProject1 +>>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee +>>>>>>> 856149d31b3fdb3d65ebb0c2da0a49c2b8417f9e +======= +# gitProject1 +======= +# gitProject1 + +1.精读小米便签源代码，写泛读报告 +>>>>>>> ec5b092c2fe5adbe24627fc2992503627dc1795b +>>>>>>> 5f5cff49fcbaa1b5df8823143d84bbfcc52cd49f diff --git a/doc/小米便签开源代码的泛读报告.docx.LOCAL.docx b/doc/小米便签开源代码的泛读报告.docx.LOCAL.docx new file mode 100644 index 0000000..b5494bf Binary files /dev/null and b/doc/小米便签开源代码的泛读报告.docx.LOCAL.docx differ diff --git a/src/Notes-master/.gradle/7.5/checksums/checksums.lock b/src/Notes-master/.gradle/7.5/checksums/checksums.lock index ec838cc..5b128bb 100644 Binary files a/src/Notes-master/.gradle/7.5/checksums/checksums.lock and b/src/Notes-master/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin index b651b26..39d089c 100644 Binary files a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin index e5c97d3..2487d0d 100644 Binary files a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin index f1755b9..a3600b4 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock index d25d996..f342a5c 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 66fbdff..3f7fbed 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index adc6158..eee2340 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java index 6706cf6..7f95be2 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java @@ -14,48 +14,54 @@ * limitations under the License. */ -package net.micode.notes.model; -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.content.OperationApplicationException; -import android.net.Uri; -import android.os.RemoteException; -import android.util.Log; - +package net.micode.notes.model;//创建一个包，用于区别类名的命名空间 +import android.content.ContentProviderOperation;//批量的更新、插入、删除数据。 +import android.content.ContentProviderResult;//操作的结果 +import android.content.ContentUris;//用于添加和获取Uri后面的ID +import android.content.ContentValues;//一种用来存储基本数据类型数据的存储机制 +import android.content.Context;//需要用该类来弄清楚调用者的实例 +import android.content.OperationApplicationException;//操作应用程序容错 +import android.net.Uri;//表示待操作的数据 +import android.os.RemoteException;//远程容错 +import android.util.Log;//输出日志，比如说出错、警告等 + +//引入其余包 import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.CallNote; import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; -import java.util.ArrayList; +import java.util.ArrayList;//系统的自带的可变数组的类 public class Note { private ContentValues mNoteDiffValues; private NoteData mNoteData; + //mNoteDiffValues和mNoteData + private static final String TAG = "Note"; /** * Create a new note id for adding a new note to databases + * 创建一个新的笔记id为了加入将一个新的笔记加入数据库 */ public static synchronized long getNewNoteId(Context context, long folderId) { // Create a new note in the database + // 在数据库中加入一个新的笔记 ContentValues values = new ContentValues(); - long createdTime = System.currentTimeMillis(); - values.put(NoteColumns.CREATED_DATE, createdTime); - values.put(NoteColumns.MODIFIED_DATE, createdTime); - values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); + long createdTime = System.currentTimeMillis();//创建一个变量记录创建的时间 + values.put(NoteColumns.CREATED_DATE, createdTime);//将创建日期的值付给 CREATED_DATE创建时间 + values.put(NoteColumns.MODIFIED_DATE, createdTime);//将创建日期的值付给 MODIFIED_DATE修改时间 + values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);//把type的值赋为0 + values.put(NoteColumns.LOCAL_MODIFIED, 1);//把LOCAL_MODIFIED 本地修改 的值赋为1 + values.put(NoteColumns.PARENT_ID, folderId);//把文件夹id赋给PARENT_ID 父类id Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); long noteId = 0; try { noteId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { Log.e(TAG, "Get note id error :" + e.toString()); noteId = 0; } @@ -153,7 +159,7 @@ public class Note { } void setTextDataId(long id) { - if(id <= 0) { + if (id <= 0) { throw new IllegalArgumentException("Text data id should larger than 0"); } mTextDataId = id; @@ -189,7 +195,7 @@ public class Note { ArrayList operationList = new ArrayList(); ContentProviderOperation.Builder builder = null; - if(mTextDataValues.size() > 0) { + if (mTextDataValues.size() > 0) { mTextDataValues.put(DataColumns.NOTE_ID, noteId); if (mTextDataId == 0) { mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); @@ -197,12 +203,14 @@ public class Note { mTextDataValues); try { setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { Log.e(TAG, "Insert new text data fail with noteId" + noteId); mTextDataValues.clear(); return null; } - } else { + } + else { builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mTextDataId)); builder.withValues(mTextDataValues); @@ -211,7 +219,7 @@ public class Note { mTextDataValues.clear(); } - if(mCallDataValues.size() > 0) { + if (mCallDataValues.size() > 0) { mCallDataValues.put(DataColumns.NOTE_ID, noteId); if (mCallDataId == 0) { mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); @@ -219,12 +227,14 @@ public class Note { mCallDataValues); try { setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { Log.e(TAG, "Insert new call data fail with noteId" + noteId); mCallDataValues.clear(); return null; } - } else { + } + else { builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mCallDataId)); builder.withValues(mCallDataValues); @@ -239,10 +249,12 @@ public class Note { Notes.AUTHORITY, operationList); return (results == null || results.length == 0 || results[0] == null) ? null : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); - } catch (RemoteException e) { + } + catch (RemoteException e) { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); return null; - } catch (OperationApplicationException e) { + } + catch (OperationApplicationException e) { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); return null; } diff --git a/src/Notes-master/local.properties b/src/Notes-master/local.properties index d871ffe..c5e068c 100644 --- a/src/Notes-master/local.properties +++ b/src/Notes-master/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Tue Mar 28 15:42:34 CST 2023 -sdk.dir=D\:\\programming\\androidstudio\\Sdk +# For customization when using a Version Control System, please read the +# header note. +#Thu Apr 13 00:09:07 CST 2023 +sdk.dir=C\:\\Users\\33398\\AppData\\Local\\Android\\Sdk