update ftp server

Kai-Zhang · Jun 14, 2016 · c5cfdc4 · c5cfdc4
1 parent 96d77e4
commit c5cfdc4
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 135 deletions.
diff --git a/.gradle/2.4/taskArtifacts/cache.properties.lock b/.gradle/2.4/taskArtifacts/cache.properties.lock
diff --git a/.gradle/2.4/taskArtifacts/fileHashes.bin b/.gradle/2.4/taskArtifacts/fileHashes.bin
diff --git a/.gradle/2.4/taskArtifacts/fileSnapshots.bin b/.gradle/2.4/taskArtifacts/fileSnapshots.bin
diff --git a/.gradle/2.4/taskArtifacts/taskArtifacts.bin b/.gradle/2.4/taskArtifacts/taskArtifacts.bin
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git 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
@@ -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
@@ -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
@@ -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" />
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="introduction">软件介绍</string>
     <string name="submitTv">情绪提交</string>
     <string name="emotionQuery">情绪查询</string>
-    <string name="emotionQueryTitle">&#032;&#032;&#032;ID 开心 郁闷 生气 惊奇 害怕 嫌恶</string>
+    <string name="emotionQueryTitle">ID 开心 郁闷 生气 惊奇 害怕 嫌恶</string>
     <string name="introText">本应用主要用于收集用户数据.\n该数据将用于预测用户情绪的研究工作.\n
         本应用应当每天10am,4pm,10pm三次提醒用户记录心情。但可能由于被管理软件清理而不能发出提醒。\n
         如果发生这样的情况，希望用户能够主动记录心情数据。但两次记录数据间隔不得低于五小时。\n

diff --git 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">
-        <dex dex="E:\AndroidApplication\HealthyLife_collector\HealthyLife\app\build\intermediates\pre-dexed\debug\commons-net-3.5-ed3525baf7fa2cee5d7dea7d42aa8127e15857fd.jar" />
+        <dex dex="E:\AndroidApplication\HealthyLife_collector\HealthyLife\app\build\intermediates\pre-dexed\release\commons-net-3.5-ed3525baf7fa2cee5d7dea7d42aa8127e15857fd.jar" />
     </item>
 
 </items>
diff --git 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