[카테고리메인][Common] 필터 선택된 값 data에 추가

app/src/main/java/kr/co/zumo/app/lifeplus/bean/FilterBean.java

@@ -20,10 +20,20 @@ public class FilterBean extends JsonBeanBase {
 
   private int categoryId;
   private int checkedIndex;
+  private String checkedValue;
 
-  public FilterBean(int categoryId, int checkedIndex) {
+  public FilterBean(int categoryId, int checkedIndex, String checkedValue) {
     this.categoryId = categoryId;
     this.checkedIndex = checkedIndex;
+    this.checkedValue = checkedValue;
+  }
+
+  public String getCheckedValue() {
+    return checkedValue;
+  }
+
+  public void setCheckedValue(String checkedValue) {
+    this.checkedValue = checkedValue;
   }
 
   public int getCategoryId() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/CustomSquareCheckBox.java

@@ -81,4 +81,9 @@ public class CustomSquareCheckBox extends ConstraintLayout  {
   public void setChecked(boolean isChecked){
     checkBox.setChecked(isChecked);
   }
+
+  public String getText(){
+    return checkBox.getText().toString();
+  }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategoryFirstMainFilterDialog.java

@@ -123,34 +123,34 @@ public class CategoryFirstMainFilterDialog extends DialogBase<ICustomFilterListe
     for (int i = 0; i < firstCategoryCheckboxList.size(); ++i) {
       CustomSquareCheckBox firstCategoryCheckBox = firstCategoryCheckboxList.get(i);
       if (firstCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_FIRST_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_FIRST_ID, i, firstCategoryCheckBox.getText()));
       }
     }
 
     for (int i = 0; i < secondCategoryCheckboxList.size(); ++i) {
       CustomSquareCheckBox secondCategoryCheckBox = secondCategoryCheckboxList.get(i);
       if (secondCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_SECOND_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_SECOND_ID, i, secondCategoryCheckBox.getText()));
       }
     }
 
     for (int i = 0; i < thirdCategoryCheckBoxList.size(); ++i) {
       CustomSquareCheckBox thirdCategoryCheckBox = thirdCategoryCheckBoxList.get(i);
       if (thirdCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_THIRD_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_THIRD_ID, i, thirdCategoryCheckBox.getText()));
       }
     }
 
     for (int i = 0; i < fourthCategoryCheckBoxList.size(); ++i) {
       CustomSquareCheckBox fourthCategoryCheckBox = fourthCategoryCheckBoxList.get(i);
       if (fourthCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_FOURTH_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_FOURTH_ID, i, fourthCategoryCheckBox.getText()));
       }
     }
 
     //주차여부
     if (fifthCategoryCheckBox.isChecked()) {
-      data.add(new FilterBean(FilterBean.CATEGORY_FIFTH_ID, 0));
+      data.add(new FilterBean(FilterBean.CATEGORY_FIFTH_ID, 0, fifthCategoryCheckBox.getText()));
     }
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategorySecondMainFilterDialog.java

@@ -110,7 +110,7 @@ public class CategorySecondMainFilterDialog extends DialogBase<ICustomFilterList
     for (int i = 0; i < firstCategoryCheckboxList.size(); ++i) {
       CustomSquareCheckBox firstCategoryCheckBox = firstCategoryCheckboxList.get(i);
       if (firstCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_FIRST_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_FIRST_ID, i, firstCategoryCheckBox.getText()));
       }
 
     }
@@ -118,21 +118,21 @@ public class CategorySecondMainFilterDialog extends DialogBase<ICustomFilterList
     for (int i = 0; i < secondCategoryCheckboxList.size(); ++i) {
       CustomSquareCheckBox secondCategoryCheckBox = secondCategoryCheckboxList.get(i);
       if (secondCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_SECOND_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_SECOND_ID, i, secondCategoryCheckBox.getText()));
       }
     }
 
     for (int i = 0; i < thirdCategoryCheckBoxList.size(); ++i) {
       CustomSquareCheckBox thirdCategoryCheckBox = thirdCategoryCheckBoxList.get(i);
       if (thirdCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_THIRD_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_THIRD_ID, i, thirdCategoryCheckBox.getText()));
       }
     }
 
     for (int i = 0; i < fourthCategoryCheckBoxList.size(); ++i) {
       CustomSquareCheckBox fourthCategoryCheckBox = fourthCategoryCheckBoxList.get(i);
       if (fourthCategoryCheckBox.isChecked()) {
-        data.add(new FilterBean(FilterBean.CATEGORY_FOURTH_ID, i));
+        data.add(new FilterBean(FilterBean.CATEGORY_FOURTH_ID, i, fourthCategoryCheckBox.getText()));
       }
     }
   }

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

@@ -99,7 +99,7 @@ public class FirstCategoryMainPresenter extends Presenter<BlankModel, IView> {
           .listener(new ICustomFilterListener() {
             @Override
             public void onFilterResult(ArrayList<FilterBean> list) {
-              Log.w("APP# FirstCategoryMainPresenter | onFilterResult", "|" + list.size());
+              Log.w("APP# FirstCategoryMainPresenter | onFilterResult", "|" + list.get(0).getCheckedValue());
             }
           })
           .show();