Browse Source

Task #1118 [Android] 받는 사람 선택 1명만 가능하게 변경
http://13.124.195.61/redmine/issues/1118

rv 2018052901

sanghoonkwon 7 years ago
parent
commit
906d1e4b0a

+ 1 - 1
app/build.gradle

@@ -11,7 +11,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        buildConfigField "String", "REVISION", "\"2018052801\""
+        buildConfigField "String", "REVISION", "\"2018052901\""
         buildConfigField "String", "RC", "\"rc5\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""

+ 18 - 0
app/src/main/java/kr/co/hanwha/hifive/data/source/TaskDataRepository.java

@@ -88,6 +88,23 @@ public class TaskDataRepository implements TaskDataSource {
     public static void setSelectMember(MemberInfoData data, boolean isSelect) {
         if (sUnverifiedMemberInfo == null) sUnverifiedMemberInfo = new HashMap<>();
 
+        /*
+        http://www.junstarok.com/redmine/issues/1118
+        */
+        if (isSelect) {
+            if (sUnverifiedMemberInfo.size() > 0)
+                sUnverifiedMemberInfo.clear();
+
+            sUnverifiedMemberInfo.put(data.getKey(), data);
+            data.setSelectedTime();
+        } else {
+            if (sUnverifiedMemberInfo.containsKey(data.getKey())) {
+                sUnverifiedMemberInfo.remove(data.getKey());
+                data.clearSelectedTime();
+            }
+        }
+        /*
+        2018.5.29 기획 변경으로 한명만 선택되도록 변경
         if (isSelect) {
             if (sUnverifiedMemberInfo.containsKey(data.getKey()) == false) {
                 sUnverifiedMemberInfo.put(data.getKey(), data);
@@ -99,6 +116,7 @@ public class TaskDataRepository implements TaskDataSource {
                 data.clearSelectedTime();
             }
         }
+         */
     }
 
     // 다시 만들자...너무 구려..머리 맑을떄 다시..

+ 1 - 0
app/src/main/java/kr/co/hanwha/hifive/screen/task/AddTaskSelectMemberActivity.java

@@ -8,6 +8,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SimpleItemAnimator;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;

+ 3 - 1
app/src/main/java/kr/co/hanwha/hifive/screen/task/AddTaskSelectMemberPresenter.java

@@ -89,12 +89,14 @@ public class AddTaskSelectMemberPresenter implements AddTaskSelectMemberContract
 
         mListAdapterModel.setSelectedData(TaskDataRepository.getUnverifyMemberInfo());
 
+        mListAdapterView.notifyDataAll();
+        /*
         if (index != -1) {
             mListAdapterView.notifyDataRangeChanged(index, 1);
-//            mListAdapterView.notifyDataRangeChanged(0, 1);
         } else {
             mListAdapterView.notifyDataAll();
         }
+        */
 
         refreshSelectedMember();
     }

+ 3 - 4
app/src/main/java/kr/co/hanwha/hifive/util/GlideUtil.java

@@ -6,6 +6,7 @@ import android.util.Log;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.hanwha.hifive.util.glide.CropCircleTransformation;
@@ -29,19 +30,17 @@ public class GlideUtil {
     }
 
     public void loadImageCircle(Context context, int resourceId, ImageView imageView) {
-//        Glide.with(context).load(resourceId).bitmapTransform(new CropCircleTransformation(context)).into(imageView);
         Glide.with(context)
                 .load(resourceId)
-                .apply(new RequestOptions().transform(new CropCircleTransformation(context)))
+                .apply(RequestOptions.circleCropTransform())
                 .into(imageView);
     }
 
     public void loadImageCircle(Context context, String url, ImageView imageView) {
         if (TextUtils.isEmpty(url) == false) {
-//            Glide.with(context).load(url).bitmapTransform(new CropCircleTransformation(context)).into(imageView);
             Glide.with(context)
                     .load(url)
-                    .apply(new RequestOptions().transform(new CropCircleTransformation(context)))
+                    .apply(RequestOptions.circleCropTransform())
                     .into(imageView);
         } else Log.e("GlideUtil", "URL is empty");
     }