관리 : 직급 표시 - 버그 수정

app/src/main/AndroidManifest.xml

@@ -86,6 +86,9 @@
             android:name=".screen.main.MainActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".screen.main.home.MainOKRActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".screen.task.TaskDetailActivity"
             android:screenOrientation="portrait" />

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.REAL;
+    public static SERVER_TYPE SERVER = SERVER_TYPE.DEV;
 
     /**************************************************
      * Activity

app/src/main/java/kr/co/hanwha/hifive/adapter/viewholder/TaskDetailHeaderViewHolder.java

@@ -123,8 +123,9 @@ public class TaskDetailHeaderViewHolder extends BaseViewHolder {
 
                 if (root.getListCampaigns() != null && root.getListCampaigns().size() > 0) {
                     mLayoutCampaign.setVisibility(View.VISIBLE);
+                    String projectName = root.getListCampaigns().get(0).getProject_name();
                     mTextViewCampaign.setText(root.getListCampaigns().get(0).getCampaign_desc()
-                            + (TextUtils.isEmpty(data.getProject_name()) ? "" : "  |  " + data.getProject_name()));
+                            + (TextUtils.isEmpty(projectName) ? "" : "  |  " + projectName));
 //                    mTextViewProject.setText(TextUtils.isEmpty(data.getProject_name()) ? "" : data.getProject_name());
                 } else {
                     mLayoutCampaign.setVisibility(View.GONE);

app/src/main/java/kr/co/hanwha/hifive/screen/main/home/MainOKRActivity.java

@@ -0,0 +1,35 @@
+package kr.co.hanwha.hifive.screen.main.home;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import kr.co.hanwha.hifive.base.BaseActivity;
+import kr.co.hanwha.hifive.enums.BaseAnimationType;
+import kr.co.hanwha.hifive.enums.BaseToolbarType;
+
+public class MainOKRActivity extends BaseActivity{
+    @Override
+    protected int getContentViewResource() {
+        return 0;
+    }
+
+    @Override
+    protected BaseToolbarType isToolbarStyle() {
+        return null;
+    }
+
+    @Override
+    protected BaseAnimationType isShowActivityAnimation() {
+        return null;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}

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

@@ -46,8 +46,8 @@ import kr.co.hanwha.hifive.view.HFSettingMenuUnitView;
 
 public class MainSettingFragment extends BaseFragment implements MainSettingContract.View {
     private TextView mTextViewName;
-    private TextView mTextViewPosition1;
-    private View mViewLine1;
+    private TextView mTextViewDepartmentPosition;
+    private View mViewDepartmentLine;
     private TextView mTextViewId;
 
     private LinearLayout mLayoutDepartment;
@@ -74,8 +74,8 @@ public class MainSettingFragment extends BaseFragment implements MainSettingCont
         View parent = inflater.inflate(R.layout.fragment_main_setting, container, false);
 
         mTextViewName = (TextView) parent.findViewById(R.id.name_textView);
-        mTextViewPosition1 = (TextView) parent.findViewById(R.id.position1_textView);
-        mViewLine1 = (View) parent.findViewById(R.id.line1_view);
+        mTextViewDepartmentPosition = (TextView) parent.findViewById(R.id.departmentPosition_textView);
+        mViewDepartmentLine = (View) parent.findViewById(R.id.departmentLine_view);
         mTextViewId = (TextView) parent.findViewById(R.id.id_textView);
 
         mLayoutDepartment = (LinearLayout) parent.findViewById(R.id.department_linearLayout);
@@ -147,26 +147,26 @@ public class MainSettingFragment extends BaseFragment implements MainSettingCont
         String department = HFInfoUtil.getDepartmentText(getActivity());
         if (TextUtils.isEmpty(department)) {
             if (TextUtils.isEmpty(position)) {
-                mViewLine1.setVisibility(View.GONE);
-                mTextViewPosition1.setVisibility(View.GONE);
+                mViewLine2.setVisibility(View.GONE);
+                mTextViewPosition2.setVisibility(View.GONE);
             } else {
-                mTextViewPosition1.setText(position);
-                mViewLine1.setVisibility(View.VISIBLE);
-                mTextViewPosition1.setVisibility(View.VISIBLE);
+                mTextViewPosition2.setText(position);
+                mViewLine2.setVisibility(View.VISIBLE);
+                mTextViewPosition2.setVisibility(View.VISIBLE);
             }
 
             mLayoutDepartment.setVisibility(View.GONE);
         } else {
-            mTextViewPosition1.setVisibility(View.GONE);
-            mViewLine1.setVisibility(View.GONE);
+            mViewLine2.setVisibility(View.GONE);
+            mTextViewPosition2.setVisibility(View.GONE);
 
             if (TextUtils.isEmpty(position)) {
-                mViewLine2.setVisibility(View.GONE);
-                mTextViewPosition2.setVisibility(View.GONE);
+                mViewDepartmentLine.setVisibility(View.GONE);
+                mTextViewDepartmentPosition.setVisibility(View.GONE);
             } else {
-                mTextViewPosition2.setText(position);
-                mViewLine2.setVisibility(View.VISIBLE);
-                mTextViewPosition2.setVisibility(View.VISIBLE);
+                mTextViewDepartmentPosition.setText(position);
+                mViewDepartmentLine.setVisibility(View.VISIBLE);
+                mTextViewDepartmentPosition.setVisibility(View.VISIBLE);
             }
 
             mLayoutDepartment.setVisibility(View.VISIBLE);

app/src/main/res/layout/activity_main_okr.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/fragment_main_setting.xml

@@ -63,14 +63,13 @@
                     android:visibility="gone">
 
                     <kr.co.hanwha.hifive.view.FontTextView
-                        android:id="@+id/position1_textView"
+                        android:id="@+id/department_textView"
                         style="@style/font_notosans_r_13sp_grey01"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="" />
+                        android:layout_height="wrap_content" />
 
                     <View
-                        android:id="@+id/line1_view"
+                        android:id="@+id/departmentLine_view"
                         android:layout_width="0.5dp"
                         android:layout_height="10dp"
                         android:layout_marginLeft="8.5dp"
@@ -78,10 +77,11 @@
                         android:background="@color/hf_grey31" />
 
                     <kr.co.hanwha.hifive.view.FontTextView
-                        android:id="@+id/department_textView"
+                        android:id="@+id/departmentPosition_textView"
                         style="@style/font_notosans_r_13sp_grey01"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:text="" />
                 </LinearLayout>
 
                 <LinearLayout