first commit

master
unknown 6 years ago
parent b86a22bf5f
commit b473d89d67

@ -36,8 +36,8 @@
<file leaf-file-name="DataActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="DataActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/DataActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/DataActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="-1018">
<caret line="65" column="24" selection-start-line="65" selection-start-column="24" selection-end-line="65" selection-end-column="24" /> <caret line="65" column="8" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="51" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -45,25 +45,23 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ResPwdActivity.java" pinned="false" current-in-tab="true"> <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/ResPwdActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/CommentActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178"> <state relative-caret-position="79">
<caret line="39" column="7" lean-forward="true" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" /> <caret line="109" column="51" selection-start-line="109" selection-start-column="7" selection-end-line="109" selection-end-column="51" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1406#1709#0" expanded="true" />
<element signature="e#1708#1709#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CommentActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ResPwdActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/CommentActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="730"> <state relative-caret-position="-12">
<caret line="64" column="19" selection-start-line="64" selection-start-column="19" selection-end-line="64" selection-end-column="19" /> <caret line="38" column="15" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -71,53 +69,44 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190"> <state relative-caret-position="269">
<caret line="155" column="75" selection-start-line="155" selection-start-column="75" selection-end-line="155" selection-end-column="75" /> <caret line="382" column="4" selection-start-line="382" selection-start-column="4" selection-end-line="382" selection-end-column="4" />
</state> <folding>
</provider> <element signature="e#3542#3687#0" expanded="true" />
</entry> <element signature="e#3686#3687#0" expanded="true" />
</file> <element signature="e#12234#12235#0" expanded="true" />
<file leaf-file-name="res_password.xml" pinned="false" current-in-tab="false"> <element signature="e#12303#12304#0" expanded="true" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/res_password.xml"> </folding>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="73">
<caret line="67" column="4" selection-start-line="67" selection-start-column="4" selection-end-line="67" selection-end-column="4" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AmendActivity.java" pinned="false" current-in-tab="false"> <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/AmendActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="839"> <state relative-caret-position="-152">
<caret line="476" selection-start-line="476" selection-end-line="476" /> <caret line="57" column="24" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="RegisterActivity.java" pinned="false" current-in-tab="false"> <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/RegisterActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293"> <state relative-caret-position="293">
<caret line="328" column="87" selection-start-line="328" selection-start-column="87" selection-end-line="328" selection-end-column="87" /> <caret line="557" column="5" selection-start-line="557" selection-start-column="5" selection-end-line="557" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Comment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Comment.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19"> <state relative-caret-position="209">
<caret line="109" column="27" selection-start-line="109" selection-start-column="27" selection-end-line="109" selection-end-column="27" /> <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -125,8 +114,8 @@
<file leaf-file-name="IndexActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="IndexActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323"> <state relative-caret-position="114">
<caret line="73" column="14" selection-start-line="73" selection-start-column="14" selection-end-line="73" selection-end-column="14" /> <caret line="59" selection-start-line="59" selection-end-line="59" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -134,8 +123,26 @@
<file leaf-file-name="EditActivity.java" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3724"> <state relative-caret-position="3616">
<caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> <caret line="416" column="28" selection-start-line="416" selection-start-column="28" selection-end-line="416" selection-end-column="28" />
<folding>
<element signature="e#13632#14138#0" expanded="true" />
</folding>
</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="114">
<caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
<folding>
<element signature="e#1428#1429#0" expanded="true" />
<element signature="e#1455#1456#0" expanded="true" />
<element signature="e#1493#1494#0" expanded="true" />
<element signature="e#1525#1526#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -2401,7 +2408,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/my_changedata.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/AmendActivity.java" />
@ -2411,12 +2417,17 @@
<option value="$PROJECT_DIR$/app/build.gradle" /> <option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/build.gradle" /> <option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_index.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_index.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/res_password.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/res_password.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/regist.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/regist.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/RegisterActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/RegisterActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.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/voice/CommentActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java" />
<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/voice/MainActivity.java" />
</list> </list>
</option> </option>
</component> </component>
@ -2687,31 +2698,31 @@
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info anchor="bottom" id="Android Profiler" order="7" /> <window_info anchor="bottom" id="Android Profiler" order="7" />
<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="Logcat" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info anchor="bottom" id="Build" order="7" 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" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info id="DB Browser" order="2" /> <window_info id="DB Browser" order="2" />
<window_info anchor="right" id="Palette&#9;" order="3" /> <window_info anchor="right" id="Palette&#9;" order="3" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Build Variants" order="2" side_tool="true" />
<window_info anchor="bottom" id="DB Execution Console" order="7" />
<window_info anchor="right" id="Capture Analysis" order="3" /> <window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="right" id="Preview" order="3" weight="0.3297587" /> <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="7" /> <window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Logcat" order="7" />
<window_info id="Captures" order="2" weight="0.25" /> <window_info id="Captures" order="2" weight="0.25" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="Build" order="7" visible="true" weight="0.32905984" />
<window_info anchor="right" id="Gradle" order="3" /> <window_info anchor="right" id="Gradle" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
<window_info anchor="right" id="Theme Preview" order="3" /> <window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" /> <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="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Preview" order="3" weight="0.3297587" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <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="bottom" id="Cvs" order="4" weight="0.25" />
@ -2724,6 +2735,67 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/res_password.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1273">
<caret line="67" column="4" selection-start-line="67" selection-start-column="4" selection-end-line="67" selection-end-column="4" />
</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="8360">
<caret line="476" selection-start-line="476" selection-end-line="476" />
</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="5491">
<caret line="328" column="87" selection-start-line="328" selection-start-column="87" selection-end-line="328" selection-end-column="87" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="1520">
<caret line="109" column="27" selection-start-line="109" selection-start-column="27" selection-end-line="109" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="855">
<caret line="73" column="14" selection-start-line="73" selection-start-column="14" selection-end-line="73" selection-end-column="14" />
</state>
</provider>
</entry>
<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="95">
<caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
<folding>
<element signature="e#13632#14138#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="39" column="7" lean-forward="true" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="912"> <state relative-caret-position="912">
@ -2757,8 +2829,6 @@
<caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1406#1709#0" expanded="true" />
<element signature="e#1708#1709#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -2870,13 +2940,6 @@
</state> </state>
</provider> </provider>
</entry> </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="1425">
<caret line="123" selection-start-line="123" selection-end-line="123" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="912"> <state relative-caret-position="912">
@ -2981,89 +3044,139 @@
<state /> <state />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/res_password.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1273">
<caret line="67" column="4" selection-start-line="67" selection-start-column="4" selection-end-line="67" selection-end-column="4" />
</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="8360">
<caret line="476" selection-start-line="476" selection-end-line="476" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/MyApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/RegisterActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/RegisterActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293"> <state relative-caret-position="386">
<caret line="328" column="87" selection-start-line="328" selection-start-column="87" selection-end-line="328" selection-end-column="87" /> <caret line="320" column="43" selection-start-line="320" selection-start-column="43" selection-end-line="320" selection-end-column="43" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#10454#11838#0" expanded="true" />
<element signature="e#11837#11838#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/res_password.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Post.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="73"> <state relative-caret-position="76">
<caret line="67" column="4" selection-start-line="67" selection-start-column="4" selection-end-line="67" selection-end-column="4" /> <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry> </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/bean/Comment.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="839"> <state relative-caret-position="209">
<caret line="476" selection-start-line="476" selection-end-line="476" /> <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/bean/Record.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19"> <state relative-caret-position="114">
<caret line="109" column="27" selection-start-line="109" selection-start-column="27" selection-end-line="109" selection-end-column="27" /> <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
<folding>
<element signature="e#1428#1429#0" expanded="true" />
<element signature="e#1455#1456#0" expanded="true" />
<element signature="e#1493#1494#0" expanded="true" />
<element signature="e#1525#1526#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323"> <state relative-caret-position="-12">
<caret line="73" column="14" selection-start-line="73" selection-start-column="14" selection-end-line="73" selection-end-column="14" /> <caret line="38" column="15" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/DataActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/DataActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="-1018">
<caret line="65" column="24" selection-start-line="65" selection-start-column="24" selection-end-line="65" selection-end-column="24" /> <caret line="65" column="8" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="51" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="59" selection-start-line="59" selection-end-line="59" />
</state>
</provider>
</entry>
<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="3616">
<caret line="416" column="28" selection-start-line="416" selection-start-column="28" selection-end-line="416" selection-end-column="28" />
<folding>
<element signature="e#13632#14138#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/CommentActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/CommentActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="730"> <state relative-caret-position="79">
<caret line="64" column="19" selection-start-line="64" selection-start-column="19" selection-end-line="64" selection-end-column="19" /> <caret line="109" column="51" selection-start-line="109" selection-start-column="7" selection-end-line="109" selection-end-column="51" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3724"> <state relative-caret-position="-152">
<caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> <caret line="57" column="24" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190"> <state relative-caret-position="293">
<caret line="155" column="75" selection-start-line="155" selection-start-column="75" selection-end-line="155" selection-end-column="75" /> <caret line="557" column="5" selection-start-line="557" selection-start-column="5" selection-end-line="557" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178"> <state relative-caret-position="269">
<caret line="39" column="7" lean-forward="true" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" /> <caret line="382" column="4" selection-start-line="382" selection-start-column="4" selection-end-line="382" selection-end-column="4" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#3542#3687#0" expanded="true" />
<element signature="e#1406#1709#0" expanded="true" /> <element signature="e#3686#3687#0" expanded="true" />
<element signature="e#1708#1709#0" expanded="true" /> <element signature="e#12234#12235#0" expanded="true" />
<element signature="e#12303#12304#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

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

@ -68,6 +68,7 @@ public class IndexActivity extends AppCompatActivity implements View.OnClickList
quit(); quit();
} }
}); });
findViewById(R.id.indexmemopng).setOnClickListener(this);
findViewById(R.id.indexdiarypng).setOnClickListener(this); findViewById(R.id.indexdiarypng).setOnClickListener(this);
findViewById(R.id.indexsharepng).setOnClickListener(this);//连朋友圈 findViewById(R.id.indexsharepng).setOnClickListener(this);//连朋友圈

@ -6,6 +6,7 @@ import cn.bmob.v3.BmobObject;
public class Record extends BmobObject { public class Record extends BmobObject {
private Integer id; private Integer id;
private User user;
private String titleName; private String titleName;
private String textBody; private String textBody;
private String createTime; private String createTime;
@ -64,4 +65,12 @@ public class Record extends BmobObject {
public void setVoice(List<String> voice) { public void setVoice(List<String> voice) {
this.voice = voice; this.voice = voice;
} }
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
} }

@ -29,6 +29,7 @@ import android.widget.Toast;
import com.example.cici.adapter.MAdapter; import com.example.cici.adapter.MAdapter;
import com.example.cici.bean.Record; import com.example.cici.bean.Record;
import com.example.cici.bean.User;
import com.example.cici.utils.DateFormatType; import com.example.cici.utils.DateFormatType;
import com.example.cici.utils.MyFormat; import com.example.cici.utils.MyFormat;
import com.example.cici.utils.MyTimeGetter; import com.example.cici.utils.MyTimeGetter;
@ -44,6 +45,7 @@ import java.util.Date;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import cn.bmob.v3.BmobUser;
import cn.bmob.v3.exception.BmobException; import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.SaveListener; import cn.bmob.v3.listener.SaveListener;
@ -100,6 +102,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
private MAdapter mAdapter; private MAdapter mAdapter;
private TextView playRecord; private TextView playRecord;
private View whichSelecte = null;// 记录被选中的Item private View whichSelecte = null;// 记录被选中的Item
private User user;
@Override @Override
@ -121,7 +124,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
editTitle = findViewById(R.id.edit_title); editTitle = findViewById(R.id.edit_title);
editBody = findViewById(R.id.edit_body); editBody = findViewById(R.id.edit_body);
editTime = findViewById(R.id.edit_title_time); editTime = findViewById(R.id.edit_title_time);
user = BmobUser.getCurrentUser(User.class);
btnNotice = findViewById(R.id.btn_edit_menu_notice); btnNotice = findViewById(R.id.btn_edit_menu_notice);
btnSave.setOnClickListener(this); btnSave.setOnClickListener(this);
@ -533,7 +536,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
record.setTextBody(body); record.setTextBody(body);
record.setVoiceurl(fileName); record.setVoiceurl(fileName);
record.setVoice(list); record.setVoice(list);
record.setUser(user);
if (timeSetTag) { if (timeSetTag) {
// 为当前备忘录添加提醒 // 为当前备忘录添加提醒
DatePicker datePicker = dialogDate.getDatePicker(); DatePicker datePicker = dialogDate.getDatePicker();

@ -17,6 +17,7 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.example.cici.bean.Record; import com.example.cici.bean.Record;
import com.example.cici.bean.User;
import com.example.cici.utils.DateFormatType; import com.example.cici.utils.DateFormatType;
import com.example.cici.voice.R; import com.example.cici.voice.R;
@ -25,6 +26,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import cn.bmob.v3.BmobQuery; import cn.bmob.v3.BmobQuery;
import cn.bmob.v3.BmobUser;
import cn.bmob.v3.datatype.BmobPointer;
import cn.bmob.v3.exception.BmobException; import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.FindListener; import cn.bmob.v3.listener.FindListener;
import cn.bmob.v3.listener.UpdateListener; import cn.bmob.v3.listener.UpdateListener;
@ -41,6 +44,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
private Button createButton; private Button createButton;
private MyBaseAdapter myBaseAdapter; private MyBaseAdapter myBaseAdapter;
private List<Record> recordList; private List<Record> recordList;
private User user;
private String obj;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -53,10 +58,12 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
private void init(){ private void init(){
createButton = findViewById(R.id.createButton); createButton = findViewById(R.id.createButton);
createButton.setOnClickListener(this); createButton.setOnClickListener(this);
user = BmobUser.getCurrentUser(User.class);
myListView = findViewById(R.id.list_view); myListView = findViewById(R.id.list_view);
recordList = new ArrayList<>(); recordList = new ArrayList<>();
BmobQuery<Record> query = new BmobQuery<>(); BmobQuery<Record> query = new BmobQuery<>();
query.addWhereEqualTo("user", new BmobPointer(user));
query.order("-createdAt"); query.order("-createdAt");
query.setLimit(20); query.setLimit(20);
query.findObjects(new FindListener<Record>() { query.findObjects(new FindListener<Record>() {

@ -23,7 +23,6 @@ import com.example.cici.bean.Comment;
import com.example.cici.bean.Post; import com.example.cici.bean.Post;
import com.example.cici.bean.User; import com.example.cici.bean.User;
import com.example.cici.utils.MyListview; import com.example.cici.utils.MyListview;
import com.example.cici.voice.R;
import com.lzy.ninegrid.ImageInfo; import com.lzy.ninegrid.ImageInfo;
import com.lzy.ninegrid.NineGridView; import com.lzy.ninegrid.NineGridView;
import com.lzy.ninegrid.preview.NineGridViewClickAdapter; import com.lzy.ninegrid.preview.NineGridViewClickAdapter;

@ -52,6 +52,7 @@ import cn.bmob.v3.datatype.BmobFile;
import cn.bmob.v3.exception.BmobException; import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.SaveListener; import cn.bmob.v3.listener.SaveListener;
import cn.bmob.v3.listener.UploadBatchListener; import cn.bmob.v3.listener.UploadBatchListener;
import cn.bmob.v3.listener.UploadFileListener;
public class EditActivity extends AppCompatActivity { public class EditActivity extends AppCompatActivity {
@ -89,7 +90,7 @@ public class EditActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.layout_edit); setContentView(R.layout.layout_edit);
intiView(); intiView();
} }
@ -389,28 +390,38 @@ public class EditActivity extends AppCompatActivity {
toast("发布中..."); toast("发布中...");
String username=user.getUsername(); String username=user.getUsername();
final Post post = new Post(); final Post post = new Post();
post.setVoiceUrl(fileName);
post.setContent(content); post.setContent(content);
post.setUserName(username); post.setUserName(username);
post.setPraise(0); post.setPraise(0);
post.setTime(getTime()); post.setTime(getTime());
post.setUserIcon(getIntent().getStringExtra("headUrl")); post.setUserIcon(getIntent().getStringExtra("headUrl"));
if (size == 0) { if (size == 0) {
post.setHaveIcon(false); post.setHaveIcon(false);
post.save(new SaveListener<String>() { final BmobFile bmobFile=new BmobFile(new File(fileName));
bmobFile.uploadblock(new UploadFileListener() {
@Override @Override
public void done(String s, BmobException e) { public void done(BmobException e) {
if(e==null) if(e==null){
{ post.setVoiceUrl(bmobFile.getFileUrl());
et_send.setText(""); post.save(new SaveListener<String>() {
toast("yes!发表成功"); @Override
finish(); public void done(String s, BmobException e) {
if(e==null){ et_send.setText("");
}else { toast("yes!发表成功");
toast("失败"+e.toString()); finish();
}
else{
toast("失败"+e.toString());
}
}
});
} }
} }
}); });
return; return;
} }
size = 0; size = 0;

@ -96,11 +96,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
list = new ArrayList<>(); list = new ArrayList<>();
adapter = new MyAdapter(MainActivity.this, list); adapter = new MyAdapter(MainActivity.this, list);
lv.setAdapter(adapter); lv.setAdapter(adapter);
//点击头像的处理,我这里是注销与切换用户,我下边写了更换头像的方法,根据自己情况选择
userIcon.setOnClickListener(new View.OnClickListener() { userIcon.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
quit(); addHead();
} }
}); });
@ -122,14 +121,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
@Override @Override
public void done(List<Post> lists, BmobException e) { public void done(List<Post> lists, BmobException e) {
if (e == null) { if (e == null) {
/* for (int i=0;i<lists.size();i++){
Post post =lists.get(i);
post.setUserIcon(getHeadUrl(queryHeadByName(lists.get(i).getUserName())));
toast(getHeadUrl(queryHeadByName(lists.get(i).getUserName())));
list.add(post);
}*/
list = lists; list = lists;
adapter.addPost(list); adapter.addPost(list);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
@ -229,8 +220,6 @@ public void intentToComm(int i){
} }
intent.putExtra("obj", list.get(i).getObjectId()); intent.putExtra("obj", list.get(i).getObjectId());
// intent.putExtra("urlList", (Parcelable) list.get(i).getHeadImgUrl());
startActivity(intent); startActivity(intent);
} }
public void showDialog() { public void showDialog() {
@ -245,7 +234,7 @@ public void intentToComm(int i){
} }
/** /**
* 使 *
*/ */
private void addHead() { private void addHead() {
ImagePicker imagePicker = ImagePicker.getInstance(); ImagePicker imagePicker = ImagePicker.getInstance();
@ -391,24 +380,5 @@ public void intentToComm(int i){
private void toast(String date) { private void toast(String date) {
Toast.makeText(this, date, Toast.LENGTH_SHORT).show(); Toast.makeText(this, date, Toast.LENGTH_SHORT).show();
} }
/*
*/
public void quit(){
al = new AlertDialog.Builder(this)
.setTitle("确定注销吗")
.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
BmobUser.logOut(); //清除缓存用户对象
toast("注销成功");
Intent intent = new Intent();
intent.setClass(MainActivity.this, LoginActivity.class);
startActivity(intent);
finish();
}
})
.setNegativeButton("取消",null)
.show();
}
} }

Loading…
Cancel
Save