1. 의사 스피너 자동 매핑 삭제

2. 사용자 비밀번호 sha256 비교 로직 추가
3. 초기화면 설정이 없는 경우 예외처리 추가
4.

app/build.gradle

@@ -50,9 +50,8 @@ android {
     productFlavors {
         product {
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.fatima\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.192/\""
             buildConfigField "String", "CONSENT_SERVER_URL", "\"https://consent.fatima.or.kr/\""
-//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://eform.fatima.or.kr/eformservice.aspx/\""
+            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://eform.fatima.or.kr/eformservice.aspx/\""
             buildConfigField "String", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원"]
         }
@@ -60,17 +59,18 @@ android {
         dev {
             applicationIdSuffix ".dev"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.fatima\""
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.43.170/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.43.170/\""  // Local
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8070/\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:80/\""
 
-            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.43.170:8070/eformservice.aspx/\""
-//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:80/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.0.3:80/\""
+
+            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
+//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.43.170:8070/eformservice.aspx/\""
             buildConfigField "String", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원 교육"]
         }
     }
-
 }
 
 repositories {

app/src/main/java/com/dbs/mplus/fatima/MainActivity.java

@@ -95,8 +95,8 @@ public class MainActivity extends AppCompatActivity {
       });
       return;
     } else {
-      versionCheck();
-//      permissionCheck();
+//      versionCheck();
+      permissionCheck();
     }
   }
 

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

@@ -72,8 +72,13 @@ 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("3740asdf-");
+
+
 
     // 산부인과 의사
 //    etId.setText("104012");
@@ -97,8 +102,13 @@ public class LoginActivity extends AppCompatActivity {
 
   private void loginProcess() {
     userId = etId.getText().toString();
+    userPw = etPasswd.getText().toString().trim();
+    String md5Pw = "";
+    String sha256Pw = "";
     try {
-      userPw = Util.md5(etPasswd.getText().toString());
+      md5Pw = Util.md5(userPw);
+      sha256Pw = Util.sha256Encrypt(userPw);
+
     } catch (NoSuchAlgorithmException e) {
       e.printStackTrace();
     } catch (UnsupportedEncodingException e) {
@@ -113,7 +123,8 @@ public class LoginActivity extends AppCompatActivity {
         loadingProgress.show();
         HashMap<String, String> mData = new HashMap<String, String>();
         mData.put("userid", userId);
-        mData.put("pwd", userPw);
+        mData.put("md5Pw", md5Pw);
+        mData.put("sha256Pw", sha256Pw);
 
         HttpConRunnable runnable = new HttpConRunnable(ConsentConfig.HOST_HOSPITAL, mData, ConsentConfig.DO_LOGIN, callBack);
         Thread thread = new Thread(runnable);
@@ -176,7 +187,8 @@ public class LoginActivity extends AppCompatActivity {
               String dutplceDeptNm = mm.get("dutplcedeptnm").trim();
               String jobKindCd     = mm.get("jobkindcd").trim();
               String jobKindNm     = mm.get("jobkindnm").trim();
-              String mobile        = mm.get("mobile").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/activity/activityEvent/LeftMenu.java

@@ -331,6 +331,7 @@ public class LeftMenu {
 
       @Override
       public void stop() {
+        instance.dismissProgress();
         ArrayList<DoctorListVO> arrayList = new ArrayList<DoctorListVO>();
         arrayList.add(new DoctorListVO("", mContext.getString(R.string.doctorListEmpty)));
       }
@@ -341,6 +342,7 @@ public class LeftMenu {
       }
     };
 
+
     HashMap<String, String> mData = new HashMap<String, String>();
     mData.put("srchdd", getDate());
     mData.put("orddeptcd", deptCd);
@@ -488,20 +490,20 @@ public class LeftMenu {
             }
           }
 
-        } else if (apiType.equals(ConsentConfig.GET_DOCTOR_LIST)) {
+        }
+        else if (apiType.equals(ConsentConfig.GET_DOCTOR_LIST)) {
           instance.dismissProgress();
           instance.doctorSpinner.setAdapter(deptSpinnerAdapter);
           instance.doctorSpinner.setOnItemSelectedListener(onItemSelectedListener);
 
-          for (int i = 0; i < arrayList.size(); i++) {
-            DoctorListVO doctorListVO = (DoctorListVO) arrayList.get(i);
-            String _empNo = doctorListVO.getDoctorId();
-            if (instance.emplNo.equals(_empNo)) {
-              instance.doctorSpinner.setSelection(i);
-              break;
-            }
-          }
-
+//          for (int i = 0; i < arrayList.size(); i++) {
+//            DoctorListVO doctorListVO = (DoctorListVO) arrayList.get(i);
+//            String _empNo = doctorListVO.getDoctorId();
+//            if (instance.emplNo.equals(_empNo)) {
+//              instance.doctorSpinner.setSelection(i);
+//              break;
+//            }
+//          }
         }
       }
     });

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

@@ -55,16 +55,17 @@ public class DataParser {
     JSONObject object = Util.xmltoJsonObject(result);
     String res = Util.xmlToJsonString(object);
     ArrayList<HashMap<String, String>> rts1 = Util.parseJSON(mContext, res);
-    ArrayList<HashMap<String, String>> rts2 = Util.parseJSON(mContext, rts1.get(0).get("DocListVO"));
-
-    for (int i = 0; i < rts2.size(); i++) {
-      HashMap<String, String> mm = rts2.get(i);
-      String doctorId = mm.get("doctorid").trim();
-      String doctorNm = mm.get("doctornm").trim();
-      doctorListVOS.add(new DoctorListVO(doctorId, doctorNm));
-    }
 
+    if (rts1.get(0).get("DocListVO") != null) {
+      ArrayList<HashMap<String, String>> rts2 = Util.parseJSON(mContext, rts1.get(0).get("DocListVO"));
 
+      for (int i = 0; i < rts2.size(); i++) {
+        HashMap<String, String> mm = rts2.get(i);
+        String doctorId = mm.get("doctorid").trim();
+        String doctorNm = mm.get("doctornm").trim();
+        doctorListVOS.add(new DoctorListVO(doctorId, doctorNm));
+      }
+    }
     return doctorListVOS;
   }
 

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

@@ -559,7 +559,7 @@ public class Util {
    **/
   public static String md5(String input) throws NoSuchAlgorithmException, UnsupportedEncodingException {
     MessageDigest md5 = MessageDigest.getInstance("MD5");
-    byte[] digest = md5.digest(input.getBytes("UTF-8"));
+    byte[] digest = md5.digest(input.getBytes("EUC-KR"));
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < digest.length; ++i) {
       sb.append(Integer.toHexString((digest[i] & 0xFF) | 0x100).substring(1, 3));