From dbf43d2653fa0d1c77cbcf962e9ba1b0e38fc019 Mon Sep 17 00:00:00 2001
From: GenshinGanyu <1437099831@qq.com>
Date: Fri, 14 Apr 2023 14:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9contact?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dex/debug/mergeDexDebug/classes.dex       | Bin 191548 -> 191548 bytes
 .../tmp/debug/dex-renamer-state.txt           |   4 +--
 .../net/micode/notes/data/Contact.class       | Bin 2970 -> 2970 bytes
 .../out/net/micode/notes/data/Contact.dex     | Bin 2704 -> 2704 bytes
 .../previous-compilation-data.bin             | Bin 13215 -> 13215 bytes
 .../java/net/micode/notes/data/Contact.java   |  29 +++++++++++++-----
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 27757cb89b123b10cb1dcedc84037b62489f73c5..7e1ecf39e5a8444aa2a2c3d11fe01534aa2afaf1 100644
GIT binary patch
delta 100
zcmV-q0Gt23*bBVa3m{}=cnUBxHvlt$30u;t5!654WR2`m)yk{@ToT_NX~uydwIBgf
zmKQ4mfC<qM4oiB6njT4r0|3?$p8)|F7Ke$J0k?^k0#OYJHZ(UeHZe9im+_<mAGZOd
G0y{{6<s(o4

delta 103
zcmV-t0GR*0*bBVa3m{}=cnUBxHvoZuM{w<4F_UFUO36s2n{grOFvvEDYQupbwIBgf
zmKP`jfC<qM4oiB6m>x-p0|3?$p8)|F6^DtI0k?^k0#OYII5T80H!?Su0kZ-YmJtF9
Jw*jOAJ4nxvBF+E+

diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 7afb3f1..e1e5665 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri Mar 31 15:48:56 CST 2023
-base.0=E\:\\AdvancedMiNotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Fri Mar 31 16:49:37 CST 2023
+base.0=D\:\\Android_projects\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
index 393e86542fd59ee28c3bfbd9a928ab318f88688a..4a446db2e17a8d4bff568b3e9fc6011ea0836eb7 100644
GIT binary patch
delta 69
zcmbOwK1+PVIW9|kh8PA%hExV8hI|HRhGGT}hDsn^!{EYD$Kc8^o577?9#CuvkX{a?
U*E4uBY+~?cIL+WQnVoww06Df0Hvj+t

delta 69
zcmbOwK1+PVIW9{(h8PA1hExVehI|GmhGGVHhDsn^!{E$N$Kb*+o57V~9#CuvkX{a?
U*E4u9Y+~?YIL+WanVoww05``FC;$Ke

diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
index 1f9ff810c2a03bd1811b3c30dc578f7901d40750..4a523e4430b864b698cc34c5606b51a8990b3600 100644
GIT binary patch
delta 80
zcmV-W0I&a$6_6DmWMy~?Ff%s*THwh)f@h_*C!KDd$N3UVg26Tk!LWq&u^@~D6DtBL
mH4aO9hngNqhywsR4FMPyv%dta1PC@XH!(IbHaW9%2^|5i{Ti(R

delta 80
zcmV-W0I&a$6_6DmWMy~?Ff%s*A>g4#k_6g`HGNB*QDF$-uZ%DCSJs96u^@~D6DR^I
mH4aO9hnOBohywsR4FMPxv%dta1PC}YWH2`}H#oC%2^|4_G#VNJ

diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index cf780079da1b310d3a40d3ecd1d45e42d666b4cb..9e3f61995e9dd3d601200bacb2351b9b2d0a609a 100644
GIT binary patch
delta 29
kcmbQAK0kc}6SqK_teT;b7x%WeVUA8o=9(>=g}8e)0F@XCk^lez

delta 29
lcmbQAK0kc}6SqLx6}@Si`3HZB8N5;1(-!)7vk-T$1^~SG44D7`

diff --git a/app/src/main/java/net/micode/notes/data/Contact.java b/app/src/main/java/net/micode/notes/data/Contact.java
index 5bd6ac3..b132d43 100644
--- a/app/src/main/java/net/micode/notes/data/Contact.java
+++ b/app/src/main/java/net/micode/notes/data/Contact.java
@@ -36,20 +36,23 @@ public class Contact {
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";
 
-/*判断是否存在映射关系
-* 若不存在，创建并存储在哈希表中
-* 存在，则返回Phonenumber*/
+
+    /**
+     * 判断是否存在映射关系
+     * 若不存在，创建并存储在哈希表中
+     */
     public static String getContact(Context context, String phoneNumber) {
         if (sContactCache == null) {
             sContactCache = new HashMap<String, String>();
         }
-
+        // 查找HashMap中是否已有phoneNumber信息，如果存在则返回phoneNumber信息
         if (sContactCache.containsKey(phoneNumber)) {
             return sContactCache.get(phoneNumber);
         }
-/*
-“+”号
-*/
+
+        /**
+         * 查找数据库中phoneNumber的信息
+         */
         String selection = CALLER_ID_SELECTION.replace("+",
                 PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
         Cursor cursor = context.getContentResolver().query(
@@ -59,12 +62,22 @@ public class Contact {
                 new String[]{phoneNumber},
                 null);
 
+        /**
+         * 判定查询结果，若不为空，moveToFirst()返回第一条；否则返回空
+         */
         if (cursor != null && cursor.moveToFirst()) {
+            /**
+             * 找到相关情况时
+             */
             try {
                 String name = cursor.getString(0);
                 sContactCache.put(phoneNumber, name);
                 return name;
-            } catch (IndexOutOfBoundsException e) {
+            }
+            /**
+             * 异常
+             */
+            catch (IndexOutOfBoundsException e) {
                 Log.e(TAG, " Cursor get string error " + e.toString());
                 return null;
             } finally {