http xml 파싱 라이브러리 수정

app/build.gradle

@@ -60,11 +60,11 @@ android {
         dev {
             applicationIdSuffix ".dev"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.fatima\""
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.194/\""  // Local
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8888/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.194/\""  // Local
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8888/\""
 
-            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
-//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://172.16.10.194:8070/eformservice.aspx/\"" // Local
+//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
+            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://172.16.10.194:8070/eformservice.aspx/\"" // Local
             buildConfigField "String", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원 교육"]
         }
@@ -82,11 +82,12 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.google.code.ksoap2-android:ksoap2-android:3.6.4'
     implementation 'com.github.ybq:Android-SpinKit:1.2.0'
     implementation 'gun0912.ted:tedpermission:2.0.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.github.smart-fun:XmlToJson:1.5.1'
 }

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

@@ -73,8 +73,8 @@ public class LoginActivity extends AppCompatActivity {
 //    etPasswd.setText("sysedps!@#");
 
     //의사
-//    etId.setText("105435");
-//    etPasswd.setText("sysedps!@#");
+    etId.setText("105435");
+    etPasswd.setText("sysedps!@#");
 
 //    etId.setText("107810");
 //    etPasswd.setText("sysedps!@#");
@@ -199,8 +199,6 @@ public class LoginActivity extends AppCompatActivity {
               String jobKindNm     = mm.get("jobkindnm").trim();
               String mobile        = (mm.get("mobile") == null) ? "I" : mm.get("mobile").trim();
 
-
-              jobKindCd = Util.plusZero2("4", Integer.parseInt(jobKindCd));
               userLoginDeptLists.add(new UserLoginDeptList(emplNo, name, unitNm, dutplcedeptCd, dutplceDeptNm, jobKindCd, jobKindNm, mobile));
             }
 

app/src/main/java/com/dbs/mplus/fatima/adapter/ConsentWriteAdapter.java

@@ -36,7 +36,6 @@ import com.dbs.mplus.fatima.util.ConsentConfig;
 import com.dbs.mplus.fatima.util.Util;
 
 import org.json.JSONObject;
-import org.ksoap2.serialization.SoapObject;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -124,7 +124,7 @@ public class ConsentFacade {
     eFormToolkit.setResultEventHandler(new EFormSaveHandler(mContext, eFormToolkit, consentData, apiType));
     eFormToolkit.setRunOption(createRunOption());
 
-    if (SignWrapper.getInstance().isCertificate(userId) == true) {
+    if (SignWrapper.getInstance().isCertificate(userId) == false) {
       String result = eFormToolkit.startEFormViewer(fos.trim());
 
       if (result.equals("ERROR_004")) {

app/src/main/java/com/dbs/mplus/fatima/httpTask/DataParser.java

@@ -134,7 +134,6 @@ public class DataParser {
         String badCd = "";
         try {
           pid = mm.get("pid").trim();
-          pid = Util.plusZero2("7", Integer.parseInt(pid));
         } catch (Exception e) {
         }
         try {
@@ -235,7 +234,6 @@ public class DataParser {
         }
         try {
           opRoomNm = mm.get("oproomnm").trim();
-          opRoomNm = Util.plusZero2("2", Integer.parseInt(opRoomNm));
         } catch (Exception e) {
         }
         try {
@@ -332,7 +330,6 @@ public class DataParser {
 
         try {
           pid = mm.get("IO_Pt_ID").trim();
-          pid = Util.plusZero2("7", Integer.parseInt(pid));
         } catch (Exception e) {
         }
         try {
@@ -903,7 +900,6 @@ public class DataParser {
 
         try {
           pid = mm.get("pid").trim();
-          pid = Util.plusZero2("7", Integer.parseInt(pid));
         } catch(Exception e){
 
         }

app/src/main/java/com/dbs/mplus/fatima/httpTask/HttpCallBack.java

@@ -1,6 +1,5 @@
 package com.dbs.mplus.fatima.httpTask;
 
-import org.ksoap2.serialization.SoapObject;
 
 public interface HttpCallBack {
   void result(String result);

app/src/main/java/com/dbs/mplus/fatima/httpTask/HttpCon.java

@@ -2,15 +2,15 @@ package com.dbs.mplus.fatima.httpTask;
 
 import android.os.AsyncTask;
 import android.util.Log;
-import android.util.Xml;
 
 
 import com.dbs.mplus.fatima.util.ConsentConfig;
 import com.dbs.mplus.fatima.util.Util;
 
+
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.json.XML;
+//import org.json.XML;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -27,6 +27,8 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.util.HashMap;
 
+import fr.arnaudguyon.xmltojsonlib.XmlToJson;
+
 public class HttpCon extends AsyncTask<Void, Void, String> {
   private static final String TAG = "HttpCon";
   private String url = "";
@@ -133,16 +135,30 @@ public class HttpCon extends AsyncTask<Void, Void, String> {
 
       Log.e(TAG, "http reuqest " + action + " end -- > " + Util.logTime());
 
-//      Log.e(TAG, "result -- > " + result);
-      JSONObject object = XML.toJSONObject(result);
-      result = object.toString();
+      Log.e(TAG, "result -- > " + result);
+//      JSONObject object = XML.toJSONObject(result);
+
+//      XmlMapper xmlMapper = new XmlMapper();
+//      JsonNode node = xmlMapper.readTree(result.getBytes());
+//
+//      ObjectMapper jsonMapper = new ObjectMapper();
+//      String json = jsonMapper.writeValueAsString(node);
+
+//      Log.e(TAG, "json -- > " + json);
+
+//      Log.e(TAG, "object -- > " + object);
+//      result = object.toString();
+
+      XmlToJson xmlToJson = new XmlToJson.Builder(result).build();
+
+      Log.e(TAG, "xmlToJson -- > " + xmlToJson);
+
+      result = xmlToJson.toString();
 
     } catch (MalformedURLException e) {
       e.printStackTrace();
     } catch (IOException e) {
       e.printStackTrace();
-    } catch (JSONException e) {
-      e.printStackTrace();
     }
 
     return result;

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

@@ -385,13 +385,13 @@ public class Util {
     return d;
   }
 
-  public static String plusZero2(String jali, int num) {
-    int temp = num;
-    String d = "";
-    d = String.format("%0" + jali + "d", temp);
-
-    return d;
-  }
+//  public static String plusZero2(String jali, int num) {
+//    int temp = num;
+//    String d = "";
+//    d = String.format("%0" + jali + "d", temp);
+//
+//    return d;
+//  }
 
   /**
    * 앱 이름을 가져온다