From 2904bfb76937b25b83829ec59528b916b816a79b Mon Sep 17 00:00:00 2001 From: p2whvruqn <3635271576@qq.com> Date: Sat, 8 Apr 2023 00:14:05 +0800 Subject: [PATCH 1/2] Initial commit --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index f4ba5b2..7c12386 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -# gitProject1 - +# gitProject1 \ No newline at end of file From 5f5cff49fcbaa1b5df8823143d84bbfcc52cd49f Mon Sep 17 00:00:00 2001 From: emptystack1024 <3339811384@qq.com> Date: Thu, 13 Apr 2023 00:16:03 +0800 Subject: [PATCH 2/2] src/Notes-master/.gradle/7.5/checksums/checksums.lock --- .../.gradle/7.5/checksums/checksums.lock | Bin 17 -> 17 bytes .../.gradle/7.5/checksums/md5-checksums.bin | Bin 25297 -> 25347 bytes .../.gradle/7.5/checksums/sha1-checksums.bin | Bin 75245 -> 77567 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 42847 -> 42947 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 21233 -> 21413 bytes .../java/net/micode/notes/model/Note.java | 68 ++++++++++-------- src/Notes-master/local.properties | 7 +- 9 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/Notes-master/.gradle/7.5/checksums/checksums.lock b/src/Notes-master/.gradle/7.5/checksums/checksums.lock index ec838cc3b48893c3362675eb64ced60fb61a73c4..5b128bb633519de5b3461e2784a1fa30d768ce2f 100644 GIT binary patch literal 17 VcmZQRGHInu>lUxM3}C=40RT2T1X=(9 literal 17 VcmZQRGHInu>lUxM3}C?Y0suD&1t|ak 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 b651b26f78371060d52df2cceef6df2485a983aa..39d089ceb0192eff41c5f2dfad9af041623585f3 100644 GIT binary patch delta 104 zcmcb3l(G33;|3E6#?H;A5)F(3OLT>1-;HRiWB`Mti<{R<26HpM+^G0Ne4~K@_hv_r x2~tMJKuJv?Rs>;zsmx0)j+Pzd`>?vF>xIyOD+D<&x@@vk{TW z!HG%^J4q#7(A6nkQXP)SDJeuQ$?fbtYtHjN?@Z^9cRkPS^*rDCeb#ra-}HKyR07)a7TjauW(fVU@2AN7 z7Ka^yYWNx})V7$H3k{dUX(d2oVa?jE$lOQS9KP2ZAh9ptI*T|EV(XS}u*8%DM1y;{ zwa#rA;i_l1Z%+I-5Sd>1$PzCIS$M_6XT)m)h|9NQ_PQ2`N`~g(?$-x_W@w8?>!J{P zQ5f;1sQ`W=jTGa;Woi(T65*M6a)TKV*`0WTo(dJcwhz5~wKJ_4s0LGb0<#!KN`JQ& z2qJ`1F%@HQTv)R*tGdq}cm*_;@r<<9Z@ss>#YaO6=DrUvMCSS%zJ@oxDSsu zh*Ls)D?+Y1sh4K~m3tlUTk#Y^$EYjc6y&QhrLl9cij{Hbc(eb{`yYG<&^T3pO>0t=8GiJnvUE#016Z_)H>^{Jcbegs zIJT6;=ER+GV_+o8*;Rj0(6X4|`syF_q@!u#h20iZgcTdmI(RM*h^%0&TsYr)B zgZWu($BYJwkY}NSy35r4K ztF3Gyq~`rk`P2R>Kr~|E>BBEzWC!z_@7}@V(m@ljAR8BinNP3EZtVmba{@0JBkIQI z+gZW8k{=(HMh@Z?pHpF^?i20lWkEg=4NEZViO*94Ua#`LD7W zP`sEllGhc#c$%d4T4wE%Qtp34iT-a)#ixJauf<)vT&tEwg@(}hE6U~@OQvY}G7XqP zit=U-qjf>7T75raowGNZLY3)tCE5z1rcQ2ZvFZB$ zU}eu5B$Q$44oo+ICgM37r%l-}o3|?~7q*3;FM#7x2d zfIMcupqt`9TKX*WK&Q)^$<~8ri+&(Vg{0cUB-9)$GJi5#tL~o9Dc*O3uC>AZZUEiF z9HO>#0IK7>gi>lvC3=wz=3jEbE6?u9R^Iiv*}q=cVCES+s~=#mi4_tJ?%GZ~WvH-} zm|B`1o9F$$IHFQ=2TP z!Rw|9tr~0#FhAWSdVQwbO+bAjda|u2U)sdNi2eWXAvR=b4%LM1dmLl{YXnBKXFIpk zya6`+OhQqjzOvKqh3EI}$jCuQdTEIX3Gtn$nw%2>HIfb}bMiWs$>JosHBNjU7onT_ z!yp4;rnTUHPd&iKG$a_5UnY+^T}isKank}JM_j0gMcIjYG$ENrB8#7ufthfRJhhQ_ zd3|Hp{pOoD{0@4Qdu??*ANz#pX0|n~-J` z7bFyPOBo9|NfWuA+LHIO#aR6UTW!yi@h*={H|e>WB#$A{?B)>>B2*HFls3SfVd;n1#zOqS6E^SFvs`D*(LTa^cKGr-A zUu`=lnIc~?Lt;hoT|@Mkdn78_lC@0vk)ZF4+l%>dFj8vQ=XDx{DuHhi$}!8YOe^ji zn&EBZ?3)$8xjqi6n+I9NtOwL=uo!shTzRTn*>^){xJrP{v`v5EPVQTmkf?s*>=3sN zFD3=d3sS@eLuqoMo9Jb7>LmWWAgU@p&KWW?-*I`T;ic6GIAwg4tU(He zYNL%A$J0ayk&gX$yoOdK3&L$GLdVo*ETxN7C(D9pf#fABGrB>o<3;zYw_Z*ZZ(iJ6 zQd;(N`*+vDoM_~NRGGs4=*;y*MZir*gs zl&+@)qTD9aEc=fCH?zIu zIRldp=ys_4$bcla~DNvz`4R0h2aGsFRle*Oi3AoG=B3| w7h^`omm3u|m^M3l$i+|AtW#n!dT!z|*}qO|^3oC!0i)*?0ua> delta 37 tcmX?np6UKMrVS<%jL$clN*MBNu2TtD*!i_@% diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index adc615837d47ba63f4c9a144b05f2d4ab1296c9b..eee2340f3dc2411be2437b11b8cf8cdb4521e224 100644 GIT binary patch delta 254 zcmeyklyT{D#tkMCjEg3lN_g@+ty?a+7zA5xE|m~u;qTk^@V!iWCRDI-a;?lm z{`lYzX_6~0LB+f$hsr(>xLf>&i`^jNJ47((<7QnsO-BA~#lEZR(e6-{lQ;Xy3or_B zeR;}1*C1RMD#|=LR6&tnDL3x*(>sDtG11Mr3IVz2FGScj}2Ut|9d%4 MPVg|ByuiyE0B|)+kpKVy delta 77 zcmV-T0J8t3rvdS$0kAX}0hp6D7)i617zhNDwj9`#rXAO_l^!7hv(6s}0h8?@8M7WC jCjzrwBd`IpB_-eilN~2g0uE8JA@~=uFvtnBK}fI)b&(uX 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