rv 2018050801 DEV, PRD 배포

app/app.iml

@@ -88,27 +88,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />

app/build.gradle

@@ -10,7 +10,7 @@ android {
         versionName '1.0.0'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        buildConfigField "String", "REVISION", "\"2018050301\""
+        buildConfigField "String", "REVISION", "\"2018050802\""
         buildConfigField "String", "RC", "\"rc4\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""

app/src/main/java/kr/co/hanwha/hifive/data/model/AlarmListRoot.java

@@ -7,9 +7,57 @@ import java.util.ArrayList;
  */
 
 public class AlarmListRoot extends BaseData {
+    //TODO PAGING
+    int countOfTotalRecords;
+
     ArrayList<AlarmData> listNotiInfo;
 
     public ArrayList<AlarmData> getListNotiInfo() {
         return listNotiInfo;
     }
+
+    public int getCountOfTotalRecords() {
+        return countOfTotalRecords;
+    }
+}
+/* 2018.5.3
+{
+"server_time": "2018-05-03 08:04:37",
+"finalPageNo": 133,
+"rtn_message": "성공",
+"rtn_code": 0,
+"countOfTotalRecords": 266,
+"nextPageNo": 3,
+"listNotiHist": [
+{
+    "noti_info_id": 4142,
+    "is_opened": false,
+    "profile_url": "",
+    "id": 4315,
+    "member_id": 327,
+    "task_id": 1321,
+    "project_id": 0,
+    "track_id": 0,
+    "context_id": 20,
+    "group_id": 1546,
+    "url": null,
+    "title": "왜때문이죠?",
+    "token": "",
+    "platform_type": "Android",
+    "message": "응?",
+    "response": "D",
+    "created_at": "2018-05-03 15:36:32.0",
+    "updated_at": "2018-05-03 15:36:32.0",
+    "deleted_at": null,
+    "sender_id": 0,
+    "is_forced": false,
+    "landing_target_id": 0,
+    "landing_target": ""
+},
+  {...}
+],
+"resver": "2.0",
+"currentPageNo": 2,
+"elapsedTime": "31 ms"
 }
+ */

app/src/main/java/kr/co/hanwha/hifive/data/model/TaskData.java

@@ -71,6 +71,34 @@ public class TaskData {
      */
     int status;
 
+    /**
+     * ex) "2017-10-19 13:19:35.0"
+     */
+    String created_at;
+    /**
+     * ex) "2017-10-19 13:19:35.0"
+     */
+    String updated_at;
+
+    String finished_at;
+
+    String closed_at;
+
+    public String getCreated_at() {
+        return created_at;
+    }
+
+    public String getUpdated_at() {
+        return updated_at;
+    }
+
+    public String getFinished_at() {
+        return finished_at;
+    }
+
+    public String getClosed_at() {
+        return closed_at;
+    }
 
     public int getFlag() {
         return flag;

app/src/main/java/kr/co/hanwha/hifive/data/model/TaskDetailData.java

@@ -13,14 +13,6 @@ public class TaskDetailData extends TaskData {
      * ex)
      */
     String author_profile_url;
-    /**
-     * ex) "2017-10-12 11:26:15.0"
-     */
-    String created_at;
-    /**
-     * ex) "2017-10-12 12:30:53.0"
-     */
-    String updated_at;
     /**
      * ex) 0
      */
@@ -59,30 +51,32 @@ public class TaskDetailData extends TaskData {
     @Override
     public String toString() {
         return "TaskDetailData{" +
-                "\nflag=" + flag +
-                "\n, task_id=" + task_id +
-                "\n, author_name='" + author_name + '\'' +
-                "\n, author_profile_url='" + author_profile_url + '\'' +
-                "\n, task_name='" + task_name + '\'' +
-                "\n, author_member_id=" + author_member_id +
-                "\n, created_at='" + created_at + '\'' +
-                "\n, member_id=" + member_id +
-                "\n, updated_at='" + updated_at + '\'' +
-                "\n, member_name='" + member_name + '\'' +
-                "\n, message_type=" + message_type +
-                "\n, member_profile_url='" + member_profile_url + '\'' +
-                "\n, message_contents='" + message_contents + '\'' +
-                "\n, project_id=" + project_id +
-                "\n, ref_task_id=" + ref_task_id +
-                "\n, project_name='" + project_name + '\'' +
-                "\n, track_id=" + track_id +
-                "\n, due_to='" + due_to + '\'' +
-                "\n, timezone='" + timezone + '\'' +
-                "\n, repeat_day='" + repeat_day + '\'' +
-                "\n, description='" + description + '\'' +
-                "\n, evaluation=" + evaluation +
-                "\n, is_today=" + is_today +
-                "\n, status=" + status +
+                "author_name='" + author_name + '\'' +
+                ", author_profile_url='" + author_profile_url + '\'' +
+                ", message_type=" + message_type +
+                ", message_contents='" + message_contents + '\'' +
+                ", ref_task_id=" + ref_task_id +
+                ", flag=" + flag +
+                ", task_id=" + task_id +
+                ", task_name='" + task_name + '\'' +
+                ", author_member_id=" + author_member_id +
+                ", member_id=" + member_id +
+                ", member_name='" + member_name + '\'' +
+                ", member_profile_url='" + member_profile_url + '\'' +
+                ", project_id=" + project_id +
+                ", project_name='" + project_name + '\'' +
+                ", track_id=" + track_id +
+                ", due_to='" + due_to + '\'' +
+                ", timezone='" + timezone + '\'' +
+                ", repeat_day='" + repeat_day + '\'' +
+                ", description='" + description + '\'' +
+                ", evaluation=" + evaluation +
+                ", is_today=" + is_today +
+                ", status=" + status +
+                ", created_at='" + created_at + '\'' +
+                ", updated_at='" + updated_at + '\'' +
+                ", finished_at='" + finished_at + '\'' +
+                ", closed_at='" + closed_at + '\'' +
                 '}';
     }
 }

app/src/main/java/kr/co/hanwha/hifive/data/model/TaskListData.java

@@ -21,21 +21,9 @@ public class TaskListData extends TaskData {
      * ex) ""
      */
     String author_profile_url;
-    /**
-     * ex) "2017-10-19 13:19:35.0"
-     */
-    String task_created_at;
-    /**
-     * ex) "2017-10-19 13:19:35.0"
-     */
-    String task_updated_at;
 
     int ref_task_id;
 
-    public String getTask_created_at() {
-        return task_created_at;
-    }
-
     public int getPackage_id() {
         return package_id;
     }
@@ -61,71 +49,72 @@ public class TaskListData extends TaskData {
     @Override
     public String toString() {
         return "TaskListData{" +
-                "task_id=" + task_id +
+                "request_type=" + request_type +
+                ", package_id=" + package_id +
+                ", author_name='" + author_name + '\'' +
+                ", author_profile_url='" + author_profile_url + '\'' +
+                ", created_at='" + created_at + '\'' +
+                ", updated_at='" + updated_at + '\'' +
+                ", finished_at='" + finished_at + '\'' +
+                ", closed_at='" + closed_at + '\'' +
+                ", ref_task_id=" + ref_task_id +
+                ", server_time='" + server_time + '\'' +
+                ", flag=" + flag +
+                ", task_id=" + task_id +
                 ", task_name='" + task_name + '\'' +
                 ", author_member_id=" + author_member_id +
-                ", flag=" + flag +
-                ", request_type=" + request_type +
                 ", member_id=" + member_id +
+                ", member_name='" + member_name + '\'' +
+                ", member_profile_url='" + member_profile_url + '\'' +
                 ", project_id=" + project_id +
                 ", project_name='" + project_name + '\'' +
-                ", package_id=" + package_id +
-                ", due_to='" + due_to + '\'' +
                 ", track_id=" + track_id +
+                ", due_to='" + due_to + '\'' +
                 ", timezone='" + timezone + '\'' +
-                ", status=" + status +
                 ", repeat_day='" + repeat_day + '\'' +
-                ", author_name='" + author_name + '\'' +
                 ", description='" + description + '\'' +
-                ", author_profile_url='" + author_profile_url + '\'' +
                 ", evaluation=" + evaluation +
-                ", task_created_at='" + task_created_at + '\'' +
                 ", is_today=" + is_today +
-                ", task_updated_at='" + task_updated_at + '\'' +
-                ", member_name='" + member_name + '\'' +
-                ", member_profile_url='" + member_profile_url + '\'' +
-                ", ref_task_id=" + ref_task_id +
-                ", server_time='" + server_time + '\'' +
+                ", status=" + status +
                 '}';
     }
 }
-/* 2018.2.6
+/* 2018.5.3
 {
-"id": 0,
-"created_at": "",
-"updated_at": "",
-"deleted_at": "",
-"description": "",
-"author_member_id": 262,
-"author_member_name": "",
-"hashtag_id": 0,
-"flag": 1,
-"ref_task_id": 0,
-"task_id": 613,
-"task_name": "12일까지 12일까지",
-"project_id": 40,
-"project_name": "우주최강개발",
-"package_id": 0,
-"track_id": 0,
-"due_to": "2018-02-06 23:59:59.0",
-"tz_due_to": "+09:00",
-"tz_created_at": "+09:00",
-"repeat_day": "",
-"request_type": 0,
-"task_description": "12일까지 12일까지 12일까지",
-"status": 20,
-"status_description": "Assigned",
-"author_name": "권상훈",
-"author_profile_url": "",
-"member_id": 262,
-"member_name": "권상훈",
-"member_profile_url": "",
-"leader_member_id": 0,
-"evaluation": 0,
-"priority": 0,
-"is_today": false,
-"task_created_at": "2018-02-06 09:48:33.0",
-"task_updated_at": "2018-02-06 11:29:58.0",
-"task_deleted_at": null
-},
+    "id": 0,
+    "description": "20180212",
+    "author_member_id": 327,
+    "author_member_name": "",
+    "hashtag_id": 0,
+    "flag": 15,
+    "ref_task_id": 0,
+    "task_id": 740,
+    "task_name": "20180212",
+    "project_id": 40,
+    "project_name": "우주최강개발",
+    "package_id": 0,
+    "track_id": 0,
+    "due_to": "2018-02-12 23:59:59.0",
+    "tz_due_to": "+09:00",
+    "tz_created_at": "+09:00",
+    "repeat_day": "",
+    "request_type": 0,
+    "task_description": "",
+    "status": 80,
+    "status_description": "Closed",
+    "author_name": "권상훈Android",
+    "author_profile_url": "",
+    "member_id": 327,
+    "member_name": "권상훈Android",
+    "member_profile_url": "",
+    "leader_member_id": 0,
+    "evaluation": 20,
+    "priority": 0,
+    "is_today": false,
+    "finished_at": "2018-04-16 16:14:07.0",
+    "closed_at": "2018-04-16 16:14:07.0"
+    "created_at": "2018-02-12 13:35:49.0",
+    "updated_at": "2018-04-16 16:14:07.0",
+    "deleted_at": null,
+}
  */