Parcourir la source

배포 버전

rv 2018053001(v 1.1.0)
sanghoonkwon il y a 7 ans
Parent
commit
3100caa995

+ 1 - 0
app/app.iml

@@ -113,6 +113,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />

+ 2 - 2
app/build.gradle

@@ -7,11 +7,11 @@ android {
         minSdkVersion 21
         targetSdkVersion 25
         versionCode 1
-        versionName '1.0.0'
+        versionName '1.1.0'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        buildConfigField "String", "REVISION", "\"2018052901\""
+        buildConfigField "String", "REVISION", "\"2018053001\""
         buildConfigField "String", "RC", "\"rc5\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""

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

@@ -24,7 +24,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

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

@@ -73,11 +73,9 @@ public class HFNetworkUtil extends HanwhaNetworkUtil implements HFNetworkContrac
     private final String PARAM_SEARCH_TAG = "searchTag";
     private final String PARAM_AUTHOR_MEMBER_ID = "author_member_id";
     private final String PARAM_IS_TODAY = "is_today";
-    private final String PARAM_TASK_NAME = "task_name";
     private final String PARAM_DESCRIPTION = "description";
     private final String PARAM_DUE_TO = "due_to";
     private final String PARAM_LIST_REQ_TASKS_MEMBER_INFO = "listReqTasksMemberInfo";
-    private final String PARAM_STATUS = "status";
     private final String PARAM_EVALUATION = "evaluation";
     private final String PARAM_REQ_TASKS_MESSAGE_INFO = "reqTasksMessageInfo";
     private final String PARAM_TOKEN = "token";

+ 1 - 1
app/src/main/java/kr/co/hanwha/hifive/screen/main/setting/MainSettingFragment.java

@@ -222,7 +222,7 @@ public class MainSettingFragment extends BaseFragment implements MainSettingCont
         String rc = "-" + BuildConfig.RC;
         String revision = " (r" + BuildConfig.REVISION + ")";
 
-        if (lastVersion != null && currentVersion != null && lastVersion.equals(currentVersion)) {
+        if (lastVersion != null && currentVersion != null && lastVersion.compareTo(currentVersion) <= 0) {
             mTextViewVersion.setText("v" + currentVersion + rc + revision);
             mTextViewUpdate.setVisibility(View.GONE);
         } else {