Parcourir la source

[메인][New] 날씨 데이터 trim

hyodong.min il y a 6 ans
Parent
commit
93aee2345b

+ 19 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIWeatherModule.java

@@ -4,6 +4,7 @@
 package kr.co.zumo.app.lifeplus.model.module;
 
 import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.WeatherBean;
 import kr.co.zumo.app.lifeplus.bean.api.WeatherRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.WeatherResultBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
@@ -21,6 +22,23 @@ import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 public class APIWeatherModule extends LifeplusAPIModule<WeatherRequestBean, WeatherResultBean> {
   @Override
   protected Single<WeatherResultBean> getAPI(WeatherRequestBean requestBean) {
-    return new LifeplusAPIRepository().getWeather(requestBean);
+    return new LifeplusAPIRepository().getWeather(requestBean)
+      .map(weatherResultBean -> {
+        WeatherBean bean = null;
+        if (null != weatherResultBean.getData()) {
+          bean = weatherResultBean.getData();
+          if (null != bean.getWeatherCode()) {
+            bean.setWeatherCode(bean.getWeatherCode().trim());
+          }
+          if (null != bean.getDustCode()) {
+            bean.setDustCode(bean.getDustCode().trim());
+          }
+          if (null != bean.getAreaName()) {
+            bean.setAreaName(bean.getAreaName().trim());
+          }
+        }
+        weatherResultBean.setData(bean);
+        return weatherResultBean;
+      });
   }
 }

+ 7 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainModel.java

@@ -279,14 +279,15 @@ public class MainModel extends Model {
       public void onApiSuccess(WeatherResultBean resultBean) {
 
         if (null != resultBean.getData()) {
-          if (null != resultBean.getData().getWeatherCode()) {
-            weatherCode = resultBean.getData().getWeatherCode();
+          WeatherBean bean = resultBean.getData();
+          if (null != bean.getWeatherCode()) {
+            weatherCode = bean.getWeatherCode();
           }
-          if (null != resultBean.getData().getDustCode()) {
-            dustCode = resultBean.getData().getDustCode();
+          if (null != bean.getDustCode()) {
+            dustCode = bean.getDustCode();
           }
-          if (null != resultBean.getData().getAreaName()) {
-            areaName = resultBean.getData().getAreaName();
+          if (null != bean.getAreaName()) {
+            areaName = bean.getAreaName();
           }
         }