.

app/build.gradle

@@ -17,8 +17,8 @@ android {
 
         buildConfigField "String", "originalPackageName", "\"com.dbs.dbsec\"";
 //        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://wcollector.idatabank.com:8091/\""
-        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:8080/\""
-//        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.0.30:8080/\""
+//        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:8080/\""
+        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.0.36:8080/\""
         buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://wcollector.idatabank.com:5228/\""
 //        buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://211.118.215.111:8090/\""
         buildConfigField "String", "INST_CD", "\"031\""

app/src/main/java/com/dbs/dbsec/MainActivity.java

@@ -65,7 +65,6 @@ public class MainActivity extends AppCompatActivity {
     CallBack callBack = new CallBack() {
       @Override
       public void result(String result) {
-        Log.e(TAG, "getBaseData -- > " + result);
         ArrayList<HashMap<String, String>> arrayList = Common.parseJSON(mContext, result);
 
         for (int i = 0; i < arrayList.size(); i++) {
@@ -94,7 +93,29 @@ public class MainActivity extends AppCompatActivity {
               }
             }
 
-            permissionCheck();
+            Log.e(TAG, "ConsentConfig.SETTING_DATA -- > " + ConsentConfig.SETTING_DATA);
+
+            int version = Integer.parseInt(ConsentConfig.SETTING_DATA.get("MOBILE_VERSION"));
+            int appVersion = BuildConfig.VERSION_CODE;
+            if (version == appVersion) {
+              permissionCheck();
+            } else {
+              runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                  String message = String.format(getString(R.string.notMatchedVersion), ConsentConfig.SETTING_DATA.get("MOBILE_VERSION"), String.valueOf(BuildConfig.VERSION_CODE));
+                  csAlert.show();
+                  csAlert.setContent(message, ConsentConfig.ALERT_BTN_TYPE);
+                  csAlert.btnConfirm2.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                      csAlert.dismiss();
+                      finishAffinity();
+                    }
+                  });
+                }
+              });
+            }
           }
 
         }

app/src/main/java/com/dbs/dbsec/activity/activityEvent/LeftMenu.java

@@ -588,6 +588,8 @@ public class LeftMenu {
     }
 
     CallBack callBack = new CallBack() {
+
+      private ArrayList<PatientListVO> patientArr = new ArrayList<PatientListVO>();
       @Override
       public void result(String result) {
         Log.e(TAG, "patientList -- > " + result);
@@ -597,14 +599,20 @@ public class LeftMenu {
         if (!code.equals("00")) {
           stop();
         } else {
-          ArrayList<PatientListVO> patientArr = ParseJsonData.getInstance(mContext).getPatientList(arrayList);
+          patientArr = ParseJsonData.getInstance(mContext).getPatientList(arrayList);
           setPatientListAdapter(patientArr);
         }
       }
 
       @Override
       public void stop() {
+
         instance.dismissProgress();
+
+        if (patientListAdapter != null) {
+          patientArr.clear();
+          setPatientListAdapter(patientArr);
+        }
       }
 
       @Override
@@ -637,12 +645,8 @@ public class LeftMenu {
       instance.dismissProgress();
       Common.networkErrorAlert(mActivity);
     }
-
-
   }
 
-
-
   private void setPatientListAdapter(final ArrayList<PatientListVO> arrayList) {
     mActivity.runOnUiThread(
       new Runnable() {

app/src/main/java/com/dbs/dbsec/consent/EformSaveEventHandler.java

@@ -95,6 +95,8 @@ public class EformSaveEventHandler implements IEventHandler<ResultEventArgs> {
     String orderName            = "";
     String orderCd              = "";
 
+    deviceType = deviceType + "," + BuildConfig.VERSION_CODE + "," + BuildConfig.INST_CD;
+
     String eptFilePath = resultEventArgs.getTempFilePath();
     StringBuffer formXml = new StringBuffer();
     if (eptFilePath != null && "".equals(eptFilePath) == false) {

app/src/main/java/com/dbs/dbsec/httpTask/ParseJsonData.java

@@ -50,7 +50,7 @@ public class ParseJsonData {
       String deptCd        = mm.get("deptCd");
       String deptHngNm     = mm.get("deptHngNm");
       String dutplceCd     = mm.get("dutplceCd");
-      String indexPage     = mm.get("mobile");
+      String indexPage     = mm.get("indexPage");
       String sortNo        = mm.get("sortNo");
       String fromDd        = mm.get("fromDd");
 

app/src/main/java/com/dbs/dbsec/util/Common.java

@@ -7,6 +7,8 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.util.Base64;
@@ -80,6 +82,25 @@ public class Common {
     int stringId = applicationInfo.labelRes;
     return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : mContext.getString(stringId);
   }
+
+  /**
+   * 앱 버전 가져오기
+   * @author jksong
+   * @Param
+   * @since 2019-10-25 오후 5:07
+   **/
+  public static String getVersion(Context context) {
+    String version = null;
+
+    try {
+      PackageInfo i = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+      version = i.versionName;
+    } catch (PackageManager.NameNotFoundException e) {
+
+    }
+
+    return version;
+  }
   
   /**
   * Json Parser

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

@@ -128,6 +128,7 @@
     <string name="electrCmpCheckeMsg">확인저장 서식은 함께 작성할 수 없습니다.</string>
 
     <string name="baseDataError">기본 정보 설정에 실패하였습니다. \n다시 시도해주세요.</string>
+    <string name="notMatchedVersion">버전정보가 일치하지 않습니다. \n업데이트 버전 : %1s \n 현재 앱 버전 : %1s</string>
     <string name="networkError">네트워크에 연결되어 있지 않습니다</string>
     <string name="rootingDeviceMsg">루팅된 디바이스 입니다. 루팅된 디바이스는 사용할 수 없습니다.</string>
     <string name="toDayDupConsentMsg">이미 받은 동의서 입니다 \n 계속 진행하시겠습니까?</string>