junekeunsong 4 years ago
parent
commit
71bfd93b8b

+ 8 - 0
.idea/compiler.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="대구파타마병원.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

+ 1 - 0
.idea/gradle.xml

@@ -14,6 +14,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

+ 4 - 4
app/build.gradle

@@ -60,10 +60,10 @@ 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.100.124:8070/\""
-//            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://192.168.43.170/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8070/\""
+            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", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원 교육"]
         }

BIN
app/dev/debug/app-dev-debug.apk


+ 1 - 0
app/dev/debug/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"4","enabled":true,"outputFile":"app-dev-debug.apk","fullName":"devDebug","baseName":"dev-debug","dirName":""},"path":"app-dev-debug.apk","properties":{}}]

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

@@ -67,9 +67,9 @@ public class LoginActivity extends AppCompatActivity {
     btnLogin = (Button) findViewById(R.id.btnLogin);
 
 
-//    etId.setText("104287");
-//    //33213321
-//    etPasswd.setText("sysedps!@#");
+    etId.setText("104287");
+    //33213321
+    etPasswd.setText("sysedps!@#");
 
     //의사
 //    etId.setText("105435");

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

@@ -123,7 +123,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")) {