[메인][Bug] 날씨 정보 null 일 경우 기본값 사용

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainContentsWeatherHolder.java

@@ -268,7 +268,13 @@ public class MainContentsWeatherHolder extends MainContentsHolder {
 
     string2 = ResourceUtil.getString(stringId2);
     string1 = ResourceUtil.getString(stringId1);
-    stringIdsBottom.add(string2);
+    // 먼지 데이터 없으면 제외
+    if (stringId2 == R.string.empty_string) {
+      stringIdsTop.remove(0);
+    }
+    else {
+      stringIdsBottom.add(string2);
+    }
     stringIdsBottom.add(string1);
 
     bottomFading = new TextFading(layoutWeatherBottom, textBottomView, stringIdsBottom, 600);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainModel.java

@@ -295,9 +295,15 @@ public class MainModel extends Model {
       public void onApiSuccess(WeatherResultBean resultBean) {
 
         if (null != resultBean.getData()) {
-          weatherCode = resultBean.getData().getWeatherCode();
-          dustCode = resultBean.getData().getDustCode();
-          areaName = resultBean.getData().getAreaName();
+          if (null != resultBean.getData().getWeatherCode()) {
+            weatherCode = resultBean.getData().getWeatherCode();
+          }
+          if (null != resultBean.getData().getDustCode()) {
+            dustCode = resultBean.getData().getDustCode();
+          }
+          if (null != resultBean.getData().getAreaName()) {
+            areaName = resultBean.getData().getAreaName();
+          }
         }
 
         onResult(new Event.Builder(Event.RESULT).integer(Event.LOADING_WEATHER).build());
@@ -385,7 +391,7 @@ public class MainModel extends Model {
   private boolean isNetworkEnabled;
   private double latitude;
   private double longitude;
-  private String areaName;
+  private String areaName = "서울";
 
 
   private void prepareLocation() {