Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/push/FirebasePushService.java

@@ -66,14 +66,14 @@ public class FirebasePushService extends FirebaseMessagingService {
 
     // Check if message contains a data payload.
     if (remoteMessage.getData().size() > 0) {
-//      Log.d("APP# FirebasePushService | onMessageReceived", "|" + "Message data payload: " + remoteMessage.getData());
+      Log.d("APP# FirebasePushService | onMessageReceived", "|" + "Message data payload: " + remoteMessage.getData());
 
       Map<String, String> data = remoteMessage.getData();
 
       Gson gson = new Gson();
       JsonElement jsonElement = gson.toJsonTree(data);
       PushBean bean = gson.fromJson(jsonElement, PushBean.class);
-//      Log.d("APP# FirebasePushService | onMessageReceived", "|" + bean.toJson());
+      Log.d("APP# FirebasePushService | onMessageReceived", "|" + bean.toJson());
 
       if (null != bean && PushMessageManager.isAvailableCode(bean.getScreenCode())) {
         PushMessageManager manager = PushMessageManager.getStoredManager().addPushBean(bean);

app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -5,6 +5,8 @@ package kr.co.zumo.app.lifeplus.network.api;
 
 import com.google.gson.Gson;
 
+import java.util.List;
+
 import io.reactivex.Single;
 import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.AuthNumberRequestBean;
@@ -92,6 +94,7 @@ import kr.co.zumo.app.lifeplus.bean.api.WidgetResultBean;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryID;
 import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
 
 /**
  * LifeplusAPIService
@@ -395,7 +398,7 @@ public class LifeplusAPIService implements LifeplusAPI {
   }
 
   @Override
-  public Single<EventUploadImageResultBean> uploadImage(MultipartBody.Part file, RequestBean bean) {
+  public Single<EventUploadImageResultBean> uploadImage(RequestBody itemNo, List<MultipartBody.Part> files) {
     return null;
   }