Преглед изворни кода

[푸시][New] notification refactoring

hyodong.min пре 6 година
родитељ
комит
836dd083b6

+ 4 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/push/FirebasePushService.java

@@ -63,7 +63,6 @@ public class FirebasePushService extends FirebaseMessagingService {
 
     SuperModelInit.instant(getApplicationContext());
 
-
     // Check if message contains a data payload.
     if (remoteMessage.getData().size() > 0) {
       Log.d("APP# FirebasePushService | onMessageReceived", "|" + "Message data payload: " + remoteMessage.getData());
@@ -72,13 +71,12 @@ public class FirebasePushService extends FirebaseMessagingService {
 
       Gson gson = new Gson();
       JsonElement jsonElement = gson.toJsonTree(data);
+
       PushBean bean = gson.fromJson(jsonElement, PushBean.class);
-      Log.d("APP# FirebasePushService | onMessageReceived", "|" + bean.toJson());
 
       if (null != bean && PushMessageManager.isAvailableCode(bean.getScreenCode())) {
-        PushMessageManager manager = PushMessageManager.getStoredManager().addPushBean(bean);
-        PushMessageManager.saveManager(manager);
-        PushMessageBroker.getInstance().push(manager);
+        Log.d("APP# FirebasePushService | onMessageReceived", "|" + bean.toJson());
+        PushMessageManager.onRecived(bean);
 
         // 노티를 표시할지 구분
         if (PushMessageManager.isEventCode(bean.getScreenCode()) && SuperModel.getInstance().getPreferences().isPushEventEnabled()) {
@@ -133,7 +131,7 @@ public class FirebasePushService extends FirebaseMessagingService {
     // Since android Oreo notification channel is needed.
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       NotificationChannel channel = new NotificationChannel(channelId,
-        "Channel human readable title",
+        "Lifeplus Notification",
         NotificationManager.IMPORTANCE_DEFAULT);
       notificationManager.createNotificationChannel(channel);
     }

+ 10 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/PushMessageManager.java

@@ -16,6 +16,7 @@ import kr.co.zumo.app.lifeplus.bean.PushBean;
 import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
+import kr.co.zumo.app.lifeplus.push.PushMessageBroker;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 
 /**
@@ -148,6 +149,15 @@ public class PushMessageManager {
     }
   }
 
+  public static void onRecived(PushBean bean) {
+    if (null != bean && PushMessageManager.isAvailableCode(bean.getScreenCode())) {
+      Log.d("APP# PushMessageManager | onRecived", "|" + bean.toJson());
+      PushMessageManager manager = PushMessageManager.getStoredManager().addPushBean(bean);
+      PushMessageManager.saveManager(manager);
+      PushMessageBroker.getInstance().push(manager);
+    }
+  }
+
   /**
    * Event 푸시 인지 확인
    * - 설정 - 푸시 알림에 '이벤트 정보 수신'에 해당함.