浏览代码

Task #1142 [Android] 멤버 목록 조회 API 변경
http://13.124.195.61/redmine/issues/1142

Task #1144 [Android] 캠페인 조회시(Task 선택) 멤버 한명만 선택 되도록 변경
http://13.124.195.61/redmine/issues/1144

sanghoonkwon 7 年之前
父节点
当前提交
7009da373a

+ 1 - 1
.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Apr 04 09:41:55 KST 2018
+#Thu Jun 07 15:16:50 KST 2018
 gradle.version=4.4
 gradle.version=4.4

+ 2 - 2
app/src/main/java/kr/co/hanwha/hifive/network/HFNetworkUtil.java

@@ -145,7 +145,7 @@ public class HFNetworkUtil extends HanwhaNetworkUtil implements HFNetworkContrac
     /**************************************************
     /**************************************************
      * 모든 Member 목록
      * 모든 Member 목록
      **************************************************/
      **************************************************/
-    protected final String MEMBERS_GET_ALL = BASE_URL + "/members/get/all";
+    protected final String MEMBERS_GET_ALL_DROPDOWN = BASE_URL + "/members/get/all/dropdown";
     /**************************************************
     /**************************************************
      * 푸쉬 목록
      * 푸쉬 목록
      **************************************************/
      **************************************************/
@@ -323,7 +323,7 @@ public class HFNetworkUtil extends HanwhaNetworkUtil implements HFNetworkContrac
     @Override
     @Override
     public void requestMemberAll(@NonNull Context context, @NonNull String encryption_member_id, @Nullable HanwhaNetworkCallback callback) {
     public void requestMemberAll(@NonNull Context context, @NonNull String encryption_member_id, @Nullable HanwhaNetworkCallback callback) {
         HanwhaNetworkClient.REST rest = HanwhaNetworkClient.REST.POST;
         HanwhaNetworkClient.REST rest = HanwhaNetworkClient.REST.POST;
-        String url = MEMBERS_GET_ALL;
+        String url = MEMBERS_GET_ALL_DROPDOWN;
         HashMap<String, Object> map = new HashMap<>();
         HashMap<String, Object> map = new HashMap<>();
         map.put(PARAM_ENCRYPTION_MEMBER_ID, encryption_member_id);
         map.put(PARAM_ENCRYPTION_MEMBER_ID, encryption_member_id);
 
 

+ 7 - 5
app/src/main/java/kr/co/hanwha/hifive/screen/task/AddTaskSelectCampaignPresenter.java

@@ -58,11 +58,6 @@ public class AddTaskSelectCampaignPresenter implements AddTaskSelectCampaignCont
         mAdapterModel.setSelectedCampaignKey(TaskDataRepository.getVerifiedCampaignKey());
         mAdapterModel.setSelectedCampaignKey(TaskDataRepository.getVerifiedCampaignKey());
 
 
         ArrayList<Integer> listMemberInfo = new ArrayList<>();
         ArrayList<Integer> listMemberInfo = new ArrayList<>();
-        // 내 MemberId
-        int memberId = MemberDataRepository.getInstance().getMemberId();
-        if (memberId != 0)
-            listMemberInfo.add(memberId);
-
         // 선택한 멤버들의 ID
         // 선택한 멤버들의 ID
         ArrayList<MemberInfoData> listSelected = TaskDataRepository.getSelectedMemberList();
         ArrayList<MemberInfoData> listSelected = TaskDataRepository.getSelectedMemberList();
         if (listSelected != null) {
         if (listSelected != null) {
@@ -71,6 +66,13 @@ public class AddTaskSelectCampaignPresenter implements AddTaskSelectCampaignCont
             }
             }
         }
         }
 
 
+        if (listMemberInfo.size() == 0) {
+            // 내 MemberId
+            int memberId = MemberDataRepository.getInstance().getMemberId();
+            if (memberId != 0)
+                listMemberInfo.add(memberId);
+        }
+
         // 선택 되어 있는 멤버 정보
         // 선택 되어 있는 멤버 정보
         MemberInfoData info = TaskDataRepository.getMemberInfoData();
         MemberInfoData info = TaskDataRepository.getMemberInfoData();
         if (info != null) {
         if (info != null) {