diff --git a/database/v/.gradle/4.6/fileHashes/fileHashes.bin b/database/v/.gradle/4.6/fileHashes/fileHashes.bin
index 9ba2c9a..2209771 100644
Binary files a/database/v/.gradle/4.6/fileHashes/fileHashes.bin and b/database/v/.gradle/4.6/fileHashes/fileHashes.bin differ
diff --git a/database/v/.gradle/4.6/fileHashes/fileHashes.lock b/database/v/.gradle/4.6/fileHashes/fileHashes.lock
index 99e3973..ae1bf1a 100644
Binary files a/database/v/.gradle/4.6/fileHashes/fileHashes.lock and b/database/v/.gradle/4.6/fileHashes/fileHashes.lock differ
diff --git a/database/v/.gradle/4.6/javaCompile/classAnalysis.bin b/database/v/.gradle/4.6/javaCompile/classAnalysis.bin
index b8112fa..84a911c 100644
Binary files a/database/v/.gradle/4.6/javaCompile/classAnalysis.bin and b/database/v/.gradle/4.6/javaCompile/classAnalysis.bin differ
diff --git a/database/v/.gradle/4.6/javaCompile/javaCompile.lock b/database/v/.gradle/4.6/javaCompile/javaCompile.lock
index 28d2a58..6feff1e 100644
Binary files a/database/v/.gradle/4.6/javaCompile/javaCompile.lock and b/database/v/.gradle/4.6/javaCompile/javaCompile.lock differ
diff --git a/database/v/.gradle/4.6/javaCompile/taskHistory.bin b/database/v/.gradle/4.6/javaCompile/taskHistory.bin
index 5679a4b..edc0787 100644
Binary files a/database/v/.gradle/4.6/javaCompile/taskHistory.bin and b/database/v/.gradle/4.6/javaCompile/taskHistory.bin differ
diff --git a/database/v/.gradle/4.6/taskHistory/taskHistory.bin b/database/v/.gradle/4.6/taskHistory/taskHistory.bin
index a6c52fe..a6c9818 100644
Binary files a/database/v/.gradle/4.6/taskHistory/taskHistory.bin and b/database/v/.gradle/4.6/taskHistory/taskHistory.bin differ
diff --git a/database/v/.gradle/4.6/taskHistory/taskHistory.lock b/database/v/.gradle/4.6/taskHistory/taskHistory.lock
index 4e54c5c..913660c 100644
Binary files a/database/v/.gradle/4.6/taskHistory/taskHistory.lock and b/database/v/.gradle/4.6/taskHistory/taskHistory.lock differ
diff --git a/database/v/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/database/v/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index c1eca26..06e2d5d 100644
Binary files a/database/v/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/database/v/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/database/v/.idea/workspace.xml b/database/v/.idea/workspace.xml
index 06d994e..b89fab8 100644
--- a/database/v/.idea/workspace.xml
+++ b/database/v/.idea/workspace.xml
@@ -36,8 +36,8 @@
-
-
+
+
@@ -45,25 +45,23 @@
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
@@ -71,53 +69,44 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
-
-
+
+
-
-
+
+
@@ -125,8 +114,8 @@
-
-
+
+
@@ -134,8 +123,26 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2401,7 +2408,6 @@
@@ -2687,31 +2698,31 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2724,6 +2735,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2757,8 +2829,6 @@
-
-
@@ -2870,13 +2940,6 @@
-
-
-
-
-
-
-
@@ -2981,89 +3044,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
-
-
+
+
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
+
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$1.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$1.class
index da2f7dc..f8d8e85 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$1.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$1.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$10.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$10.class
index 62f97b5..001896d 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$10.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$10.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$11.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$11.class
index 4bed934..0124ce7 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$11.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$11.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$2.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$2.class
index abb425d..4e59fad 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$2.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$2.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$3.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$3.class
index d0c482d..a4238e3 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$3.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$3.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$4.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$4.class
index 8730aca..f14b726 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$4.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$4.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$5.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$5.class
index 8cbef11..5f55783 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$5.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$5.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$6.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$6.class
index 28ecf20..012802c 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$6.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$6.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$7.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$7.class
index 7165683..df33592 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$7.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$7.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$8.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$8.class
index 70dc815..3f38e0f 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$8.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$8.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$9.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$9.class
index 52747d4..f50ed56 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$9.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity$9.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity.class
index 6de6b63..b399015 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/CommentActivity.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$1.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$1.class
index 2cf0513..e201dbc 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$1.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$1.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$2.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$2.class
index 68a067c..b1e4613 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$2.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$2.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$3.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$3.class
index 21de747..935bebe 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$3.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$3.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$4.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$4.class
index 40d964c..0bb7da3 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$4.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$4.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$1.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$1.class
index 743f0cd..443ef1d 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$1.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$1.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$ViewHolder.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$ViewHolder.class
index 0ad3e2a..0ff03ec 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$ViewHolder.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter$ViewHolder.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter.class
index f7fc32b..290d1fe 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity$GridAdapter.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity.class
index 5d47572..dd9c502 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/EditActivity.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$2.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$2.class
index f4b4a54..41b4090 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$2.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$2.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$3.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$3.class
index 9b5d12a..da1d1eb 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$3.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$3.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$4.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$4.class
index 66f643d..fce9dc9 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$4.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$4.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5$1.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5$1.class
index 06183a1..043fe27 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5$1.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5$1.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5.class
index 5191ab4..122e427 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$5.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$6.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$6.class
index d22991a..755672e 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$6.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$6.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$7.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$7.class
index 075240a..7b86bb4 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$7.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$7.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$9.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$9.class
index 7006036..3634c79 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$9.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity$9.class differ
diff --git a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity.class b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity.class
index 87bca59..4f5b033 100644
Binary files a/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity.class and b/database/v/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/cici/voice/MainActivity.class differ
diff --git a/database/v/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex b/database/v/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
index e6397fd..79e79c5 100644
Binary files a/database/v/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex and b/database/v/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex differ
diff --git a/database/v/app/build/intermediates/transforms/dexMerger/debug/__content__.json b/database/v/app/build/intermediates/transforms/dexMerger/debug/__content__.json
index f00efc6..01f76c5 100644
--- a/database/v/app/build/intermediates/transforms/dexMerger/debug/__content__.json
+++ b/database/v/app/build/intermediates/transforms/dexMerger/debug/__content__.json
@@ -1 +1 @@
-[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","MAIN_SPLIT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
+[{"name":"main","index":0,"scopes":["MAIN_SPLIT","PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
diff --git a/database/v/app/src/main/java/com/example/cici/Index/IndexActivity.java b/database/v/app/src/main/java/com/example/cici/Index/IndexActivity.java
index 60182e6..b70945e 100644
--- a/database/v/app/src/main/java/com/example/cici/Index/IndexActivity.java
+++ b/database/v/app/src/main/java/com/example/cici/Index/IndexActivity.java
@@ -68,6 +68,7 @@ public class IndexActivity extends AppCompatActivity implements View.OnClickList
quit();
}
});
+ findViewById(R.id.indexmemopng).setOnClickListener(this);
findViewById(R.id.indexdiarypng).setOnClickListener(this);
findViewById(R.id.indexsharepng).setOnClickListener(this);//连朋友圈
diff --git a/database/v/app/src/main/java/com/example/cici/bean/Record.java b/database/v/app/src/main/java/com/example/cici/bean/Record.java
index b70b4df..464907d 100644
--- a/database/v/app/src/main/java/com/example/cici/bean/Record.java
+++ b/database/v/app/src/main/java/com/example/cici/bean/Record.java
@@ -6,6 +6,7 @@ import cn.bmob.v3.BmobObject;
public class Record extends BmobObject {
private Integer id;
+ private User user;
private String titleName;
private String textBody;
private String createTime;
@@ -64,4 +65,12 @@ public class Record extends BmobObject {
public void setVoice(List voice) {
this.voice = voice;
}
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
}
diff --git a/database/v/app/src/main/java/com/example/cici/memoire/EditActivity.java b/database/v/app/src/main/java/com/example/cici/memoire/EditActivity.java
index b325b30..39e8988 100644
--- a/database/v/app/src/main/java/com/example/cici/memoire/EditActivity.java
+++ b/database/v/app/src/main/java/com/example/cici/memoire/EditActivity.java
@@ -29,6 +29,7 @@ import android.widget.Toast;
import com.example.cici.adapter.MAdapter;
import com.example.cici.bean.Record;
+import com.example.cici.bean.User;
import com.example.cici.utils.DateFormatType;
import com.example.cici.utils.MyFormat;
import com.example.cici.utils.MyTimeGetter;
@@ -44,6 +45,7 @@ import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
+import cn.bmob.v3.BmobUser;
import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.SaveListener;
@@ -100,6 +102,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
private MAdapter mAdapter;
private TextView playRecord;
private View whichSelecte = null;// 记录被选中的Item
+ private User user;
@Override
@@ -121,7 +124,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
editTitle = findViewById(R.id.edit_title);
editBody = findViewById(R.id.edit_body);
editTime = findViewById(R.id.edit_title_time);
-
+ user = BmobUser.getCurrentUser(User.class);
btnNotice = findViewById(R.id.btn_edit_menu_notice);
btnSave.setOnClickListener(this);
@@ -533,7 +536,7 @@ public class EditActivity extends BaseActivity implements View.OnClickListener,
record.setTextBody(body);
record.setVoiceurl(fileName);
record.setVoice(list);
-
+ record.setUser(user);
if (timeSetTag) {
// 为当前备忘录添加提醒
DatePicker datePicker = dialogDate.getDatePicker();
diff --git a/database/v/app/src/main/java/com/example/cici/memoire/MainActivity.java b/database/v/app/src/main/java/com/example/cici/memoire/MainActivity.java
index 076059a..7477808 100644
--- a/database/v/app/src/main/java/com/example/cici/memoire/MainActivity.java
+++ b/database/v/app/src/main/java/com/example/cici/memoire/MainActivity.java
@@ -17,6 +17,7 @@ import android.widget.ListView;
import android.widget.TextView;
import com.example.cici.bean.Record;
+import com.example.cici.bean.User;
import com.example.cici.utils.DateFormatType;
import com.example.cici.voice.R;
@@ -25,6 +26,8 @@ import java.util.Date;
import java.util.List;
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.listener.FindListener;
import cn.bmob.v3.listener.UpdateListener;
@@ -41,6 +44,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
private Button createButton;
private MyBaseAdapter myBaseAdapter;
private List recordList;
+ private User user;
+ private String obj;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -53,10 +58,12 @@ public class MainActivity extends BaseActivity implements View.OnClickListener,
private void init(){
createButton = findViewById(R.id.createButton);
createButton.setOnClickListener(this);
-
+ user = BmobUser.getCurrentUser(User.class);
myListView = findViewById(R.id.list_view);
recordList = new ArrayList<>();
+
BmobQuery query = new BmobQuery<>();
+ query.addWhereEqualTo("user", new BmobPointer(user));
query.order("-createdAt");
query.setLimit(20);
query.findObjects(new FindListener() {
diff --git a/database/v/app/src/main/java/com/example/cici/voice/CommentActivity.java b/database/v/app/src/main/java/com/example/cici/voice/CommentActivity.java
index 64057a9..25b2b17 100644
--- a/database/v/app/src/main/java/com/example/cici/voice/CommentActivity.java
+++ b/database/v/app/src/main/java/com/example/cici/voice/CommentActivity.java
@@ -23,7 +23,6 @@ import com.example.cici.bean.Comment;
import com.example.cici.bean.Post;
import com.example.cici.bean.User;
import com.example.cici.utils.MyListview;
-import com.example.cici.voice.R;
import com.lzy.ninegrid.ImageInfo;
import com.lzy.ninegrid.NineGridView;
import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
diff --git a/database/v/app/src/main/java/com/example/cici/voice/EditActivity.java b/database/v/app/src/main/java/com/example/cici/voice/EditActivity.java
index bbd5017..c5dc4f5 100644
--- a/database/v/app/src/main/java/com/example/cici/voice/EditActivity.java
+++ b/database/v/app/src/main/java/com/example/cici/voice/EditActivity.java
@@ -52,6 +52,7 @@ import cn.bmob.v3.datatype.BmobFile;
import cn.bmob.v3.exception.BmobException;
import cn.bmob.v3.listener.SaveListener;
import cn.bmob.v3.listener.UploadBatchListener;
+import cn.bmob.v3.listener.UploadFileListener;
public class EditActivity extends AppCompatActivity {
@@ -89,7 +90,7 @@ public class EditActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.layout_edit);
-
+
intiView();
}
@@ -389,28 +390,38 @@ public class EditActivity extends AppCompatActivity {
toast("发布中...");
String username=user.getUsername();
final Post post = new Post();
- post.setVoiceUrl(fileName);
post.setContent(content);
post.setUserName(username);
post.setPraise(0);
post.setTime(getTime());
post.setUserIcon(getIntent().getStringExtra("headUrl"));
+
if (size == 0) {
post.setHaveIcon(false);
- post.save(new SaveListener() {
+ final BmobFile bmobFile=new BmobFile(new File(fileName));
+ bmobFile.uploadblock(new UploadFileListener() {
@Override
- public void done(String s, BmobException e) {
- if(e==null)
- {
- et_send.setText("");
- toast("yes!发表成功");
- finish();
-
- }else {
- toast("失败"+e.toString());
+ public void done(BmobException e) {
+ if(e==null){
+ post.setVoiceUrl(bmobFile.getFileUrl());
+ post.save(new SaveListener() {
+ @Override
+ public void done(String s, BmobException e) {
+ if(e==null){ et_send.setText("");
+ toast("yes!发表成功");
+ finish();
+ }
+ else{
+ toast("失败"+e.toString());
+ }
+ }
+ });
}
+
+
}
});
+
return;
}
size = 0;
diff --git a/database/v/app/src/main/java/com/example/cici/voice/MainActivity.java b/database/v/app/src/main/java/com/example/cici/voice/MainActivity.java
index bf58db3..a8b87f6 100644
--- a/database/v/app/src/main/java/com/example/cici/voice/MainActivity.java
+++ b/database/v/app/src/main/java/com/example/cici/voice/MainActivity.java
@@ -96,11 +96,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
list = new ArrayList<>();
adapter = new MyAdapter(MainActivity.this, list);
lv.setAdapter(adapter);
- //点击头像的处理，我这里是注销与切换用户，我下边写了更换头像的方法，根据自己情况选择
userIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- quit();
+ addHead();
}
});
@@ -122,14 +121,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
@Override
public void done(List lists, BmobException e) {
if (e == null) {
-
- /* for (int i=0;i