.

app/build.gradle

@@ -33,8 +33,10 @@ android {
         debug {
 //            buildConfigField "com.dbs.mplus.knuh.setting.DeployPhase", "DEPLOY_PHASE", "com.dbs.mplus.knuh.setting.DeployPhase.Debug"
             buildConfigField "String", "NAME_SPACE", "\"http://tempuri.org/\""
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFile 'proguard-rules.pro'
+//            proguardFile 'proguard-debug.pro'
 
             ndk {
                 abiFilters "armeabi-v7a", "armeabi" // includes ARM SO files only, so no x86 SO file
@@ -45,7 +47,7 @@ android {
             signingConfig signingConfigs.release
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
             buildConfigField "String", "NAME_SPACE", "\"http://tempuri.org/\""
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
             ndk {
@@ -69,14 +71,16 @@ android {
 //            versionCode 1
 //            versionName "1.0.0"
 
+            applicationIdSuffix ".new"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema031.knuh.kr:9091/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema031.knuh.kr:9091/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema031.knuh.kr:9096/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://ema031.knuh.kr:9090/eformservice.aspx\""
             buildConfigField "String", "INST_CD", "\"031\""
-            manifestPlaceholders = [appLabel: "본원운영"]
+            manifestPlaceholders = [appLabel: "본원NEW"]
         }
         bonwon_dev {
-            applicationIdSuffix ".dev1"
+            applicationIdSuffix ".dev1_new"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
             buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema031.knuh.kr:9096/\""
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://emadev.knuh.kr:8096\""
@@ -87,15 +91,16 @@ android {
             manifestPlaceholders = [appLabel: "본원교육"]
         }
         chilgok {
-            applicationIdSuffix ".chilgok"
+            applicationIdSuffix ".chilgok_new"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema032.knuh.kr:8091/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema032.knuh.kr:8091/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema031.knuh.kr:8096/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://ema032.knuh.kr:8090/eformservice.aspx\""
             buildConfigField "String", "INST_CD", "\"032\""
             manifestPlaceholders = [appLabel: "칠곡운영"]
         }
         chilgok_dev {
-            applicationIdSuffix ".chilgok.dev1"
+            applicationIdSuffix ".chilgok.dev1_new"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://emadev.knuh.kr:9096/\""
             buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.101.93:9096/\""

app/proguard-rules.pro

@@ -19,3 +19,9 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-dontwarn org.xmlpull.v1.**
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-keep class kr.co.clipsoft.** {*;}
+-keep class com.lumensoft.** {*;}
+-keep class com.androidKmi.** {*;}

app/src/main/java/com/dbs/mplus/knuh/activity/ConsentActivity.java

@@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
+import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
@@ -13,7 +14,9 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -39,6 +42,7 @@ import com.dbs.mplus.knuh.consent.sign.SignWrapper;
 import com.dbs.mplus.knuh.customView.CustomAlertDialog;
 import com.dbs.mplus.knuh.customView.CustomRadioGroup;
 import com.dbs.mplus.knuh.customView.LoadingProgress;
+import com.dbs.mplus.knuh.customView.SoftKeyboard;
 import com.dbs.mplus.knuh.fragment.HistoryFragment;
 import com.dbs.mplus.knuh.fragment.MarkerFragment;
 import com.dbs.mplus.knuh.fragment.SearchFragment;
@@ -157,6 +161,14 @@ public class ConsentActivity extends AppCompatActivity {
   public String indexPage = "";
   public String drKind    = "";
 
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+    imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+
+    return true;
+  }
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -387,6 +399,7 @@ public class ConsentActivity extends AppCompatActivity {
       public void onPageScrollStateChanged(int i) {
       }
     });
+
   }
 
   public void showSingButtonDialog(String message) {
@@ -451,5 +464,8 @@ public class ConsentActivity extends AppCompatActivity {
     }
 
     super.onDestroy();
+//    if (softKeyboard != null) {
+//      softKeyboard.unRegisterSoftKeyboardCallback();
+//    }
   }
 }

app/src/main/java/com/dbs/mplus/knuh/activity/LoginActivity.java

@@ -96,8 +96,8 @@ public class LoginActivity extends AppCompatActivity {
     ivLogo.setImageResource(logo);
     certCheck.setChecked(true);
 
-    etId.setText("EMR");
-    etPasswd.setText("wjstkstlf1!");
+//    etId.setText("EMR");
+//    etPasswd.setText("wjstkstlf1!");
 
     // 의사
 //    etId.setText("96070");

app/src/main/java/com/dbs/mplus/knuh/consent/ConsentCreateParam.java

@@ -156,20 +156,22 @@ public class ConsentCreateParam {
 
     // 새 서식을 작성할 경우
     if (rid == 0 || consentStateEng.equals(ConsentConfig.UNFINISHED)) {
+      String[] ipAddressAr = Util.getIpAddress(mContext).split("[.]");
 
+      String ipAddress = ipAddressAr[2] + "." + ipAddressAr[3];
       map.put("parCMDCFT_device", "M");
-      map.put("parCMDCFT_1PrintIP", "");
+      map.put("parCMDCFT_1PrintIP", ipAddress);
       map.put("parCMDCHD_1PatientNo", pid);
       map.put("parCMDCHD_1SexAge", sa);
       map.put("parCMDCHD_1PatientNm", patientName);
       map.put("parCMDCHD_1SocialSecuNo", juminNo);
       map.put("parNUR_Fast_HospitalroomNo", roomCd);
-      map.put("parCMDCHD_1VisitDt", inDd);
+      map.put("parCMDCHD_1VisitDt", Util.addSlashDate(inDd));
       map.put("parCMDCHD_1DepartmentNm", deptEngAbbr);
       map.put("parCMDCHD_1DepartmentCd", ordDeptCd);
-      map.put("parCMDCBD_PopupV1_SurgeryDepartment", perfDrFlag.equals("전문의") ? perfDrDept : "");
+
       map.put("parCMDCBD_PopupV1_SurgeryDoctor", perfDrNm);
-      map.put("parCMDCBD_PopupV1_DxNm", opDiagNm.equals("") ? dxNm : "");
+      map.put("parCMDCBD_PopupV1_DxNm", !opDiagNm.equals("") ? dxNm : "");
       map.put("parCMDCBD_DiseaseBox_bp", bp);
       map.put("parCMDCBD_DiseaseBox_dm", dm);
       map.put("parCMDCBD_DiseaseBox_1CardioVascular", heart);
@@ -198,13 +200,15 @@ public class ConsentCreateParam {
       map.put("parCMSGBD_PT_tel", telNum);
       map.put("parCMSGBD_Insukind", insuKind);
       map.put("parCMSGBD_PT_birthday", juminNo.split("-")[0]);
+      Log.e(TAG, "opopopopop -- > " + opNm);
       map.put("parCMDCBD_PopupV1_OPNm", opNm.equals("") ? consentFormListVO.getOpNm() : opNm);
       map.put("parCMDCBD_PopupV1_SPNm", opNm.equals("") ? consentFormListVO.getOpNm() : opNm);
       map.put("parCMSGBD_INPUTTelNo", userVO.getUserTelNo());
       map.put("parDEFAULT_DUTINSTCD", instCd);
 //      map.put("parDEFAULT_POPUP_PATH", "https://ema031.knuh.kr:9091");
       map.put("parDEFAULT_POPUP_PATH", BuildConfig.CONSENT_SERVER_URL);
-      map.put("parCMDCBD_PopupV1_SurgeryCommonDepartment", perfDrFlag.equals("전공의") ? "" : perfDrDept);
+      map.put("parCMDCBD_PopupV1_SurgeryDepartment", perfDrFlag.equals("전문의") ? perfDrDept : "");
+      map.put("parCMDCBD_PopupV1_SurgeryCommonDepartment", perfDrFlag.equals("전공의") ? perfDrDept : "");
       map.put("parCMDCBD_Anst1DrNm", anstDrNm1);
       map.put("parCMDCBD_Anst1DeptNm", anstDrFlag1.equals("전문의") ? anstDeptNm1 : "");
       map.put("parCMDCBD_Anst1CommonDeptNm", anstDrFlag1.equals("전문의") ? anstDeptNm1 : "");
@@ -233,11 +237,16 @@ public class ConsentCreateParam {
       map.put("ordType", ordType);
       map.put("ward", ward);
       map.put("dschDd", dschDd);
+
+      if(ward.length() > 0 && roomCd.length() > 0) {
+        map.put("parNUR_Fast_HospitalroomNo", ward + '/' + roomCd);
+      }
+
     } else {
       map.put("parCMDCHD_1PatientNo", pid);
       map.put("parCMDCHD_1DepartmentCd", opDeptCd);
       map.put("ordType", ordType);
-      map.put("parCMDCHD_1VisitDt", inDd);
+      map.put("parCMDCHD_1VisitDt", Util.addSlashDate(inDd));
       map.put("ward", ward);
       map.put("parNUR_Fast_HospitalroomNo", roomCd);
       map.put("parCMSGBD_Cretno", cretNo);

app/src/main/java/com/dbs/mplus/knuh/customView/SoftKeyboard.java

@@ -0,0 +1,222 @@
+package com.dbs.mplus.knuh.customView;
+
+/*
+ * Author: Felipe Herranz (felhr85@gmail.com)
+ * Contributors:Francesco Verheye (verheye.francesco@gmail.com)
+ * 		Israel Dominguez (dominguez.israel@gmail.com)
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+public class SoftKeyboard implements View.OnFocusChangeListener {
+  private static final int CLEAR_FOCUS = 0;
+
+  private ViewGroup layout;
+  private int layoutBottom;
+  private InputMethodManager im;
+  private int[] coords;
+  private boolean isKeyboardShow;
+  private SoftKeyboardChangesThread softKeyboardThread;
+  private List<EditText> editTextList;
+
+  private View tempView; // reference to a focused EditText
+
+  public SoftKeyboard(ViewGroup layout, InputMethodManager im) {
+    this.layout = layout;
+    keyboardHideByDefault();
+    initEditTexts(layout);
+    this.im = im;
+    this.coords = new int[2];
+    this.isKeyboardShow = false;
+    this.softKeyboardThread = new SoftKeyboardChangesThread();
+    this.softKeyboardThread.start();
+  }
+
+
+  public void openSoftKeyboard() {
+    if (!isKeyboardShow) {
+      layoutBottom = getLayoutCoordinates();
+      im.toggleSoftInput(0, InputMethodManager.SHOW_IMPLICIT);
+      softKeyboardThread.keyboardOpened();
+      isKeyboardShow = true;
+    }
+  }
+
+  public void closeSoftKeyboard() {
+    if (isKeyboardShow) {
+      im.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+      isKeyboardShow = false;
+    }
+  }
+
+  public void setSoftKeyboardCallback(SoftKeyboardChanged mCallback) {
+    softKeyboardThread.setCallback(mCallback);
+  }
+
+  public void unRegisterSoftKeyboardCallback() {
+    softKeyboardThread.stopThread();
+  }
+
+  public interface SoftKeyboardChanged {
+    public void onSoftKeyboardHide();
+
+    public void onSoftKeyboardShow();
+  }
+
+  private int getLayoutCoordinates() {
+    layout.getLocationOnScreen(coords);
+    return coords[1] + layout.getHeight();
+  }
+
+  private void keyboardHideByDefault() {
+    layout.setFocusable(true);
+    layout.setFocusableInTouchMode(true);
+  }
+
+  /*
+   * InitEditTexts now handles EditTexts in nested views
+   * Thanks to Francesco Verheye (verheye.francesco@gmail.com)
+   */
+  private void initEditTexts(ViewGroup viewgroup) {
+    if (editTextList == null)
+      editTextList = new ArrayList<EditText>();
+
+    int childCount = viewgroup.getChildCount();
+    for (int i = 0; i <= childCount - 1; i++) {
+      View v = viewgroup.getChildAt(i);
+
+      if (v instanceof ViewGroup) {
+        initEditTexts((ViewGroup) v);
+      }
+
+      if (v instanceof EditText) {
+        EditText editText = (EditText) v;
+        editText.setOnFocusChangeListener(this);
+        editText.setCursorVisible(true);
+        editTextList.add(editText);
+      }
+    }
+  }
+
+  /*
+   * OnFocusChange does update tempView correctly now when keyboard is still shown
+   * Thanks to Israel Dominguez (dominguez.israel@gmail.com)
+   */
+  @Override
+  public void onFocusChange(View v, boolean hasFocus) {
+    if (hasFocus) {
+      tempView = v;
+      if (!isKeyboardShow) {
+        layoutBottom = getLayoutCoordinates();
+        softKeyboardThread.keyboardOpened();
+        isKeyboardShow = true;
+      }
+    }
+  }
+
+  // This handler will clear focus of selected EditText
+  private final Handler mHandler = new Handler() {
+    @Override
+    public void handleMessage(Message m) {
+      switch (m.what) {
+        case CLEAR_FOCUS:
+          if (tempView != null) {
+            tempView.clearFocus();
+            tempView = null;
+          }
+          break;
+      }
+    }
+  };
+
+  private class SoftKeyboardChangesThread extends Thread {
+    private AtomicBoolean started;
+    private SoftKeyboardChanged mCallback;
+
+    public SoftKeyboardChangesThread() {
+      started = new AtomicBoolean(true);
+    }
+
+    public void setCallback(SoftKeyboardChanged mCallback) {
+      this.mCallback = mCallback;
+    }
+
+    @Override
+    public void run() {
+      while (started.get()) {
+        // Wait until keyboard is requested to open
+        synchronized (this) {
+          try {
+            wait();
+          } catch (InterruptedException e) {
+            e.printStackTrace();
+          }
+        }
+
+        int currentBottomLocation = getLayoutCoordinates();
+
+        // There is some lag between open soft-keyboard function and when it really appears.
+        while (currentBottomLocation == layoutBottom && started.get()) {
+          currentBottomLocation = getLayoutCoordinates();
+        }
+
+        if (started.get())
+          mCallback.onSoftKeyboardShow();
+
+        // When keyboard is opened from EditText, initial bottom location is greater than layoutBottom
+        // and at some moment equals layoutBottom.
+        // That broke the previous logic, so I added this new loop to handle this.
+        while (currentBottomLocation >= layoutBottom && started.get()) {
+          currentBottomLocation = getLayoutCoordinates();
+        }
+
+        // Now Keyboard is shown, keep checking layout dimensions until keyboard is gone
+        while (currentBottomLocation != layoutBottom && started.get()) {
+          synchronized (this) {
+            try {
+              wait(500);
+            } catch (InterruptedException e) {
+              // TODO Auto-generated catch block
+              e.printStackTrace();
+            }
+          }
+          currentBottomLocation = getLayoutCoordinates();
+        }
+
+        if (started.get())
+          mCallback.onSoftKeyboardHide();
+
+        // if keyboard has been opened clicking and EditText.
+        if (isKeyboardShow && started.get())
+          isKeyboardShow = false;
+
+        // if an EditText is focused, remove its focus (on UI thread)
+        if (started.get())
+          mHandler.obtainMessage(CLEAR_FOCUS).sendToTarget();
+      }
+    }
+
+    public void keyboardOpened() {
+      synchronized (this) {
+        notify();
+      }
+    }
+
+    public void stopThread() {
+      synchronized (this) {
+        started.set(false);
+        notify();
+      }
+    }
+
+  }
+}

app/src/main/java/com/dbs/mplus/knuh/util/Util.java

@@ -14,6 +14,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.text.format.Formatter;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.View;
@@ -67,6 +68,12 @@ import java.util.zip.GZIPOutputStream;
 public class Util {
   private static final String TAG = "Util";
 
+  public static String getIpAddress(Context context) {
+    WifiManager wm = (WifiManager) context.getSystemService(context.WIFI_SERVICE);
+    String ip = Formatter.formatIpAddress(wm.getConnectionInfo().getIpAddress());
+    return ip;
+  }
+
   public static void networkErrorAlert(final AppCompatActivity mActivity) {
     final CustomAlertDialog csAlert = new CustomAlertDialog(mActivity);
     csAlert.show();

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

@@ -2,10 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/mainLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".MainActivity">
 
     <!--상단 툴바, 오른쪽 버튼 2개-->
     <LinearLayout
@@ -26,9 +27,9 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="4dp"
                 android:paddingBottom="4dp"
-                android:src="@drawable/chilgok_logo"/>
+                android:src="@drawable/chilgok_logo" />
 
-<!--            #888888-->
+            <!--            #888888-->
             <TextView
                 android:id="@+id/tvEdu"
                 android:layout_width="wrap_content"
@@ -41,7 +42,7 @@
                 android:paddingRight="16dp"
                 android:text="교육"
                 android:textColor="@color/white"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
         </LinearLayout>
 
@@ -54,10 +55,10 @@
                 android:id="@+id/logoutLayout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/shape_logout"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="6dp"
+                android:background="@drawable/shape_logout"
                 android:padding="4dp">
 
                 <ImageView
@@ -78,11 +79,11 @@
                 android:id="@+id/settingLayout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/shape_btn"
-                android:layout_toLeftOf="@+id/logoutLayout"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="6dp"
+                android:layout_marginRight="8dp"
+                android:layout_toLeftOf="@+id/logoutLayout"
+                android:background="@drawable/shape_btn"
                 android:padding="4dp">
 
                 <ImageView
@@ -104,8 +105,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/settingLayout"
                 android:layout_marginLeft="6sp"
+                android:layout_toLeftOf="@+id/settingLayout"
                 android:text="의사이름"
                 android:textColor="@color/black"
                 android:textSize="16sp" />
@@ -135,19 +136,20 @@
             android:id="@+id/tvConsent"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
             android:background="@drawable/shape2"
             android:gravity="center"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
-            android:layout_marginLeft="16dp"
-            android:textSize="20sp"
             android:text="@string/consent"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"
+            android:textSize="20sp" />
 
     </LinearLayout>
 
     <!--전체레이아웃-->
     <LinearLayout
+        android:id="@+id/viewLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal">
@@ -169,11 +171,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1">
+
             <include
-                layout="@layout/activity_center"
                 android:id="@+id/includeCenter"
+                layout="@layout/activity_center"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
         </LinearLayout>
 
 
@@ -182,84 +185,92 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:background="@color/mainBackGroundColor">
+            android:background="@color/mainBackGroundColor"
+            android:orientation="vertical">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginRight="2dp"
                 android:layout_marginTop="2dp"
+                android:layout_marginRight="2dp"
                 android:layout_marginBottom="2dp"
                 android:background="@color/white"
                 android:orientation="vertical">
 
-<!--                <LinearLayout-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:background="@color/mainBackGroundColor">-->
-<!--                    <TextView-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="match_parent"-->
-<!--                        android:text=""-->
-<!--                        android:textSize="18sp"-->
-<!--                        android:gravity="center"-->
-<!--                        android:paddingTop="8dp"/>-->
-<!--                </LinearLayout>-->
+                <!--                <LinearLayout-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:background="@color/mainBackGroundColor">-->
+                <!--                    <TextView-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="match_parent"-->
+                <!--                        android:text=""-->
+                <!--                        android:textSize="18sp"-->
+                <!--                        android:gravity="center"-->
+                <!--                        android:paddingTop="8dp"/>-->
+                <!--                </LinearLayout>-->
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:background="@color/mainBackGroundColor">
+                    android:background="@color/mainBackGroundColor"
+                    android:orientation="horizontal">
+
                     <LinearLayout
                         android:id="@+id/historyLayout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:background="@drawable/shape_right_top">
+
                         <TextView
                             android:id="@+id/tvHistory"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/history"
-                            android:textSize="16sp"
-                            android:padding="10dp"
                             android:gravity="center"
-                            android:textColor="@color/black"/>
+                            android:padding="10dp"
+                            android:text="@string/history"
+                            android:textColor="@color/black"
+                            android:textSize="16sp" />
                     </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/markerLayout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:background="@drawable/shape_right_top">
+
                         <TextView
                             android:id="@+id/tvMarker"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/marker"
-                            android:textSize="16sp"
-                            android:padding="10dp"
                             android:gravity="center"
-                            android:textColor="@color/black"/>
+                            android:padding="10dp"
+                            android:text="@string/marker"
+                            android:textColor="@color/black"
+                            android:textSize="16sp" />
                     </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/searchLayout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:background="@drawable/shape_right_top">
+
                         <TextView
                             android:id="@+id/tvSearch"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/consentSearch"
-                            android:textSize="16sp"
-                            android:padding="10dp"
                             android:gravity="center"
-                            android:textColor="@color/black"/>
+                            android:padding="10dp"
+                            android:text="@string/consentSearch"
+                            android:textColor="@color/black"
+                            android:textSize="16sp" />
                     </LinearLayout>
                 </LinearLayout>
+
                 <androidx.viewpager.widget.ViewPager
                     android:id="@+id/viewPager"
                     android:layout_width="match_parent"
@@ -269,4 +280,6 @@
 
     </LinearLayout>
     <!--전체레이아웃 끝-->
+
+
 </LinearLayout>

app/src/main/res/values/colors.xml

@@ -5,6 +5,7 @@
     <color name="colorAccent">#D81B60</color>
 
     <color name="black">#000000</color>
+    <color name="black1">#80000000</color>
     <color name="white">#FFFFFF</color>
     <color name="darkGray">#aaaaaa</color>
     <color name="commonColor">#1280D7</color>