버전코드 수정, introActivity 수정

MCPlus/build.gradle

@@ -38,9 +38,9 @@ android {
     productFlavors {
         //사내개발
         fatima_dev {
-            applicationIdSuffix ".fatima.dev"
-            versionCode = 8
-            versionName = "8"
+            applicationIdSuffix ".fatima.standard.dev"
+            versionCode = 2
+            versionName = "2"
         }
         //파티마개발
         fatima_inhouse {
@@ -50,9 +50,9 @@ android {
         }
         //파티마운영
         fatima_product {
-            applicationIdSuffix ".fatima"
-            versionCode = 8
-            versionName = "8"
+            applicationIdSuffix ".fatima.standard"
+            versionCode = 2
+            versionName = "2"
         }
 
     }

MCPlus/src/fatima_dev/java/com/lemonhc/mplus/MPlusConstants.kt

@@ -5,11 +5,23 @@ import com.lemonhc.mplus.app.MPlusConstantsInterface
 
 object MPlusConstants: MPlusConstantsInterface {
 
-    override var DOMAIN_NAME = "https://dev1.lemonhc.com/" // https://nps.kuh.ac.kr/mcare-plus-dev/login.page, http://192.168.1.18:48080/mcare-plus/login.page
 
-    override var APP_NAME = "mcare-plus-fatima"
+//    l  개발 URL : https://mcaredoctor.fatima.or.kr/mcare-plus-dev/login.page
+//    l  운영 URL : https://mcaredoctor.fatima.or.kr/mcare-plus/login.page
+    
+//    override var DOMAIN_NAME = "https://dev1.lemonhc.com/" // https://nps.kuh.ac.kr/mcare-plus-dev/login.page, http://192.168.1.18:48080/mcare-plus/login.page
+//
+//    override var APP_NAME = "mcare-plus-fatima"
+//    override var SERVICE_URL = DOMAIN_NAME + APP_NAME
+//    override var SERVICE_START_ADDR = "/index.html"
+    
+    override var DOMAIN_NAME = "https://mcaredoctor.fatima.or.kr/" // https://nps.kuh.ac.kr/mcare-plus-dev/login.page, http://192.168.1.18:48080/mcare-plus/login.page
+    
+    override var APP_NAME = "mcare-plus-dev"
     override var SERVICE_URL = DOMAIN_NAME + APP_NAME
-    override var SERVICE_START_ADDR = "/index.html"
+    override var SERVICE_START_ADDR = "/login.page"
+    
+    
     override var VERSION_URL = "$SERVICE_URL/mobile/version/appVersion.json"
     override var WOUND_IMG_URL = "$SERVICE_URL/mobile/medical/inputWoundImg.json"
     override var CERT_TYPE = "InHouse"
@@ -48,7 +60,7 @@ object MPlusConstants: MPlusConstantsInterface {
     /* --------------------------------------------------------------------
     * 암호잠금 화면 사용 유무
     --------------------------------------------------------------------*/
-    override var USE_LOCK_SCREEN: Boolean = false
+    override var USE_LOCK_SCREEN: Boolean = true
 
     override var MIME_TEXT_PLAIN = "text/plain"
     override var DEFAULT_KEY_NAME = "default_key"

MCPlus/src/fatima_dev/res/values/strings.xml

@@ -1,5 +1,6 @@
 <resources>
-    <string name="app_name">파티마 개발 POC</string>
+    <string name="app_name">파티마 진료 DEV</string>
+<!--    <string name="app_name">파티마 개발 POC</string>-->
 
     <string name="mime_type">nfcwrapper</string>
     <string name="dialog_title">Detecting NFC tag</string>

MCPlus/src/fatima_product/java/com/lemonhc/mplus/MPlusConstants.kt

@@ -5,11 +5,22 @@ import com.lemonhc.mplus.app.MPlusConstantsInterface
 
 object MPlusConstants: MPlusConstantsInterface {
 
-    override var DOMAIN_NAME = "https://mcareplus.fatima.or.kr/"
-
+//    l  개발 URL : https://mcaredoctor.fatima.or.kr/mcare-plus-dev/login.page
+//    l  운영 URL : https://mcaredoctor.fatima.or.kr/mcare-plus/login.page
+
+//    override var DOMAIN_NAME = "https://mcaredoctor.fatima.or.kr/"
+//
+//    override var APP_NAME = "mcare-plus"
+//    override var SERVICE_URL = DOMAIN_NAME + APP_NAME
+//    override var SERVICE_START_ADDR = "/login.page"
+    
+    override var DOMAIN_NAME = "https://mcaredoctor.fatima.or.kr/"
+    
     override var APP_NAME = "mcare-plus"
     override var SERVICE_URL = DOMAIN_NAME + APP_NAME
     override var SERVICE_START_ADDR = "/login.page"
+    
+    
     override var VERSION_URL = "$SERVICE_URL/mobile/version/appVersion.json"
     override var WOUND_IMG_URL = "$SERVICE_URL/mobile/medical/inputWoundImg.json"
     override var CERT_TYPE = "InHouse"

MCPlus/src/fatima_product/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
-    <string name="app_name">파티마 POC</string>
+    <string name="app_name">파티마 진료</string>
+<!--    <string name="app_name">파티마 POC</string>-->
 </resources>

MCPlus/src/main/java/com/lemonhc/mplus/framework/util/kotlinExtension/ExtensionActivity.kt

@@ -11,6 +11,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Handler
 import android.util.Base64
+import android.util.Log
 import android.widget.Toast
 import com.google.gson.Gson
 import com.lemonhc.mplus.MPlusConstants.APP_NAME
@@ -69,6 +70,8 @@ fun Activity.versionCheck(){
 
                     val serverVersion = DefaultArtifactVersion(responseVersionCheck.versionOrder)
                     val deviceVersion = DefaultArtifactVersion(version)
+                    Log.e("versionCheck", "serverVersion -- > $serverVersion")
+                    Log.e("versionCheck", "deviceVersion -- > $deviceVersion")
 
                     val gap = serverVersion.compareTo(deviceVersion) // 서버가 크면 1, 작으면 -1, 같으면 0
                     if (gap > 0) {
@@ -78,6 +81,7 @@ fun Activity.versionCheck(){
                                 .setPositiveButton("확인") { dialog, which ->
                                     val intent = Intent(Intent.ACTION_VIEW)
                                     val uri = Uri.parse(url)
+                                  Log.e("url", "url -- > $uri")
                                     intent.data = uri
                                     startActivity(intent)
                                     // finish() 를 호출하면 페이지를 열기전에 죽어버린다.

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

@@ -103,8 +103,8 @@ class IntroActivity: AppCompatActivity(){
     
     public override fun onResume() {
         super.onResume()
-    
-        permissionCheck()
+        checkVersion()
+//        permissionCheck()
     }
     
     private fun checkVersion() {