Bläddra i källkod

KR 선택(삭제 버그) - 버그 수정

sanghoonkwon 7 år sedan
förälder
incheckning
cafb1b1682

+ 1 - 1
app/src/main/java/kr/co/hanwha/hifive/HFApplication.java

@@ -42,7 +42,7 @@ public class HFApplication extends Application {
      */
     public static boolean DEV_LOG = false;
 
-    public static SERVER_TYPE SERVER = SERVER_TYPE.DEV;
+    public static SERVER_TYPE SERVER = SERVER_TYPE.REAL;
 
     /**************************************************
      * Activity

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

@@ -237,6 +237,7 @@ public class TaskDataRepository implements TaskDataSource {
 
     public static void clearSelectedCampaignData() {
         sVerifiedCampaignKey = "";
+        sUnverifiedCampaignKey = "";
         sCampaignData = null;
     }
 

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

@@ -60,7 +60,6 @@ public class AddTaskActivity extends BaseActivity implements AddTaskContract.Vie
 
     private boolean isEdit = false;
     private boolean isReRequest = false;
-    private boolean isRequest = false;
     private boolean isKeyboardShow = false;
     private boolean isKeyboardStatus = false;
 

+ 0 - 9
app/src/main/java/kr/co/hanwha/hifive/screen/task/AddTaskPresenter.java

@@ -149,15 +149,6 @@ public class AddTaskPresenter implements AddTaskContract.Presenter {
         }).show();
     }
 
-    @Override
-    public boolean isMyTask() {
-        ArrayList<MemberInfoData> list = TaskDataRepository.getSelectedMemberList();
-        if (list != null && list.size() == 1) {
-            return (list.get(0).getMember_id() == MemberDataRepository.getInstance().getMemberId());
-        }
-        return false;
-    }
-
     @Override
     public boolean isRequest() {
         ArrayList<MemberInfoData> list = TaskDataRepository.getSelectedMemberList();

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

@@ -71,11 +71,6 @@ public interface AddTaskContract {
          */
         void showCalendarDialog();
 
-        /**
-         * 내게 쓰는 TASK 인지 확인
-         */
-        boolean isMyTask();
-
         /**
          * 요청 TASK 인지 확인
          *

+ 2 - 2
app/src/main/res/values/strings.xml

@@ -166,8 +166,8 @@
     <string name="add_task_no_repeat">반복없음</string>
     <string name="add_task_select_member">받는 사람 선택</string>
 
-    <string name="add_task_select_campaign">KR 선택</string>
-    <string name="add_task_select_campaign_hint">KR (선택)</string>
+    <string name="add_task_select_campaign">OKR 선택</string>
+    <string name="add_task_select_campaign_hint">OKR (선택)</string>
 
     <string name="task_detail_sender">님이</string>
     <string name="task_detail_receiver">님에게 보냄</string>