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

DCA-318 - [Android] 마이홈 태스크 추가 시 버그 수정

aaron пре 7 година
родитељ
комит
7446f0b836

+ 5 - 3
app/src/main/java/kr/co/hanwha/hifive/adapter/SearchTaskListAdapter.java

@@ -109,9 +109,11 @@ public class SearchTaskListAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         setTaskData();
         setProjectData();
 
-        // 마지막 더보기 체크
-        if (mListData.get(mListData.size() - 1).getType() == MORE) {
-            mListData.get(mListData.size() - 1).setLast(true);
+        if (mListData.size() > 0) {
+            // 마지막 더보기 체크
+            if (mListData.get(mListData.size() - 1).getType() == MORE) {
+                mListData.get(mListData.size() - 1).setLast(true);
+            }
         }
     }
 

+ 1 - 6
app/src/main/java/kr/co/hanwha/hifive/screen/task/AddTaskActivity.java

@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -14,7 +13,6 @@ import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -25,13 +23,11 @@ import kr.co.hanwha.hifive.R;
 import kr.co.hanwha.hifive.base.BaseActivity;
 import kr.co.hanwha.hifive.base.FirebaseAnalyticsInterface;
 import kr.co.hanwha.hifive.data.model.CampaignData;
-import kr.co.hanwha.hifive.data.model.LoginData;
 import kr.co.hanwha.hifive.data.model.MemberInfoData;
 import kr.co.hanwha.hifive.data.model.ProfileData;
 import kr.co.hanwha.hifive.data.model.TaskData;
 import kr.co.hanwha.hifive.data.source.MemberDataRepository;
 import kr.co.hanwha.hifive.data.source.TaskCampaignDataRepository;
-import kr.co.hanwha.hifive.data.source.TaskDataRepository;
 import kr.co.hanwha.hifive.data.source.TaskMemberDataRepository;
 import kr.co.hanwha.hifive.enums.AddTaskType;
 import kr.co.hanwha.hifive.enums.BaseAnimationType;
@@ -39,7 +35,6 @@ import kr.co.hanwha.hifive.enums.BaseToolbarType;
 import kr.co.hanwha.hifive.screen.task.contract.AddTaskContract;
 import kr.co.hanwha.hifive.util.HFActivityUtil;
 import kr.co.hanwha.hifive.util.HFAnalyticsUtil;
-import kr.co.hanwha.hifive.util.HFCommonUtil;
 import kr.co.hanwha.hifive.util.HFDateUtil;
 import kr.co.hanwha.hifive.util.HFSpanUtil;
 import kr.co.hanwha.hifive.view.HFCampaignContainerView;
@@ -151,7 +146,7 @@ public class AddTaskActivity extends BaseActivity implements AddTaskContract.Vie
                 TaskCampaignDataRepository.getInstance().setVerifyCampaignInfo(campaignData.getKey());
                 setCampaignInfo(campaignData);
             }
-            mPresenter.initData();
+            mPresenter.initData(memberInfoData.getMember_id());
         } else {
             int task_id = getIntent().getIntExtra(HFActivityUtil.INTENT_TASK_ID, 0);
             int project_id = getIntent().getIntExtra(HFActivityUtil.INTENT_PROJECT_ID, 0);

+ 7 - 1
app/src/main/java/kr/co/hanwha/hifive/screen/task/AddTaskPresenter.java

@@ -1,7 +1,6 @@
 package kr.co.hanwha.hifive.screen.task;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
@@ -81,6 +80,13 @@ public class AddTaskPresenter implements AddTaskContract.Presenter {
         mView.setDuedate(mDueTo);
     }
 
+    @Override
+    public void initData(int memberId) {
+        mMemberId = memberId;
+        mDueTo = HFDateUtil.getDateFormatToday(HFDateUtil.FORMAT_TASK_ADD_DUEDATE_SERVER);
+        mView.setDuedate(mDueTo);
+    }
+
     @Override
     public void initEditData(@NonNull int task_id, @NonNull int project_id) {
         TaskDataRepository.getInstance().requestGetTaskDetail(getContext(), task_id, project_id, new HanwhaNetworkCallback<TaskDetailRoot>() {

+ 7 - 1
app/src/main/java/kr/co/hanwha/hifive/screen/task/contract/AddTaskContract.java

@@ -9,7 +9,6 @@ import kr.co.hanwha.hifive.base.BasePresenter;
 import kr.co.hanwha.hifive.base.BaseView;
 import kr.co.hanwha.hifive.data.model.CampaignData;
 import kr.co.hanwha.hifive.data.model.MemberInfoData;
-import kr.co.hanwha.hifive.data.model.ProjectCampaignData;
 import kr.co.hanwha.hifive.data.model.TaskData;
 import kr.co.hanwha.hifive.enums.AddTaskType;
 import kr.co.hanwha.hifive.screen.task.AddTaskActivity;
@@ -63,6 +62,13 @@ public interface AddTaskContract {
          */
         void initData();
 
+        /**
+         * 선택된 멤버의 기본 데이터 설정
+         *
+         * @param memberId
+         */
+        void initData(int memberId);
+
         /**
          * 수정할 TASK 데이터 설정
          *