first commit

master
unknown 6 years ago
parent df41deb3e6
commit 5a153444fe

@ -39,102 +39,117 @@
<file leaf-file-name="EditActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2169">
<caret line="351" column="28" lean-forward="true" selection-start-line="351" selection-start-column="28" selection-end-line="351" selection-end-column="28" />
<state relative-caret-position="235">
<caret line="276" column="41" selection-start-line="276" selection-start-column="41" selection-end-line="276" selection-end-column="41" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#8225#8687#0" expanded="true" />
<element signature="e#8686#8687#0" expanded="true" />
<element signature="e#2935#2943#0" expanded="true" />
<element signature="e#3008#3016#0" expanded="true" />
<element signature="e#9822#10294#0" expanded="true" />
<element signature="e#10293#10294#0" expanded="true" />
<element signature="e#13886#14158#0" expanded="true" />
<element signature="e#14157#14158#0" expanded="true" />
<element signature="e#15465#15845#0" expanded="true" />
<element signature="e#15844#15845#0" expanded="true" />
<element signature="e#18455#18711#0" expanded="true" />
<element signature="e#18710#18711#0" expanded="true" />
<element signature="e#18770#18971#0" expanded="true" />
<element signature="e#18970#18971#0" expanded="true" />
<element signature="e#19798#20025#0" expanded="true" />
<element signature="e#20024#20025#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AmendActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="132" column="24" selection-start-line="132" selection-start-column="24" selection-end-line="132" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="EditActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-339">
<caret line="412" column="48" selection-start-line="412" selection-start-column="48" selection-end-line="412" selection-end-column="48" />
<state relative-caret-position="98">
<caret line="431" column="40" selection-start-line="431" selection-start-column="40" selection-end-line="431" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4982#5454#0" expanded="true" />
<element signature="e#5453#5454#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="amend_linear_layout.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml">
<file leaf-file-name="MAdapter.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="160" column="8" selection-start-line="160" selection-start-column="8" selection-end-line="160" selection-end-column="8" />
<state relative-caret-position="190">
<caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</entry>
</file>
<file leaf-file-name="MyAdapter.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MyAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="25" column="52" selection-start-line="25" selection-start-column="52" selection-end-line="25" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CommentActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/CommentActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="103" selection-start-line="103" selection-end-line="103" />
<state relative-caret-position="189">
<caret line="123" column="46" selection-start-line="123" selection-start-column="46" selection-end-line="123" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main_linear_layout.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main_linear_layout.xml">
<file leaf-file-name="AmendActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
<state relative-caret-position="-19">
<caret line="230" column="19" lean-forward="true" selection-start-line="230" selection-start-column="19" selection-end-line="230" selection-end-column="19" />
<folding>
<element signature="e#1172#1200#0" expanded="true" />
<element signature="imports" expanded="true" />
<element signature="e#16275#16276#0" expanded="true" />
<element signature="e#16304#16305#0" expanded="true" />
</folding>
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="MyDB.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/MyDB.java">
<file leaf-file-name="amend_linear_layout.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-76">
<caret line="10" column="60" selection-start-line="10" selection-start-column="60" selection-end-line="10" selection-end-column="60" />
<state relative-caret-position="665">
<caret line="77" column="8" selection-start-line="77" selection-start-column="8" selection-end-line="77" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Record.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Record.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="55" column="17" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
</state>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="list_item.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml">
<file leaf-file-name="Comment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Comment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" />
<state relative-caret-position="-16">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="115" column="72" selection-start-line="115" selection-start-column="72" selection-end-line="115" selection-end-column="72" />
<state relative-caret-position="247">
<caret line="106" column="10" selection-start-line="106" selection-start-column="10" selection-end-line="106" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -142,15 +157,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="BaseActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/BaseActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -2439,16 +2445,16 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/RecordActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/record.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Record.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/MyDB.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Record.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java" />
</list>
</option>
</component>
@ -2463,18 +2469,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="v" type="1abcf292:AndroidViewProjectNode" />
<item name="v" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -2631,6 +2625,18 @@
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="v" type="1abcf292:AndroidViewProjectNode" />
<item name="v" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -2640,10 +2646,9 @@
<property name="settings.editor.selected.configurable" value="http.proxy" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\res\layout" />
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\java\com\example\cici\memoire" />
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\res\layout1" />
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\res" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.example.cici.memoire" />
@ -2651,9 +2656,10 @@
<recent name="com.example.cici.utils" />
<recent name="com.example.cici.voice" />
</key>
<key name="MoveFile.RECENT_KEYS">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\res\layout" />
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\res" />
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\java\com\example\cici\memoire" />
<recent name="C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\res\layout1" />
</key>
</component>
<component name="RunDashboard">
@ -2797,11 +2803,11 @@
<window_info anchor="bottom" id="Android Profiler" order="7" weight="0.32905984" />
<window_info id="Build Variants" order="2" side_tool="true" />
<window_info anchor="bottom" id="DB Execution Console" order="7" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5013405" side_tool="true" visible="true" weight="0.32905984" />
<window_info anchor="bottom" id="Logcat" order="7" weight="0.32905984" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" anchor="bottom" id="Build" order="7" visible="true" weight="0.32905984" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49865952" visible="true" weight="0.32905984" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Device File Explorer" order="3" sideWeight="0.50318474" side_tool="true" weight="0.3297587" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
@ -2811,16 +2817,16 @@
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="right" id="Preview" order="4" sideWeight="0.4968153" weight="0.3297587" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32905984" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Captures" order="2" weight="0.25" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="right" id="Gradle" order="3" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@ -2874,13 +2880,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/memoirs.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/utils/DateFormatType.java">
<provider selected="true" editor-type-id="text-editor">
@ -2947,13 +2946,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/RegisterActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="306" column="7" lean-forward="true" selection-start-line="306" selection-start-column="7" selection-end-line="306" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/CommentAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="836">
@ -2961,13 +2953,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Comment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state />
@ -2980,22 +2965,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Memoire.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#348#349#0" expanded="true" />
<element signature="e#380#381#0" expanded="true" />
<element signature="e#662#663#0" expanded="true" />
<element signature="e#694#695#0" expanded="true" />
<element signature="e#822#823#0" expanded="true" />
<element signature="e#854#855#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Memoire.java" />
<entry file="jar://D:/sdk/platforms/android-27/android.jar!/java/lang/Thread.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2873">
@ -3020,50 +2990,8 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/RecordActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="103" column="28" selection-start-line="103" selection-start-column="28" selection-end-line="103" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MEdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="26" selection-start-line="26" selection-end-line="29" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MyAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="30" selection-start-line="30" selection-end-line="33" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-187">
<caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Post.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/RecordActivity.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MEdapter.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state />
@ -3089,16 +3017,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="358">
<caret line="51" column="74" selection-start-line="51" selection-start-column="74" selection-end-line="51" selection-end-column="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/layout_edit.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
@ -3124,126 +3042,195 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="159">
<caret line="60" column="44" selection-start-line="57" selection-start-column="3" selection-end-line="60" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3848#5306#0" expanded="true" />
<element signature="e#5305#5306#0" expanded="true" />
</folding>
<state relative-caret-position="399">
<caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main_linear_layout.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="988">
<caret line="134" column="20" selection-start-line="134" selection-start-column="20" selection-end-line="134" selection-end-column="20" />
<state>
<caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/RegisterActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="196" column="45" selection-start-line="196" selection-start-column="45" selection-end-line="196" selection-end-column="45" />
<state relative-caret-position="5073">
<caret line="306" column="66" selection-start-line="306" selection-start-column="66" selection-end-line="306" selection-end-column="66" />
</state>
</provider>
<provider editor-type-id="android-designer2">
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/MyDB.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/BaseActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="57" column="72" selection-start-line="57" selection-start-column="72" selection-end-line="57" selection-end-column="72" />
</state>
</provider>
<provider editor-type-id="android-manifest">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" />
<state relative-caret-position="76">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="49">
<caret line="85" column="6" selection-start-line="85" selection-start-column="6" selection-end-line="95" selection-end-column="19" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main_linear_layout.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Post.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
<state relative-caret-position="190">
<caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
<folding>
<element signature="e#1172#1200#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Record.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="55" column="17" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
<caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1266#1267#0" expanded="true" />
<element signature="e#1294#1295#0" expanded="true" />
<element signature="e#1342#1343#0" expanded="true" />
<element signature="e#1376#1377#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/MyDB.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-76">
<caret line="10" column="60" selection-start-line="10" selection-start-column="60" selection-end-line="10" selection-end-column="60" />
<state relative-caret-position="98">
<caret line="431" column="40" selection-start-line="431" selection-start-column="40" selection-end-line="431" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/BaseActivity.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Comment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<state relative-caret-position="-16">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="115" column="72" selection-start-line="115" selection-start-column="72" selection-end-line="115" selection-end-column="72" />
<state relative-caret-position="247">
<caret line="106" column="10" selection-start-line="106" selection-start-column="10" selection-end-line="106" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="132" column="24" selection-start-line="132" selection-start-column="24" selection-end-line="132" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/CommentActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="103" selection-start-line="103" selection-end-line="103" />
<state relative-caret-position="189">
<caret line="123" column="46" selection-start-line="123" selection-start-column="46" selection-end-line="123" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MyAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-339">
<caret line="412" column="48" selection-start-line="412" selection-start-column="48" selection-end-line="412" selection-end-column="48" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4982#5454#0" expanded="true" />
<element signature="e#5453#5454#0" expanded="true" />
</folding>
<state relative-caret-position="152">
<caret line="25" column="52" selection-start-line="25" selection-start-column="52" selection-end-line="25" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/adapter/MAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="160" column="8" selection-start-line="160" selection-start-column="8" selection-end-line="160" selection-end-column="8" />
<state relative-caret-position="665">
<caret line="77" column="8" selection-start-line="77" selection-start-column="8" selection-end-line="77" selection-end-column="8" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-19">
<caret line="230" column="19" lean-forward="true" selection-start-line="230" selection-start-column="19" selection-end-line="230" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#16275#16276#0" expanded="true" />
<element signature="e#16304#16305#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2169">
<caret line="351" column="28" lean-forward="true" selection-start-line="351" selection-start-column="28" selection-end-line="351" selection-end-column="28" />
<state relative-caret-position="235">
<caret line="276" column="41" selection-start-line="276" selection-start-column="41" selection-end-line="276" selection-end-column="41" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#8225#8687#0" expanded="true" />
<element signature="e#8686#8687#0" expanded="true" />
<element signature="e#2935#2943#0" expanded="true" />
<element signature="e#3008#3016#0" expanded="true" />
<element signature="e#9822#10294#0" expanded="true" />
<element signature="e#10293#10294#0" expanded="true" />
<element signature="e#13886#14158#0" expanded="true" />
<element signature="e#14157#14158#0" expanded="true" />
<element signature="e#15465#15845#0" expanded="true" />
<element signature="e#15844#15845#0" expanded="true" />
<element signature="e#18455#18711#0" expanded="true" />
<element signature="e#18710#18711#0" expanded="true" />
<element signature="e#18770#18971#0" expanded="true" />
<element signature="e#18970#18971#0" expanded="true" />
<element signature="e#19798#20025#0" expanded="true" />
<element signature="e#20024#20025#0" expanded="true" />
</folding>
</state>
</provider>

@ -1,4 +1,4 @@
#Sun Jan 13 21:00:27 CST 2019
#Mon Jan 14 18:17:07 CST 2019
C\:\\Users\\cici\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-27.1.1.aar\\7bd18af0ecc63420c6c9e4912da6757b\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\cici\\Desktop\\dingguaguademo\\database\\v\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
C\:\\Users\\cici\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-27.1.1.aar\\7bd18af0ecc63420c6c9e4912da6757b\\res\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\Users\\cici\\Desktop\\dingguaguademo\\database\\v\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_black_16dp.png.flat
C\:\\Users\\cici\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-27.1.1.aar\\7bd18af0ecc63420c6c9e4912da6757b\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png=C\:\\Users\\cici\\Desktop\\dingguaguademo\\database\\v\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat

@ -58,12 +58,12 @@
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity android:name="com.example.cici.voice.CommentActivity" />
<activity android:name="com.example.cici.voice.EditActivity" />
<activity android:name="com.example.cici.voice.ResPwdActivity" />
<activity android:name="com.example.cici.voice.EditActivity" />
<activity android:name="com.example.cici.voice.MainActivity" />
<activity android:name="com.example.cici.voice.RegisterActivity" />
<activity android:name="com.example.cici.memoire.AmendActivity" />
<activity android:name="com.example.cici.memoire.BaseActivity" />
<activity android:name="com.example.cici.memoire.AmendActivity" />
<activity android:name="com.example.cici.memoire.EditActivity" />
<meta-data

@ -1 +1 @@
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","MAIN_SPLIT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","SUB_PROJECTS","PROJECT","MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true}]

@ -157,14 +157,14 @@ activity#com.example.cici.voice.CommentActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:52:9-75
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:52:19-72
activity#com.example.cici.voice.EditActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:53:9-72
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:53:19-69
activity#com.example.cici.voice.ResPwdActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:54:9-73
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:53:9-73
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:53:19-71
activity#com.example.cici.voice.EditActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:54:9-81
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:54:19-71
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:54:19-69
activity#com.example.cici.voice.MainActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:55:9-81
android:name
@ -173,14 +173,14 @@ activity#com.example.cici.voice.RegisterActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:56:9-85
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:56:19-73
activity#com.example.cici.memoire.AmendActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:57:9-84
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:57:19-72
activity#com.example.cici.memoire.BaseActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:58:9-83
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:57:9-83
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:57:19-71
activity#com.example.cici.memoire.AmendActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:58:9-84
android:name
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:58:19-71
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:58:19-72
activity#com.example.cici.memoire.EditActivity
ADDED from C:\Users\cici\Desktop\dingguaguademo\database\v\app\src\main\AndroidManifest.xml:59:9-83
android:name

@ -50,12 +50,12 @@
android:windowSoftInputMode="stateHidden|adjustResize"/>
<activity android:name="com.example.cici.voice.CommentActivity" />
<activity android:name="com.example.cici.voice.EditActivity" />
<activity android:name="com.example.cici.voice.ResPwdActivity"/>
<activity android:name="com.example.cici.voice.EditActivity"></activity>
<activity android:name="com.example.cici.voice.MainActivity"></activity>
<activity android:name="com.example.cici.voice.RegisterActivity"></activity>
<activity android:name="com.example.cici.memoire.AmendActivity"></activity>
<activity android:name="com.example.cici.memoire.BaseActivity"></activity>
<activity android:name="com.example.cici.memoire.AmendActivity"></activity>
<activity android:name="com.example.cici.memoire.EditActivity"></activity>
<meta-data android:name="Mob-AppKey" android:value="299f659dde262"/>

@ -1,38 +0,0 @@
package com.example.cici.bean;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
public class MyDB extends SQLiteOpenHelper {
public final static String TABLE_NAME_RECORD = "record";
public final static String RECORD_ID = "_id";
public final static String RECORD_TITLE = "title_name";
public final static String RECORD_BODY = "text_body";
public final static String RECORD_TIME = "create_time";
public final static String NOTICE_TIME ="notice_time";
public final static String RECORD_VOICEURL = "voice_url";
public MyDB(Context context) {
super(context, "21.db", null, 1);
}
@Override
public void onCreate(SQLiteDatabase db) {
db.execSQL("CREATE TABLE "+TABLE_NAME_RECORD+" ("+RECORD_ID+" INTEGER PRIMARY KEY AUTOINCREMENT," +
RECORD_TITLE+" VARCHAR(30)," +
RECORD_BODY+" TEXT," +
RECORD_TIME+" DATETIME NOT NULL," +
RECORD_VOICEURL+" VARCHAR(30)," +
NOTICE_TIME+" DATETIME)");
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
}
}

@ -1,12 +1,17 @@
package com.example.cici.bean;
public class Record {
import java.util.List;
import cn.bmob.v3.BmobObject;
public class Record extends BmobObject {
private Integer id;
private String titleName;
private String textBody;
private String createTime;
private String noticeTime;
private String voiceurl;
private List<String> voice;
public Integer getId() {
return id;
@ -51,17 +56,12 @@ public class Record {
public void setVoiceurl(String voiceurl) { this.voiceurl = voiceurl; }
@Override
public String toString() {
return "Record{" +
"id=" + id +
", titleName='" + titleName + '\'' +
", textBody='" + textBody + '\'' +
", createTime='" + createTime + '\'' +
", noticeTime='" + noticeTime + '\'' +
",voiceulr='"+voiceurl+'\''+
'}';
}
public List<String> getVoice() {
return voice;
}
public void setVoice(List<String> voice) {
this.voice = voice;
}
}

@ -1,10 +1,9 @@
package com.example.cici.memoire;
import android.annotation.SuppressLint;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
import android.media.MediaPlayer;
import android.media.MediaRecorder;
import android.os.Bundle;
@ -15,9 +14,10 @@ import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@ -28,29 +28,37 @@ import java.io.FileOutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import com.example.cici.adapter.MAdapter;
import com.example.cici.bean.MyDB;
import com.example.cici.bean.Record;
import com.example.cici.voice.R;
public class AmendActivity extends BaseActivity implements View.OnClickListener{
import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.UpdateListener;
public class AmendActivity extends BaseActivity implements View.OnClickListener,AdapterView.OnItemClickListener {
private final static String TAG = "AmendActivity";
MyDB myDB;
private Record record=new Record();
private Button btnSave;
private Button btnBack;
private TextView amendTime;
private TextView amendTitle;
private EditText amendBody;
private Record record;
private AlertDialog.Builder dialog;
private String obj;
private String getpath;
private Button btnUpcoming;
private Button btnNotice;
private MediaPlayer mPlayer = null;// 播放器
private String path = "";
private String fileName = null;
private long limitTime = 0;// 录音文件最短事件1秒
private Button startRecord;
private MediaRecorder mRecorder = null;// 录音器
private boolean isPause = false;// 当前录音是否处于暂停状态
@ -60,25 +68,21 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
private Timer timer;
private String playFileName = null;// 选中的播放文件
// 相关变量
private int second = 0;
private int minute = 0;
private int hour = 0;
private int s = 0;
private int m= 0;
private int h = 0;
private TextView stopRecord;
private TextView time;// 计时显示
private MAdapter mAdapter;
private TextView playRecord;
private MediaPlayer mPlayer = null;// 播放器
private String path = "";
private String fileName = null;
private long limitTime = 0;// 录音文件最短事件1秒
private View whichSelecte = null;// 记录被选中的Item
private ListView mListView;// 音频文件列表
private ArrayList<String> voiceList = new ArrayList<>();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.amend_linear_layout);
path = Environment.getExternalStorageDirectory().getAbsolutePath()
+ "/Anhry/" + getPackageName() + "/Record";
init();
}
@ -88,6 +92,8 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
public void onClick(View v) {
String body;
body = amendBody.getText().toString();
path = Environment.getExternalStorageDirectory().getAbsolutePath()
+ "/Anhry/" + getPackageName() + "/Record";
switch (v.getId()){
case R.id.button_save:
if (updateFunction(body)){
@ -139,13 +145,96 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
//当返回按键被按下
if (!isShowIng()){
showDialog(amendBody.getText().toString());
clearDialog();
}
}
return false;
}
/*
*
*/
@SuppressLint("SetTextI18n")
void init(){
btnBack = findViewById(R.id.button_back);
btnSave = findViewById(R.id.button_save);
amendTitle = findViewById(R.id.amend_title);
amendBody = findViewById(R.id.amend_body);
amendTime = findViewById(R.id.amend_title_time);
playRecord=findViewById(R.id.amend_playRecord);
stopRecord=findViewById(R.id.amend_stopRecord);
startRecord=findViewById(R.id.btn_amend_menu_startRecord);
btnNotice = findViewById(R.id.btn_amend_menu_notice);
time=findViewById(R.id.amend_time);
mListView = (ListView) findViewById(R.id.listview);
mAdapter = new MAdapter(this, list);
mListView.setAdapter(mAdapter);
mListView.setOnItemClickListener(this);
btnSave.setOnClickListener(this);
btnBack.setOnClickListener(this);
startRecord.setOnClickListener(this);
stopRecord.setOnClickListener(this);
playRecord.setOnClickListener(this);
btnNotice.setOnClickListener(this);
Intent intent = this.getIntent();
if (intent!=null){
amendTitle.setText(intent.getStringExtra("titleName"));
String str="";
if (intent.getStringExtra("noticeTime")!=null){
str = " 提醒时间:"+intent.getStringExtra("noticeTime");
}
amendTime.setText(intent.getStringExtra("createTime")+str);
amendBody.setText(intent.getStringExtra("textBody"));
getpath=intent.getStringExtra("voiceurl");
obj=intent.getStringExtra("obj");
voiceList=intent.getStringArrayListExtra("voice");
initVoice(voiceList);
//playRecord.setText(getpath);
record.setObjectId(obj);
}
}
/*
*/
public void initVoice(List<String> voiceList) {
if (voiceList.size() > 0) {
ArrayList<String> voicelist= new ArrayList<>();
for (int j = 0; j < voiceList.size(); j++) {
list.add(voiceList.get(j));
mAdapter.notifyDataSetChanged();
}
}
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
// 列表文件的选中效果
if (whichSelecte != null) {
whichSelecte
.setBackgroundColor(getResources().getColor(R.color.no));
}
view.setBackgroundColor(getResources().getColor(R.color.yes));
// 要播放文件的路径
playFileName = path + "/" + list.get(position);
whichSelecte = view;
time.setText(list.get(position));
}
private void playRecord() {
// 对按钮的可点击事件的控制是保证不出现空指针的重点!!
startRecord.setEnabled(false);
//delete.setEnabled(false);
//stopPlay.setEnabled(true);
//startPlay.setEnabled(false);
//pausePlay.setEnabled(true);
if (mPlayer != null) {
mPlayer.release();
mPlayer = null;
@ -160,10 +249,7 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
mPlayer.release();
mPlayer = null;
startRecord.setEnabled(true);
// startPlay.setEnabled(true);
// stopPlay.setEnabled(false);
//delete.setEnabled(true);
//pausePlay.setEnabled(false);
}
});
try {
@ -179,9 +265,7 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
mPlayer = null;
}
Toast.makeText(this, "播放失败,可返回重试!", Toast.LENGTH_LONG).show();
// stopPlay.setEnabled(false);
//delete.setEnabled(true);
//pausePlay.setEnabled(false);
}
}
private boolean limitTime() {
@ -246,9 +330,9 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
e.printStackTrace();
}
// 录音结束 、时间归零
minute= 0;
hour= 0;
second= 0;
m = 0;
h = 0;
s = 0;
}
// 不管合成是否成功、删除录音片段
for (int i = 0; i < mList.size(); i++) {
@ -324,8 +408,8 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
@Override
public void handleMessage(Message msg) {
time.setText("您本次的录音时长为: "
+ String.format("%1$02d:%2$02d:%3$02d", hour, minute,
second));
+ String.format("%1$02d:%2$02d:%3$02d", h, m,
s));
super.handleMessage(msg);
}
};
@ -336,13 +420,13 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
@Override
public void run() {
second++;
if (second>= 60) {
second= 0;
minute++;
if (minute >= 60) {
minute = 0;
hour++;
s++;
if (s >= 60) {
s= 0;
m++;
if (m >= 60) {
m = 0;
h++;
}
}
handler.sendEmptyMessage(1);
@ -360,65 +444,6 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
String time = formatter.format(curDate);
return time;
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
//当返回按键被按下
if (!isShowIng()){
showDialog(amendBody.getText().toString());
clearDialog();
}
}
return false;
}
/*
*
*/
@SuppressLint("SetTextI18n")
void init(){
myDB = new MyDB(this);
btnBack = findViewById(R.id.button_back);
btnSave = findViewById(R.id.button_save);
amendTitle = findViewById(R.id.amend_title);
amendBody = findViewById(R.id.amend_body);
amendTime = findViewById(R.id.amend_title_time);
startRecord=findViewById(R.id.btn_amend_menu_startRecord);
stopRecord=findViewById(R.id.amend_stopRecord);
playRecord=findViewById(R.id.amend_playRecord);
time=findViewById(R.id.amend_time);
btnNotice = findViewById(R.id.btn_amend_menu_notice);
btnSave.setOnClickListener(this);
btnBack.setOnClickListener(this);
btnNotice.setOnClickListener(this);
btnUpcoming.setOnClickListener(this);
startRecord.setOnClickListener(this);
stopRecord.setOnClickListener(this);
playRecord.setOnClickListener(this);
Intent intent = this.getIntent();
if (intent!=null){
record = new Record();
record.setId(Integer.valueOf(intent.getStringExtra(MyDB.RECORD_ID)));
record.setTitleName(intent.getStringExtra(MyDB.RECORD_TITLE));
record.setTextBody(intent.getStringExtra(MyDB.RECORD_BODY));
record.setCreateTime(intent.getStringExtra(MyDB.RECORD_TIME));
record.setNoticeTime(intent.getStringExtra(MyDB.NOTICE_TIME));
record.setVoiceurl(intent.getStringExtra(MyDB.RECORD_VOICEURL));
amendTitle.setText(record.getTitleName());
String str="";
if (record.getNoticeTime()!=null){
str = " 提醒时间:"+record.getNoticeTime();
}
amendTime.setText(record.getCreateTime()+str);
amendBody.setText(record.getTextBody());
}
}
/*
*
@ -434,8 +459,6 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
*/
boolean updateFunction(String body){
SQLiteDatabase db;
ContentValues values;
boolean flag = true;
if (body.length()>200){
@ -444,15 +467,17 @@ public class AmendActivity extends BaseActivity implements View.OnClickListener{
}
if(flag){
// update
db = myDB.getWritableDatabase();
values = new ContentValues();
values.put(MyDB.RECORD_BODY,body);
values.put(MyDB.RECORD_TIME,getNowTime());
values.put(MyDB.RECORD_VOICEURL,path);
db.update(MyDB.TABLE_NAME_RECORD,values,MyDB.RECORD_ID +"=?",
new String[]{record.getId().toString()});
Record record=new Record();
record.setTextBody(body);
record.setCreateTime(getNowTime());
record.update(record.getObjectId(), new UpdateListener() {
@Override
public void done(BmobException e) {
}
});
Toast.makeText(this,"修改成功",Toast.LENGTH_SHORT).show();
db.close();
}
return flag;
}

@ -2,12 +2,9 @@ package com.example.cici.memoire;
import android.annotation.SuppressLint;
import android.app.DatePickerDialog;
import android.app.ProgressDialog;
import android.app.TimePickerDialog;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
import android.icu.util.Calendar;
import android.media.MediaPlayer;
import android.media.MediaRecorder;
@ -21,9 +18,11 @@ import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.TimePicker;
import android.widget.Toast;
@ -32,7 +31,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@ -40,21 +38,23 @@ import java.util.Timer;
import java.util.TimerTask;
import com.example.cici.adapter.MAdapter;
import com.example.cici.bean.MyDB;
import com.example.cici.bean.Record;
import com.example.cici.utils.DateFormatType;
import com.example.cici.utils.MyFormat;
import com.example.cici.utils.MyTimeGetter;
import com.example.cici.voice.R;
import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.SaveListener;
import static com.example.cici.utils.MyFormat.*;
@RequiresApi(api = Build.VERSION_CODES.N)
public class EditActivity extends BaseActivity implements View.OnClickListener,
DatePickerDialog.OnDateSetListener,
TimePickerDialog.OnTimeSetListener{
TimePickerDialog.OnTimeSetListener,AdapterView.OnItemClickListener {
private final static String TAG = "EditActivity";
MyDB myDB;
private Button btnSave;
private Button btnBack;
private TextView editTime;
@ -77,6 +77,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
private boolean timeSetTag;
MyTimeGetter myTimeGetter;
private ListView mListView;// 音频文件列表
private MediaPlayer mPlayer = null;// 播放器
private String path = "";
private String fileName = null;
@ -97,6 +98,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
private TextView time;// 计时显示
private MAdapter mAdapter;
private TextView playRecord;
private View whichSelecte = null;// 记录被选中的Item
@Override
@ -113,7 +115,6 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
*/
void init(){
mAdapter = new MAdapter(this, list);
myDB = new MyDB(this);
btnBack = findViewById(R.id.button_back);
btnSave = findViewById(R.id.button_save);
editTitle = findViewById(R.id.edit_title);
@ -136,6 +137,10 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
startRecord.setOnClickListener(this);
stopRecord.setOnClickListener(this);
playRecord.setOnClickListener(this);
mListView = (ListView) findViewById(R.id.listview);
mAdapter = new MAdapter(this, list);
mListView.setAdapter(mAdapter);
mListView.setOnItemClickListener(this);
Date date = new Date(System.currentTimeMillis());
createDate = myDateFormat(date,DateFormatType.NORMAL_TIME);
@ -187,6 +192,8 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
String body;
title = editTitle.getText().toString();
body = editBody.getText().toString();
path = Environment.getExternalStorageDirectory().getAbsolutePath()
+ "/Anhry/" + getPackageName() + "/Record";
switch (v.getId()){
case R.id.button_save:
if (saveFunction(title,body,createDate)){
@ -227,6 +234,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
if (isPause) {
// 完成录音
stopRecord();
playRecord.setVisibility(View.VISIBLE);
} else {
// 暂停录音
try {
@ -245,16 +253,32 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
default:
break;
}
path = Environment.getExternalStorageDirectory().getAbsolutePath()
+ "/Anhry/" + getPackageName() + "/Record";
}
/*
*/
@Override
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
// 屏蔽点击事件的一种方式
// 列表文件的选中效果
if (whichSelecte != null) {
whichSelecte
.setBackgroundColor(getResources().getColor(R.color.no));
}
view.setBackgroundColor(getResources().getColor(R.color.yes));
// 要播放文件的路径
playFileName = path + "/" + list.get(position);
whichSelecte = view;
time.setText(list.get(position));
}
private void playRecord() {
// 对按钮的可点击事件的控制是保证不出现空指针的重点!!
startRecord.setEnabled(false);
// startRecord.setEnabled(false);
//delete.setEnabled(false);
//stopPlay.setEnabled(true);
//startPlay.setEnabled(false);
@ -272,7 +296,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
// 播放完毕改变状态,释放资源
mPlayer.release();
mPlayer = null;
startRecord.setEnabled(true);
//startRecord.setEnabled(true);
// startPlay.setEnabled(true);
// stopPlay.setEnabled(false);
//delete.setEnabled(true);
@ -346,6 +370,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
}
}
list.add(fileName1);
//playRecord.setText(fileName1);
mAdapter.notifyDataSetChanged();
} catch (Exception e) {
// 这里捕获流的IO异常万一系统错误需要提示用户
@ -380,7 +405,6 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
Toast.makeText(this, "录音时间长度不得低于1秒钟", Toast.LENGTH_SHORT).show();
return ;
}
stopRecord.setEnabled(true);
mRecorder.stop();
mRecorder.release();
timer.cancel();
@ -396,8 +420,6 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
private void startRecord() {
stopRecord.setText("暂停录音");
startRecord.setText("录音中...");
startRecord.setEnabled(false);
stopRecord.setEnabled(true);
if (!isPause) {
// 新录音清空列表
mList.clear();
@ -419,8 +441,6 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
} catch (Exception e) {
// 若录音器启动失败就需要重启应用,屏蔽掉按钮的点击事件。 否则会出现各种异常。
Toast.makeText(this, "录音器启动失败,请返回重试!", Toast.LENGTH_LONG).show();
startRecord.setEnabled(false);
stopRecord.setEnabled(false);
mRecorder.release();
mRecorder = null;
this.finish();
@ -505,32 +525,37 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
flag = false;
}
if(flag){
SQLiteDatabase db;
ContentValues values;
if(flag) {
// 存储备忘录信息
db = myDB.getWritableDatabase();
values = new ContentValues();
values.put(MyDB.RECORD_TITLE,title);
values.put(MyDB.RECORD_BODY,body);
values.put(MyDB.RECORD_TIME,createDate);
values.put(MyDB.RECORD_VOICEURL,path);
if (timeSetTag){
Record record = new Record();
record.setTitleName(title);
record.setCreateTime(createDate);
record.setTextBody(body);
record.setVoiceurl(fileName);
record.setVoice(list);
if (timeSetTag) {
// 为当前备忘录添加提醒
DatePicker datePicker = dialogDate.getDatePicker();
String str = datePicker.getYear()+"-"+
(datePicker.getMonth()+1)+"-"+
datePicker.getDayOfMonth()+" "+
MyFormat.timeFormat(hour,minute);
values.put(MyDB.NOTICE_TIME,str);
String str = datePicker.getYear() + "-" +
(datePicker.getMonth() + 1) + "-" +
datePicker.getDayOfMonth() + " " +
MyFormat.timeFormat(hour, minute);
record.setNoticeTime(str);
}
db.insert(MyDB.TABLE_NAME_RECORD,null,values);
Toast.makeText(this,"保存成功",Toast.LENGTH_SHORT).show();
db.close();
record.save(new SaveListener<String>() {
@Override
public void done(String s, BmobException e) {
}
});
Toast.makeText(this, "保存成功", Toast.LENGTH_SHORT).show();
}
return flag;
}
/*
*
* @param title

@ -5,8 +5,6 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@ -23,11 +21,16 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.example.cici.bean.MyDB;
import com.example.cici.bean.Record;
import com.example.cici.utils.DateFormatType;
import com.example.cici.voice.R;
import cn.bmob.v3.BmobQuery;
import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.FindListener;
import cn.bmob.v3.listener.UpdateListener;
import static com.example.cici.utils.MyFormat.*;
public class MainActivity extends BaseActivity implements View.OnClickListener,
@ -35,10 +38,10 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
private final static String TAG = "MainActivity";
MyDB myDB;
private ListView myListView;
private Button createButton;
private MyBaseAdapter myBaseAdapter;
private List<Record> recordList;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -53,37 +56,24 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
createButton.setOnClickListener(this);
myListView = findViewById(R.id.list_view);
recordList = new ArrayList<>();
BmobQuery<Record> query = new BmobQuery<>();
query.order("-createdAt");
query.setLimit(20);
query.findObjects(new FindListener<Record>() {
@Override
public void done(List<Record> lists, BmobException e) {
if (e == null) {
recordList=lists;
myBaseAdapter.addRecord(recordList);
myBaseAdapter.notifyDataSetChanged();
}
List<Record> recordList = new ArrayList<>();
myDB = new MyDB(this);
SQLiteDatabase db = myDB.getReadableDatabase();
Cursor cursor = db.query(MyDB.TABLE_NAME_RECORD,null,
null,null,null,
null,MyDB.NOTICE_TIME+","+MyDB.RECORD_TIME+" DESC");
if(cursor.moveToFirst()){
Record record;
while (!cursor.isAfterLast()){
record = new Record();
record.setId(
Integer.valueOf(cursor.getString(cursor.getColumnIndex(MyDB.RECORD_ID))));
record.setTitleName(
cursor.getString(cursor.getColumnIndex(MyDB.RECORD_TITLE))
);
record.setTextBody(
cursor.getString(cursor.getColumnIndex(MyDB.RECORD_BODY))
);
record.setCreateTime(
cursor.getString(cursor.getColumnIndex(MyDB.RECORD_TIME)));
record.setNoticeTime(
cursor.getString(cursor.getColumnIndex(MyDB.NOTICE_TIME)));
record.setVoiceurl(
cursor.getString(cursor.getColumnIndex(MyDB.RECORD_VOICEURL)));
recordList.add(record);
cursor.moveToNext();
}
}
cursor.close();
db.close();
});
// 创建一个Adapter的实例
myBaseAdapter = new MyBaseAdapter(this,recordList,R.layout.list_item);
myListView.setAdapter(myBaseAdapter);
@ -109,14 +99,16 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Intent intent = new Intent(MainActivity.this,AmendActivity.class);
Record record = (Record) myListView.getItemAtPosition(position);
intent.putExtra(MyDB.RECORD_TITLE,record.getTitleName().trim());
intent.putExtra(MyDB.RECORD_BODY,record.getTextBody().trim());
intent.putExtra(MyDB.RECORD_TIME,record.getCreateTime().trim());
intent.putExtra(MyDB.RECORD_ID,record.getId().toString().trim());
intent.putExtra(MyDB.RECORD_VOICEURL,record.getVoiceurl().toString().trim());
intent.putExtra("titleName",record.getTitleName().trim());
intent.putExtra("textBody",record.getTextBody().trim());
intent.putExtra("createTime",record.getCreateTime().trim());
intent.putExtra("id",record.toString().trim());
intent.putExtra("voiceurl",record.getVoiceurl().trim());
intent.putStringArrayListExtra("voice",(ArrayList<String>)record.getVoice());
if (record.getNoticeTime()!=null) {
intent.putExtra(MyDB.NOTICE_TIME, record.getNoticeTime().trim());
intent.putExtra("noticeTime", record.getNoticeTime().trim());
}
intent.putExtra("obj",record.getObjectId());
this.startActivity(intent);
MainActivity.this.finish();
}
@ -140,18 +132,25 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
SQLiteDatabase db = myDB.getWritableDatabase();
db.delete(MyDB.TABLE_NAME_RECORD,
MyDB.RECORD_ID +"=?",
new String[]{String.valueOf(record.getId())});
db.close();
myBaseAdapter.removeItem(position);
myListView.post(new Runnable() {
record.setObjectId(record.getObjectId());
record.delete(new UpdateListener() {
@Override
public void run() {
myBaseAdapter.notifyDataSetChanged();
public void done(BmobException e) {
if (e == null) {
} else {
}
}
});
myBaseAdapter.removeItem(position);
myListView.post(new Runnable() {
@Override
public void run() {
myBaseAdapter.notifyDataSetChanged();
}
});
}
});
dialog.setNegativeButton("取消",
@ -179,6 +178,10 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
this.layoutId = layoutId;
}
public void addRecord(List<Record> list) {
this.recordList = list;
}
@Override
public int getCount() {
if (recordList!=null&&recordList.size()>0)

@ -38,7 +38,6 @@
android:id="@+id/amend_time_lay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/listview"
android:layout_alignParentStart="true"
android:layout_marginBottom="-20dp"
android:orientation="vertical">
@ -61,33 +60,33 @@
android:hint="@string/edit_body_hint"
android:textSize="12sp" />
<TextView
android:id="@+id/amend_playRecord"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_below="@id/amend_body"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="31dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="42dp"
android:layout_marginEnd="45dp"
android:layout_marginBottom="20dp" />
<TextView
android:id="@+id/amend_time"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_below="@id/amend_playRecord"
android:layout_below="@id/amend_body"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="57dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="25dp"
android:layout_marginTop="21dp"
android:layout_marginEnd="19dp"
android:layout_marginBottom="0dp"
android:text="录音" />
<ListView
android:id="@+id/listview"
android:layout_width="wrap_content"
android:layout_height="129dp"
android:layout_below="@id/amend_time"
android:layout_alignParentEnd="true"
android:layout_marginTop="3dp"
android:layout_marginEnd="11dp">
</ListView>
<Button
android:id="@+id/button_back"
android:layout_width="wrap_content"
@ -146,6 +145,18 @@
android:text="完成"
android:visibility="invisible" />
<TextView
android:id="@+id/amend_playRecord"
android:layout_width="72dp"
android:layout_height="38dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_gravity="right"
android:layout_marginEnd="51dp"
android:layout_marginBottom="52dp"
android:text="播放"
/>
<Button
android:id="@+id/btn_amend_menu_notice"
android:layout_toRightOf="@id/btn_amend_menu"
@ -158,12 +169,6 @@
android:textSize="18sp"
/>
<ListView
android:id="@+id/listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginTop="20dp"></ListView>
</RelativeLayout>

@ -72,36 +72,37 @@
<EditText
android:id="@+id/edit_body"
android:layout_width="341dp"
android:layout_height="216dp"
android:layout_width="331dp"
android:layout_height="190dp"
android:layout_below="@id/edit_title_lay_lay"
android:layout_alignParentStart="true"
android:layout_marginStart="11dp"
android:layout_marginStart="21dp"
android:layout_marginTop="-2dp"
android:gravity="start"
android:hint="@string/edit_body_hint"
android:textSize="12sp" />
<TextView
android:id="@+id/mer_playRecord"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_below="@id/edit_body"
android:layout_alignParentStart="true"
<ListView
android:id="@+id/listview"
android:layout_width="319dp"
android:layout_height="93dp"
android:layout_below="@id/mer_time"
android:layout_alignParentEnd="true"
android:layout_marginStart="57dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="26dp"
android:layout_marginEnd="19dp"
android:layout_marginBottom="20dp" />
android:layout_marginTop="3dp"
android:layout_marginEnd="13dp">
</ListView>
<TextView
android:id="@+id/mer_time"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_below="@id/mer_playRecord"
android:layout_below="@id/edit_body"
android:layout_marginStart="57dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="-5dp"
android:layout_marginEnd="19dp"
android:layout_marginBottom="0dp"
android:text="录音" />
@ -184,6 +185,17 @@
android:text="录音"
android:textSize="18sp" />
<TextView
android:id="@+id/mer_playRecord"
android:layout_width="72dp"
android:layout_height="38dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_gravity="left"
android:layout_marginEnd="53dp"
android:layout_marginBottom="53dp"
android:text="播放"
android:visibility="invisible" />
<TextView
android:id="@+id/mer_stopRecord"
android:layout_width="72dp"
@ -201,7 +213,9 @@
android:layout_width="70dp"
android:layout_height="45dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="0dp"
android:layout_marginStart="11dp"
android:layout_marginLeft="11dp"
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/btn_edit_menu"
android:layout_toRightOf="@id/btn_edit_menu"
android:background="#F0E68C"

@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="v" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">

Loading…
Cancel
Save