서명이미지 설정 기능 추가

app/build.gradle

@@ -64,8 +64,8 @@ android {
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://128.127.95.125/\""
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.1.21:8091/\""
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://211.118.215.111:8091/\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.194:8081/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://211.118.215.111:8091/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.194:8081/\""
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://192.168.198.107:443/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://emadev.knuh.kr:8095/eformservice.aspx\""
 

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

@@ -467,6 +467,8 @@ public class ConsentActivity extends AppCompatActivity {
     tvEduBg.setColorFilter(ContextCompat.getColor(mContext, R.color.eduColor), PorterDuff.Mode.SRC_ATOP);
     Drawable tvConsentBg = (Drawable) tvConsent.getBackground();
     tvConsentBg.setColorFilter(ContextCompat.getColor(mContext, R.color.consentColor), PorterDuff.Mode.SRC_ATOP);
+    Drawable tvUpdateSignBg = (Drawable) tvUpdateSign.getBackground();
+    tvUpdateSignBg.setColorFilter(ContextCompat.getColor(mContext, R.color.consentColor), PorterDuff.Mode.SRC_ATOP);
   }
 
   private void setTopMenuEvent() {

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

@@ -87,7 +87,6 @@ public class CustomSignDialog extends Dialog {
   }
 
   private void init() {
-
     setLayout();
     setEvent();
   }

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

@@ -27,7 +27,6 @@ public class CustomSignPad extends Dialog {
   private Button btnConfirm;
   private Button btnInit;
 
-  private LinearLayout signPadLayout;
   private CustomSignPadListener customSignPadListener;
 
   private Bitmap signImage;
@@ -81,8 +80,6 @@ public class CustomSignPad extends Dialog {
     Drawable btnInitBackGround   = (Drawable) btnInit.getBackground();
     btnInitBackGround.setColorFilter(ContextCompat.getColor(mContext, R.color.alertCancelColor), PorterDuff.Mode.SRC_ATOP);
 
-    signPadLayout = (LinearLayout) findViewById(R.id.signPadLayout);
-
     if (signImage != null) {
       signPad.setSignatureBitmap(signImage);
       signPad.setEnabled(false);

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

@@ -28,7 +28,6 @@
                 android:textSize="20sp"
                 android:textStyle="bold" />
         </RelativeLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -37,7 +36,6 @@
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
             android:weightSum="1">
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -46,7 +44,6 @@
                 android:layout_marginBottom="14dp"
                 android:weightSum="4"
                 android:orientation="vertical">
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -90,7 +87,6 @@
                             android:layout_weight="0.8"
                             android:src="@drawable/ic_search_black_24dp"/ -->
                     </LinearLayout>
-
                     <View
                         android:layout_width="1dp"
                         android:layout_height="match_parent"
@@ -122,7 +118,6 @@
                         android:singleLine="false"
                         android:textColor="@color/black" />
                 </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
@@ -147,14 +142,12 @@
                         android:layout_width="1dp"
                         android:layout_height="match_parent"
                         android:background="@color/black" />
-
                     <LinearLayout
                         android:id="@+id/startSignLayout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:orientation="horizontal"
                         android:layout_weight="0.25" >
-
                         <ImageView
                             android:id="@+id/ivSignImage"
                             android:layout_width="match_parent"

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

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginVertical="200dp"
+    android:layout_marginVertical="220dp"
+    android:layout_marginHorizontal="120dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/department_layer">
 
@@ -37,7 +38,6 @@
             android:layout_marginRight="14dp"
             android:weightSum="1">
             <LinearLayout
-                android:id="@+id/signPadLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/sign_edge"
@@ -75,7 +75,6 @@
                     android:textColor="@color/white"
                     android:textSize="16sp"
                     android:text="@string/confirm"/>
-
                 <Button
                     android:id="@+id/btnInit"
                     style="?android:attr/borderlessButtonStyle"
@@ -90,7 +89,6 @@
                     android:textColor="@color/white"
                     android:textSize="16sp"
                     android:background="@drawable/shape2" />
-
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -170,16 +170,16 @@
     <string name="whiteList">동의서 저장을 위해서 \"배터리 사용량 최적화 중지\" 허용이 필요합니다.</string>
 
     <!-- 전자 서명이미지 수정 및 추가에 대한 string -->
-    <string name="updateSign">서명 수정</string>
+    <string name="updateSign">서명 이미지</string>
     <string name="signDialog">서명 이미지 설정</string>
     <string name="userId">사원번호</string>
     <string name="userNm">성명</string>
     <string name="signImage">서명 이미지</string>
     <string name="createSign">서명 이미지 작성</string>
     <string name="initialize">초기화</string>
-    <string name="signDataError">사용자 정보 조회에 실패하였습니다 \n문의: 의료정보팀</string>
+    <string name="signDataError">사용자 정보 조회에 실패하였습니다 \n문의: 보건의료정보관리팀</string>
     <string name="okSignImgSet">서명이미지를 저장하였습니다</string>
     <string name="setSignImage">서명이미지를 저장하시겠습니까?</string>
-    <string name="setSignImageError">서명이미지 저장에 실패하였습니다 \n문의: 의료정보팀</string>
+    <string name="setSignImageError">서명이미지 저장에 실패하였습니다 \n문의: 보건의료정보관리팀</string>
 
 </resources>