Browse Source

Bug #1227 [Android] 하단 탭 메뉴명 오류 (유닛 -> 관리로 수정)
http://13.124.195.61/redmine/issues/1227

rv 2018070401

sanghoonkwon 7 years ago
parent
commit
d3876aee8e

+ 0 - 1
app/app.iml

@@ -98,7 +98,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />

+ 2 - 2
app/build.gradle

@@ -11,7 +11,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        buildConfigField "String", "REVISION", "\"2018070301\""
+        buildConfigField "String", "REVISION", "\"2018070401\""
         buildConfigField "String", "RC", "\"rc6\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""
@@ -20,7 +20,7 @@ android {
 
         buildConfigField "String", "REAL_URL", "\"https://qtalk.dreamplus.center/newgw/a/v2\""
         buildConfigField "String", "DEV_URL", "\"https://qtalk-dev.dreamplus.center/newgw/a/v2\""
-        buildConfigField "String", "LOCAL_URL", "\"http://192.168.0.156:38999/a/v2\""
+        buildConfigField "String", "LOCAL_URL", "\"http://192.168.0.38:38999/a/v2\""
 
         buildConfigField "String", "DOWNLOAD_URL", "\"http://qtalk.dreamplus.center/downloads/\""
     }

+ 0 - 3
app/src/main/java/kr/co/hanwha/hifive/screen/task/TaskDetailActivity.java

@@ -19,8 +19,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
-import java.lang.reflect.Member;
-
 import kr.co.hanwha.hifive.R;
 import kr.co.hanwha.hifive.adapter.TaskDetailListAdapter;
 import kr.co.hanwha.hifive.adapter.TaskHistoryListAdapter;
@@ -32,7 +30,6 @@ import kr.co.hanwha.hifive.data.source.MemberDataRepository;
 import kr.co.hanwha.hifive.dialog.HFDefaultDialog;
 import kr.co.hanwha.hifive.enums.BaseAnimationType;
 import kr.co.hanwha.hifive.enums.BaseToolbarType;
-import kr.co.hanwha.hifive.enums.TaskFlagType;
 import kr.co.hanwha.hifive.enums.TaskStatusType;
 import kr.co.hanwha.hifive.screen.task.contract.TaskDetailContract;
 import kr.co.hanwha.hifive.util.HFActivityUtil;

+ 1 - 1
app/src/main/res/layout/activity_main.xml

@@ -129,7 +129,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:duplicateParentState="true"
-                android:text="@string/main_gnb_project" />
+                android:text="@string/main_gnb_setting" />
         </LinearLayout>
 
     </LinearLayout>