diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.bin b/src/.gradle/5.4.1/executionHistory/executionHistory.bin index d21e487..dee6d7e 100644 Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.bin and b/src/.gradle/5.4.1/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.lock b/src/.gradle/5.4.1/executionHistory/executionHistory.lock index 539cb4c..e352be9 100644 Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.lock and b/src/.gradle/5.4.1/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.bin b/src/.gradle/5.4.1/fileHashes/fileHashes.bin index 7d27c5d..6cae28c 100644 Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.bin and b/src/.gradle/5.4.1/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.lock b/src/.gradle/5.4.1/fileHashes/fileHashes.lock index 87d8af9..bf2c65a 100644 Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.lock and b/src/.gradle/5.4.1/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/5.4.1/javaCompile/javaCompile.lock b/src/.gradle/5.4.1/javaCompile/javaCompile.lock index 8e46ac7..bfc0489 100644 Binary files a/src/.gradle/5.4.1/javaCompile/javaCompile.lock and b/src/.gradle/5.4.1/javaCompile/javaCompile.lock differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 551f969..10d7b60 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.idea/sonarlint/issuestore/index.pb b/src/.idea/sonarlint/issuestore/index.pb index 01fa589..005a821 100644 --- a/src/.idea/sonarlint/issuestore/index.pb +++ b/src/.idea/sonarlint/issuestore/index.pb @@ -262,4 +262,6 @@ X \ ,app/src/main/res/color/primary_text_dark.xml,d\8\d817b9340a5ced71d122f66b8d29cf7d6dfa79ab ^ -.app/src/main/res/color/secondary_text_dark.xml,3\d\3d0874cd378575c7e6e0973b184f167b3941748f \ No newline at end of file +.app/src/main/res/color/secondary_text_dark.xml,3\d\3d0874cd378575c7e6e0973b184f167b3941748f +_ +/src/net/micode/notes/ui/AlarmAlertActivity.java,c\f\cf72a3860e31e7948ebd76cc8ccf42b8f8ef48e9 \ No newline at end of file diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index 4ff6873..58b80c0 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -6,10 +6,31 @@ - + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + - + - - + + + + + + + + + + + @@ -132,6 +116,8 @@ @@ -147,138 +133,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -431,7 +362,14 @@ @@ -448,7 +386,7 @@ - + @@ -515,20 +453,6 @@ - - - - - - - - - - - - - - @@ -551,8 +475,8 @@ - + @@ -564,27 +488,24 @@ - + - + - + - + - - - - + @@ -597,8 +518,8 @@ - + @@ -610,16 +531,30 @@ - + + + + + - - + + + + + + + + + + + + - + @@ -636,35 +571,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex index c5ea45d..d6764ca 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex differ diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 2db39ae..4f8f91f 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Sep 11 17:55:29 CST 2019 +#Tue Sep 17 08:03:49 CST 2019 base.0=C\:\\Project\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index b302136..4ecc86e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 620035c..ad09824 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index f1092fc..d190552 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index c73d36e..242d729 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index 40640b3..7ad58e5 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 5312fbd..89fd7ef 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex index 93c08f3..fb2b2d5 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex index 772a9ef..5baa5b6 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex index e718373..861bce2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex index ff55520..928205b 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex index 4b393a2..f5e797d 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex index 707db62..cdd16e2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk index 753961c..a3411d0 100644 Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/src/net/micode/notes/ui/AlarmAlertActivity.java b/src/src/net/micode/notes/ui/AlarmAlertActivity.java index 85723be..243e127 100644 --- a/src/src/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/src/net/micode/notes/ui/AlarmAlertActivity.java @@ -39,7 +39,9 @@ import net.micode.notes.tool.DataUtils; import java.io.IOException; - +/* + * + * */ public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { private long mNoteId; private String mSnippet; @@ -48,7 +50,10 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD @Override protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + super.onCreate(savedInstanceState);//重写时调用父类的onCreat方法,否则抛出异常 + /* + * activity启动调用的第一个函数就是onCreate，主要做这个activity启动时一些必要的初始化工作 + * */ requestWindowFeature(Window.FEATURE_NO_TITLE); final Window win = getWindow(); @@ -83,12 +88,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } } + /* + * 该私有方法用于判断手机屏幕是否开启 + * */ private boolean isScreenOn() { PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } + /* + * 该方法用于播放闹钟铃声 + * */ private void playAlarmSound() { + //获取当前手机系统铃声的url Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); int silentModeStreams = Settings.System.getInt(getContentResolver(), @@ -143,6 +155,10 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } } + /* + * 关闭响铃的方法 + * @dialog 对话窗口 + * */ public void onDismiss(DialogInterface dialog) { stopAlarmSound(); finish();