Bläddra i källkod

[알림][New] 날짜/시간 필드/포맷 변경

hyodong.min 6 år sedan
förälder
incheckning
9b61b0e7f1

+ 8 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/NoticeBean.java

@@ -74,8 +74,10 @@ public class NoticeBean extends JsonBeanBase {
   private String category;
   @SerializedName("cmngType")
   private String flag;
-  @SerializedName("frstRgstDttm")
-  private String date;
+//  @SerializedName("frstRgstDttm")
+//  private String registrationDate;
+  @SerializedName("openDttm")
+  private String openingDate;
   @SerializedName("cmngTitl")
   private String title;
   @SerializedName("zumoCmngCten")
@@ -114,12 +116,12 @@ public class NoticeBean extends JsonBeanBase {
     this.flag = flag;
   }
 
-  public String getDate() {
-    return date;
+  public String getOpeningDate() {
+    return openingDate;
   }
 
-  public void setDate(String date) {
-    this.date = date;
+  public void setOpeningDate(String date) {
+    this.openingDate = date;
   }
 
   public String getTitle() {

+ 3 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiExpandableViewHolder.java

@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.NoticeBean;
+import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -47,10 +48,10 @@ public class NotiExpandableViewHolder extends NotiViewHolder {
 
   @Override
   public void bind(NoticeBean bean, IEventListener listener) {
-   // Spanned contents = StringUtil.fromHtml(bean.getContents());
+    // Spanned contents = StringUtil.fromHtml(bean.getContents());
     textViewAlarmCategory.setText(bean.getFlagName());
     textViewAlarmTitle.setText(bean.getTitle());
-    textViewAlarmDate.setText(bean.getDate());
+    textViewAlarmDate.setText(Formatter.format(bean.getOpeningDate(), Formatter.DATE_TIME_FORMAT, "yyyy-MM-dd HH:mm"));
     //textViewAlarmContents.setText(contents);
     //textViewAlarmContents.setMovementMethod(LinkMovementMethod.getInstance());
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiModel.java

@@ -157,7 +157,7 @@ public class NotiModel extends Model implements PushMessageBroker.IPushMessageLi
     NoticeBean noticeBean = new NoticeBean();
     noticeBean.setCategory(NoticeBean.CATEGORY_NEWS);
     noticeBean.setContents(bean.getContents());
-    noticeBean.setDate(Formatter.format(bean.getDateTime(), PushBean.DATE_FORMAT, NoticeBean.DATE_FORMAT));
+    noticeBean.setOpeningDate(Formatter.format(bean.getDateTime(), PushBean.DATE_FORMAT, NoticeBean.DATE_FORMAT));
     noticeBean.setEventId(bean.getItemNo());
     noticeBean.setNoticeNo(String.valueOf(index));
     noticeBean.setFlag(getNoticeFlagFromPush(bean.getPushType()));

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiTextLinkViewHolder.java

@@ -6,6 +6,7 @@ import android.widget.TextView;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.NoticeBean;
+import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -40,7 +41,7 @@ public class NotiTextLinkViewHolder extends NotiViewHolder {
   @Override
   public void bind(NoticeBean bean, IEventListener listener) {
     textViewAlarmCategory.setText(bean.getFlagName());
-    textViewAlarmDate.setText(bean.getDate());
+    textViewAlarmDate.setText(Formatter.format(bean.getOpeningDate(), Formatter.DATE_TIME_FORMAT, "yyyy-MM-dd HH:mm"));
     textViewAlarmDetail.setText(StringUtil.fromHtml(bean.getContents()));
 
     setShortcutText(textViewLink, bean.getFlag());