noteslistactivity

This commit is contained in:
ziji Wu 2019-10-08 17:50:38 +08:00
parent 88f0cdbffa
commit ab216006c4
3 changed files with 65 additions and 36 deletions

View File

@ -8,7 +8,8 @@
<component name="ChangeListManager">
<list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -74,11 +75,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-11960">
<caret line="94" column="19" lean-forward="true" selection-start-line="94" selection-start-column="19" selection-end-line="94" selection-end-column="19" />
<state relative-caret-position="-1083">
<caret line="157" column="14" selection-start-line="157" selection-start-column="14" selection-end-line="157" selection-end-column="14" />
</state>
</provider>
</entry>
@ -119,24 +120,32 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-174">
<caret line="358" column="25" selection-start-line="358" selection-start-column="25" selection-end-line="358" selection-end-column="25" />
<state relative-caret-position="-254">
<caret line="354" column="15" selection-start-line="354" selection-start-column="15" selection-end-line="354" selection-end-column="15" />
<folding>
<element signature="e#0#11422#0" expanded="true" />
<element signature="e#9967#9968#0" expanded="true" />
<element signature="e#9998#9999#0" expanded="true" />
<element signature="e#10032#10033#0" expanded="true" />
<element signature="e#10065#10066#0" expanded="true" />
<element signature="e#10640#10641#0" expanded="true" />
<element signature="e#10672#10673#0" expanded="true" />
<element signature="e#10706#10707#0" expanded="true" />
<element signature="e#10740#10741#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1974">
<caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" />
<folding>
<element signature="e#0#5696#0" expanded="true" />
</folding>
</state>
</provider>
@ -164,8 +173,8 @@
<find>increase_folder_count_on_update</find>
<find>createNoteTable</find>
<find>finish</find>
<find>/*</find>
<find>//</find>
<find>/*</find>
</findStrings>
<replaceStrings>
<replace>WRONGNOTEID</replace>
@ -199,8 +208,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/raw-zh-rCN/introduction" />
<option value="$PROJECT_DIR$/app/src/main/res/raw/introduction" />
@ -211,6 +218,8 @@
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" />
</list>
</option>
</component>
@ -811,7 +820,14 @@
<option name="project" value="LOCAL" />
<updated>1570527314775</updated>
</task>
<option name="localTasksCounter" value="23" />
<task id="LOCAL-00023" summary="noteslistactivity">
<created>1570527902675</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1570527902675</updated>
</task>
<option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TodoView">
@ -831,7 +847,7 @@
<window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.49149337" visible="true" weight="0.15281501" />
<window_info id="设计器" order="2" />
<window_info id="Resources Explorer" order="3" weight="0.3297587" />
<window_info id="Structure" order="4" sideWeight="0.5085066" side_tool="true" weight="0.15281501" />
<window_info id="Structure" order="4" sideWeight="0.5085066" side_tool="true" visible="true" weight="0.15281501" />
<window_info id="Build Variants" order="5" sideWeight="0.5085066" side_tool="true" weight="0.15281501" />
<window_info id="Image Layers" order="6" />
<window_info id="Capture Tool" order="7" />
@ -1088,13 +1104,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1581">
<caret line="128" column="26" selection-start-line="128" selection-start-column="26" selection-end-line="128" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/DateTimePicker.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
@ -1194,13 +1203,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-11960">
<caret line="94" column="19" lean-forward="true" selection-start-line="94" selection-start-column="19" selection-end-line="94" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
@ -1236,17 +1238,39 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-174">
<caret line="358" column="25" selection-start-line="358" selection-start-column="25" selection-end-line="358" selection-end-column="25" />
<state relative-caret-position="-254">
<caret line="354" column="15" selection-start-line="354" selection-start-column="15" selection-end-line="354" selection-end-column="15" />
<folding>
<element signature="e#0#11422#0" expanded="true" />
<element signature="e#9967#9968#0" expanded="true" />
<element signature="e#9998#9999#0" expanded="true" />
<element signature="e#10032#10033#0" expanded="true" />
<element signature="e#10065#10066#0" expanded="true" />
<element signature="e#10640#10641#0" expanded="true" />
<element signature="e#10672#10673#0" expanded="true" />
<element signature="e#10706#10707#0" expanded="true" />
<element signature="e#10740#10741#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1974">
<caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" />
<folding>
<element signature="e#0#5696#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1083">
<caret line="157" column="14" selection-start-line="157" selection-start-column="14" selection-end-line="157" selection-end-column="14" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

View File

@ -77,10 +77,12 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
: mSnippet;
} catch (IllegalArgumentException e) {
//捕获异常并输出
e.printStackTrace();
return;
}
//创建新的媒体播放器
mPlayer = new MediaPlayer();
if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
showActionDialog();
@ -90,6 +92,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
}
//私有方法判断屏幕是否亮起
private boolean isScreenOn() {
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
return pm.isScreenOn();

View File

@ -140,6 +140,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private SharedPreferences mSharedPrefs;
private int mFontSizeId;
//记录默认字体大小
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@ -147,6 +148,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public static final String TAG_CHECKED = String.valueOf('\u221A');
public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
//界面线性单元
private LinearLayout mEditTextList;
private String mUserQuery;