사인패드 다일로그 닫기 버튼 추가

사용자 아이디 클릭시 전체선택
외래일 경우 직군 상관 없이 무조건 확인저장 버튼 활성화

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

@@ -93,10 +93,10 @@ public class LoginActivity extends AppCompatActivity {
       logo = R.drawable.knuh_logo;
     }
     ivLogo.setImageResource(logo);
-//    certCheck.setChecked(true);
+    certCheck.setChecked(true);
 
-    etId.setText("EMR001");
-    etPasswd.setText("wjstkstlf1!");
+//    etId.setText("EMR001");
+//    etPasswd.setText("wjstkstlf1!");
 
     // 의사
 //    etId.setText("96070");

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

@@ -345,15 +345,15 @@ public class ConsentFacade {
      나머지 직군은 비활성화
     **/
     if (instance.indexPage.equals("O")) {
-      if (visibleFlag.equals("Y")) {
-        visible = "true";
-      }
+      visible = "true";
+//      if (visibleFlag.equals("Y")) {
+//      }
     } else {
       if (instance.indexPage.equals("SR")) {
         if (instance.leftMenu.patientState.equals("0")) {
-          if (visibleFlag.equals("Y")) {
+//          if (visibleFlag.equals("Y")) {
             visible = "true";
-          }
+//          }
         }
       } else {
         if (instance.jobKindCd.indexOf("03") == 0) {

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

@@ -142,6 +142,8 @@ public class CustomSignDialog extends Dialog {
     btnConfirm.setOnClickListener(onClickListener);
     btnCancel.setOnClickListener(onClickListener);
     etUserId.setOnEditorActionListener(onEditorActionListener);
+    etUserId.setOnClickListener(onClickListener);
+    etUserId.setOnFocusChangeListener(onFocusChangeListener);
   }
 
   private View.OnClickListener onClickListener = new View.OnClickListener() {
@@ -169,10 +171,23 @@ public class CustomSignDialog extends Dialog {
         setSignImage();
       } else if (v == btnCancel) {
         dismiss();
+      } else if (v == etUserId) {
+        Log.e(TAG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1");
+        etUserId.selectAll();
       }
     }
   };
 
+  private View.OnFocusChangeListener onFocusChangeListener = new View.OnFocusChangeListener() {
+    @Override
+    public void onFocusChange(View v, boolean hasFocus) {
+      Log.e(TAG, "dsfsdfasfdhdfggdfhrhgjfghfgjffgdfg -- > " + hasFocus);
+      etUserId.setSelection(0, etUserId.getText().toString().length());
+//      etUserId.setSelectAllOnFocus(true);
+//      etUserId.selectAll();
+    }
+  };
+
   private void setSignImage() {
 
     final CallBack callBack = new CallBack() {
@@ -281,7 +296,7 @@ public class CustomSignDialog extends Dialog {
 
         String userId = etUserId.getText().toString().trim();
         HashMap<String, String> mData = new HashMap<String, String>();
-        mData.put("userId", userId);
+        mData.put("userId", userId.trim().toUpperCase());
         mData.put("instCd", BuildConfig.INST_CD);
 
         userSignDataInfoVO = getUserSignDataInfo(mData);
@@ -310,7 +325,7 @@ public class CustomSignDialog extends Dialog {
     if (!image.equals("")) {
       signImage = userSignDataInfoVO.getSignData().getBytes();
       byte[] imgbytes = Base64.decode(signImage, Base64.DEFAULT);
-      signPadImg = BitmapFactory.decodeByteArray(imgbytes, 0, signImage.length);
+      signPadImg = BitmapFactory.decodeByteArray(imgbytes, 0, imgbytes.length);
       spSignImage.setSignatureBitmap(signPadImg);
     }
   }
@@ -322,6 +337,7 @@ public class CustomSignDialog extends Dialog {
 
     try {
       SoapObject object = connection.execute().get();
+      Log.e(TAG, "object -- > " + object);
       userSignDataInfoVO = SoapParser.getUserSignDataInfo(object);
 
     } catch (ExecutionException e) {

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

@@ -25,6 +25,7 @@ public class CustomSignPad extends Dialog {
   private Context mContext;
   private SignaturePad signPad;
 
+  private Button btnClose;
   private Button btnConfirm;
   private Button btnInit;
 
@@ -77,6 +78,7 @@ public class CustomSignPad extends Dialog {
 
   private void setLayout() {
     signPad    = (SignaturePad) findViewById(R.id.signPad);
+    btnClose   = (Button) findViewById(R.id.btnClose);
     btnConfirm = (Button) findViewById(R.id.btnConfirm);
     btnInit    = (Button) findViewById(R.id.btnInit);
 
@@ -111,6 +113,7 @@ public class CustomSignPad extends Dialog {
   private void setEvent() {
     btnConfirm.setOnClickListener(onClickListener);
     btnInit.setOnClickListener(onClickListener);
+    btnClose.setOnClickListener(onClickListener);
   }
 
   private View.OnClickListener onClickListener = new View.OnClickListener() {
@@ -131,6 +134,8 @@ public class CustomSignPad extends Dialog {
       } else if (v == btnInit) {
         signPad.setEnabled(true);
         signPad.clear();
+      } else if (v == btnClose) {
+        dismiss();
       }
     }
   };

app/src/main/java/com/dbs/mplus/knuh/httpTask/SoapParser.java

@@ -575,11 +575,15 @@ public class SoapParser {
 
       String instCd          = object.getPrimitivePropertyAsString("instCd").trim();
       String userId          = object.getPrimitivePropertyAsString("userId").trim();
-      String userNm          = object.getPrimitivePropertyAsString("userNm").trim();
+      String userNm          = "";
       String signData        = "";
       String signImageFromDd = object.getPrimitivePropertyAsString("signImgeFromDd").trim();
       String signImageSeqNo  = object.getPrimitivePropertyAsString("signImgeSeqNo").trim();
 
+      try {
+        userNm = object.getPrimitivePropertyAsString("userNm").trim();
+      } catch (Exception e) {
+      }
       try {
         signData = object.getPrimitivePropertyAsString("signData").trim();
       } catch (Exception e) {

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

@@ -79,6 +79,7 @@
                             android:gravity="center"
                             android:textSize="20sp"
                             android:singleLine="true"
+                            android:selectAllOnFocus="true"
                             app:theme="@style/EditTextStyle"/>
                         <!-- ImageView
                             android:layout_width="match_parent"

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

@@ -27,6 +27,16 @@
                 android:textColor="@color/white"
                 android:textSize="20sp"
                 android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/btnClose"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:layout_marginRight="16dp"
+                android:background="@drawable/ic_clear_black_24dp" />
         </RelativeLayout>
 
         <LinearLayout