.

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.dbs.mplus.knuh"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 10
-        versionName "1.1.0.10"
+        versionCode 12
+        versionName "1.1.0.12"
         multiDexEnabled true
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -127,7 +127,7 @@ public class ConsentFacade {
 //    Util.LOG(ConsentFacade.class, "create fos -- > " + fos);
 
     eFormToolkit.setExitEventHandler(new EformExitEventHandler());
-    eFormToolkit.setResultEventHandler(new EFormSaveHandler(mContext, eFormToolkit, consentData, apiType));
+    eFormToolkit.setResultEventHandler(new EFormSaveHandler(mContext, eFormToolkit, consentData, apiType, certPass));
 
     eFormToolkit.setRunOption(createRunOption());
     if (SignWrapper.getInstance().isCertificate(userId) == true || certPass.equals("Y")) {
@@ -402,7 +402,12 @@ public class ConsentFacade {
                      "        'text': '" + mContext.getString(R.string.exit) + "'                                                                                               " +
                      "      },                                                                                                                      " +
                      "      'pageattach': {                                                                                                         " +
-                     "        'visible': '" + pageattachVisible + "'                                                                                " +
+                     "        'text': '',                                                                                                           " +
+                     "        'visible': '" + pageattachVisible + "',                                                                               " +
+                     "        'camera-attach-page': {                                                                                               " +
+                     "           'use': 'true',                                                                                                     " +
+                     "           'camera-resolution-type': 'High'                                                                                   " +
+                     "         }                                                                                                                    " +
                      "      },                                                                                                                      " +
                      "      'page-number': {                                                                                                        " +
                      "        'current': {                                                                                                          " +

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

@@ -56,15 +56,17 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs>, CallBac
   private HashMap saveMapData = null;
 
   private String apiType = "";
+  private String certPass = "";
   private String buttonType = "";
 
-  public EFormSaveHandler(Context mContext, EFormToolkit eFormToolkit, HashMap consentData, String apiType) {
+  public EFormSaveHandler(Context mContext, EFormToolkit eFormToolkit, HashMap consentData, String apiType, String certPass) {
     this.mContext     = mContext;
     this.eFormToolkit = eFormToolkit;
     this.consentData  = consentData;
     this.callBack     = this;
     this.instance     = (ConsentActivity) mContext;
     this.apiType      = apiType;
+    this.certPass     = certPass;
   }
 
   @Override
@@ -186,36 +188,36 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs>, CallBac
       eFormToolkit.sendEFormViewerCancelEvent(mContext.getString(R.string.networkError));
     } else {
 
-
       if (Util.checkNetwork(mContext) == true) {
-        switch (eventArgs.getResultCode()) {
-          case SAVE:       // 인증저장
 
-            int state = 0;
-            try {
-              HashMap<String, String> mData = new HashMap<String, String>();
-              mData.put("consentmstrid", saveData.get("consentMstRid").toString());
-              if (saveData.get("consentStateEng") != null) {
-                mData.put("consent_state", saveData.get("consentStateEng").toString());
-                HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_CONSENT, ConsentConfig.CHECK_CONSENT_STATE, mData);
-                SoapObject object = connection.execute().get();
-                state = Integer.parseInt(object.getProperty("responseData").toString().trim());
-                Log.e(TAG, "mData -- > " + mData);
-                Log.e(TAG, "state -- > " + state);
-              }
-
-            } catch (ExecutionException e) {
-              e.printStackTrace();
-            } catch (InterruptedException e) {
-              e.printStackTrace();
-            } catch (NullPointerException e) {
-              e.printStackTrace();
-            }
+        int state = 0;
+        try {
+          HashMap<String, String> mData = new HashMap<String, String>();
+          mData.put("consentmstrid", saveData.get("consentMstRid").toString());
+          if (saveData.get("consentStateEng") != null) {
+            mData.put("consent_state", saveData.get("consentStateEng").toString());
+            HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_CONSENT, ConsentConfig.CHECK_CONSENT_STATE, mData);
+            SoapObject object = connection.execute().get();
+            state = Integer.parseInt(object.getProperty("responseData").toString().trim());
+            Log.e(TAG, "mData -- > " + mData);
+            Log.e(TAG, "state -- > " + state);
+          }
 
-            if (state == 1) {
-              eFormToolkit.sendEFormViewerCancelEvent(mContext.getString(R.string.writeConsnet));
-              return;
-            }
+        } catch (ExecutionException e) {
+          e.printStackTrace();
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        } catch (NullPointerException e) {
+          e.printStackTrace();
+        }
+
+        if (state == 1) {
+          eFormToolkit.sendEFormViewerCancelEvent(mContext.getString(R.string.writeConsnet));
+          return;
+        }
+
+        switch (eventArgs.getResultCode()) {
+          case SAVE:       // 인증저장
 
             saveData.putAll(imageUpload(eventArgs));
             saveData.put("actKind", "C");
@@ -231,11 +233,17 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs>, CallBac
 
             break;
           case TEMP_SAVE2: // 확인저장
-            saveData.putAll(imageUpload(eventArgs));
-            saveData.put("actKind", "T");
-            saveData.put("consentState", "ELECTR_CMP");
 
-            Util.callHttp(mContext, ConsentConfig.HOST_CONSENT, ConsentConfig.SAVE_CONFIRM_CERTIFY, saveData, callBack);
+            if (certPass.equals("Y")) {
+              eFormToolkit.sendEFormViewerCancelEvent(mContext.getString(R.string.certPassConsentConfirmNotSave));
+            } else {
+              saveData.putAll(imageUpload(eventArgs));
+              saveData.put("actKind", "T");
+              saveData.put("consentState", "ELECTR_CMP");
+
+              Util.callHttp(mContext, ConsentConfig.HOST_CONSENT, ConsentConfig.SAVE_CONFIRM_CERTIFY, saveData, callBack);
+            }
+
             break;
         }
 

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

@@ -123,6 +123,7 @@
 
     <string name="electrCmpCheckeMsg">확인저장 서식은 함께 작성할 수 없습니다.</string>
 
+    <string name="certPassConsentConfirmNotSave">[확인저장] 할 수 없습니다. [인증저장] 으로 진행하시기 바랍니다.</string>
     <string name="baseDataError">기본 정보 설정에 실패하였습니다. \n다시 시도해주세요.</string>
     <string name="networkError">네트워크에 연결되어 있지 않습니다</string>
     <string name="rootingDeviceMsg">루팅된 디바이스 입니다. 루팅된 디바이스는 사용할 수 없습니다.</string>