diff --git a/.gradle/2.4/taskArtifacts/cache.properties.lock b/.gradle/2.4/taskArtifacts/cache.properties.lock
index 6463090..4448ace 100644
Binary files a/.gradle/2.4/taskArtifacts/cache.properties.lock and b/.gradle/2.4/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.4/taskArtifacts/fileHashes.bin b/.gradle/2.4/taskArtifacts/fileHashes.bin
index 3798b22..406175f 100644
Binary files a/.gradle/2.4/taskArtifacts/fileHashes.bin and b/.gradle/2.4/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.4/taskArtifacts/fileSnapshots.bin b/.gradle/2.4/taskArtifacts/fileSnapshots.bin
index f545747..30181db 100644
Binary files a/.gradle/2.4/taskArtifacts/fileSnapshots.bin and b/.gradle/2.4/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.4/taskArtifacts/taskArtifacts.bin b/.gradle/2.4/taskArtifacts/taskArtifacts.bin
index e890081..605105b 100644
Binary files a/.gradle/2.4/taskArtifacts/taskArtifacts.bin and b/.gradle/2.4/taskArtifacts/taskArtifacts.bin differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e11575d..5dba9a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -47,15 +47,12 @@
-
-
+
+
-
-
-
-
-
-
+
+
+
@@ -64,7 +61,7 @@
-
+
@@ -72,85 +69,74 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -159,11 +145,11 @@
-
-
+
+
-
-
+
+
@@ -1314,7 +1300,7 @@
+
+
+
+
@@ -2237,7 +2227,7 @@
-
+
@@ -2388,14 +2378,6 @@
-
-
-
-
-
-
-
-
@@ -2478,27 +2460,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2524,16 +2485,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -2545,10 +2496,10 @@
-
+
-
+
@@ -2556,21 +2507,58 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
@@ -2578,42 +2566,55 @@
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 070abc6..2560cd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
applicationId "org.graduation.healthylife"
minSdkVersion 15
targetSdkVersion 23
- versionCode 2
+ versionCode 3
versionName "1.1"
}
buildTypes {
diff --git a/app/src/main/java/org/graduation/healthylife/FtpUploader.java b/app/src/main/java/org/graduation/healthylife/FtpUploader.java
index 34af20c..a08fe40 100644
--- a/app/src/main/java/org/graduation/healthylife/FtpUploader.java
+++ b/app/src/main/java/org/graduation/healthylife/FtpUploader.java
@@ -14,7 +14,7 @@
* Created by javan on 2016/6/13.
*/
public class FtpUploader {
- private final static String addr="192.168.1.108";
+ private final static String addr="114.212.84.179";
private final static int port=21;
private final static String TAG="upload database";
public boolean upload(){
@@ -23,7 +23,7 @@ public boolean upload(){
try {
ftpClient.connect(addr, port);
Log.d(TAG,"connected");
- if (ftpClient.login("anonymous","anonymous"))
+ if (ftpClient.login("testftp","test"))
{
ftpClient.enterLocalPassiveMode(); // important!
ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
diff --git a/app/src/main/java/org/graduation/healthylife/QueryFragment.java b/app/src/main/java/org/graduation/healthylife/QueryFragment.java
index a649774..8f32a3d 100644
--- a/app/src/main/java/org/graduation/healthylife/QueryFragment.java
+++ b/app/src/main/java/org/graduation/healthylife/QueryFragment.java
@@ -25,7 +25,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
Cursor cursor= DatabaseManager.getDatabaseManager().queryEmotion();
int cnt=1;
while(cursor.moveToNext()){
- text+=" "+cnt+" ";
+ text+=" "+cnt;
for(int i=1;i<=6;i++){
text+=" ";
int emotion=cursor.getInt(i);
@@ -35,6 +35,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
else if(emotion==3) text+="高";
}
text+="\n";
+ cnt++;
}
textView.setText(text);
return view;
diff --git a/app/src/main/res/layout/content_query.xml b/app/src/main/res/layout/content_query.xml
index b511ad0..06d6a26 100644
--- a/app/src/main/res/layout/content_query.xml
+++ b/app/src/main/res/layout/content_query.xml
@@ -8,7 +8,8 @@
android:layout_height="wrap_content"
android:text="@string/emotionQueryTitle"
android:id="@+id/textView6"
- android:textSize="22sp"/>
+ android:textSize="22sp"
+ android:layout_marginLeft="20dp" />
软件介绍
情绪提交
情绪查询
- ID 开心 郁闷 生气 惊奇 害怕 嫌恶
+ ID 开心 郁闷 生气 惊奇 害怕 嫌恶
本应用主要用于收集用户数据.\n该数据将用于预测用户情绪的研究工作.\n
本应用应当每天10am,4pm,10pm三次提醒用户记录心情。但可能由于被管理软件清理而不能发出提醒。\n
如果发生这样的情况，希望用户能够主动记录心情数据。但两次记录数据间隔不得低于五小时。\n
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
index 59dfedf..ee949c4 100644
--- a/build/intermediates/dex-cache/cache.xml
+++ b/build/intermediates/dex-cache/cache.xml
@@ -6,7 +6,7 @@
jumboMode="false"
revision="23.0.2"
sha1="342fc284019f590e1308056990fdb24a08f06318">
-
+
diff --git a/local.properties b/local.properties
index 3a5d7e9..5fa83a3 100644
--- a/local.properties
+++ b/local.properties
@@ -7,5 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Mon Jun 13 18:42:03 CST 2016
+#Tue Jun 14 12:43:28 CST 2016
sdk.dir=E\:\\sdk