VersionCode = 7

VersionName = 7

수정내용
1. 앱 실행중 LockScreen 해제

MCPlus/build.gradle

@@ -39,20 +39,20 @@ android {
         // 파티마 개발
         fatima_dev {
             applicationIdSuffix ".fatima.standard.dev"
-            versionCode = 6
-            versionName = "6"
+            versionCode = 7
+            versionName = "7"
         }
         //파티마 로컬
         fatima_inhouse {
             applicationIdSuffix ".fatima.local"
-            versionCode = 6
-            versionName = "6"
+            versionCode = 7
+            versionName = "7"
         }
         //파티마운영
         fatima_product {
             applicationIdSuffix ".fatima.standard"
-            versionCode = 6
-            versionName = "6"
+            versionCode = 7
+            versionName = "7"
         }
 
     }

MCPlus/src/main/java/com/lemonhc/mplus/mcare_plus/activity/MainActivity.kt

@@ -2,6 +2,7 @@ package com.lemonhc.mplus.mcare_plus.activity
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.nfc.NfcAdapter.EXTRA_TAG
@@ -54,10 +55,11 @@ class MainActivity: AppCompatActivity(), NfcManager.TagListener , BarcodeEventLi
         }
         webView!!.post{webView!!.loadUrl(callback)}
     }
-
-
+    
     private var webView: WebView? = null
     private var nfc:NfcManager? = null
+    private var isRunning: Boolean = false
+    
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -78,28 +80,32 @@ class MainActivity: AppCompatActivity(), NfcManager.TagListener , BarcodeEventLi
 //        this.webView?.loadUrl("https://google.com/")
 
         nfc = NfcManager(this)
+        Log.e("MainActivity", "onCreate!!")
     }
 
 
     public override fun onStart() {
         super.onStart()
+        Log.e("MainActivity", "onStart!!")
     }
 
     public override fun onDestroy() {
         nfc = null
-        Log.e("destroy", "destroy true")
-        SignWrapper.getInstance().deleteAll()
+        isRunning = false
         super.onDestroy()
     }
 
     public override fun onPause() {
         nfc?.onPause()
+        isRunning = true
+        Log.e("MainActivity", "onPause!!")
         super.onPause()
 
     }
 
     public override fun onResume() {
         super.onResume()
+        Log.e("MainActivity", "onResume!!")
         nfc?.onResume(this)
 
         if (!USE_LOCK_SCREEN) {
@@ -117,13 +123,13 @@ class MainActivity: AppCompatActivity(), NfcManager.TagListener , BarcodeEventLi
             isVisibleCamera = false
             return
         }
-
+        
         if (intent.hasExtra("lock_yn")) {
             val lockYn = intent.extras.getBoolean("lock_yn")
             if (lockYn) {
                 lockScreenCall()
             } else {
-                intent.putExtra("lock_yn", true)
+                intent.putExtra("lock_yn", false)
             }
         } else {
             lockScreenCall()
@@ -183,12 +189,14 @@ class MainActivity: AppCompatActivity(), NfcManager.TagListener , BarcodeEventLi
 
 
     private fun lockScreenCall() {
-        val util = PreferenceUtil.getInstance(this)
-        //현재시간이 락을 해제하고 1초가 지난경우에만 락스크린을 보여준다.
-        //초기값은 -1
-        if (util.unlockTime + 1000 < System.currentTimeMillis() || util.unlockTime.toInt() == -1) {
-            val intent = Intent(this, LockScreenActivity::class.java)
-            startActivity(intent)
+        if (!isRunning) {
+            val util = PreferenceUtil.getInstance(this)
+            //현재시간이 락을 해제하고 1초가 지난경우에만 락스크린을 보여준다.
+            //초기값은 -1
+            if (util.unlockTime + 1000 < System.currentTimeMillis() || util.unlockTime.toInt() == -1) {
+                val intent = Intent(this, LockScreenActivity::class.java)
+                startActivity(intent)
+            }
         }
     }
 

MCPlus/src/main/java/com/lemonhc/mplus/mcare_plus/activity/webView/WebViewCallFunctions.kt

@@ -77,10 +77,10 @@ class WebViewCallFunctions(val activity: AppCompatActivity, val webView: WebView
       val url = pacsObject.returnurl
       val isEmpty: Boolean = pacsObject.returnurl.isNullOrEmpty()
       Log.e("!!!!", "url -- > $url, isEmpty -- > $isEmpty")
-
+      
 //    intent.putExtra("ServerUrl", url)
-      if (!pacsObject.serverurl.isNullOrEmpty()) {
-        intent.putExtra("ServerUrl", pacsObject.serverurl)
+      if (!pacsObject.returnurl.isNullOrEmpty()) {
+        intent.putExtra("ServerUrl", pacsObject.returnurl)
       }
       
       if (!pacsObject.user_id.isNullOrEmpty()) {

build.gradle

@@ -16,7 +16,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong