강성희 6 rokov pred
rodič
commit
0d9077b5f9

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 20 - 722
MCPlus.xcodeproj/project.pbxproj


+ 0 - 91
MCPlus.xcodeproj/xcshareddata/xcschemes/paik_dev.xcscheme

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "29C30F3F2269513C00698CEA"
-               BuildableName = "paik_dev.app"
-               BlueprintName = "paik_dev"
-               ReferencedContainer = "container:MCPlus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C30F3F2269513C00698CEA"
-            BuildableName = "paik_dev.app"
-            BlueprintName = "paik_dev"
-            ReferencedContainer = "container:MCPlus.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C30F3F2269513C00698CEA"
-            BuildableName = "paik_dev.app"
-            BlueprintName = "paik_dev"
-            ReferencedContainer = "container:MCPlus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C30F3F2269513C00698CEA"
-            BuildableName = "paik_dev.app"
-            BlueprintName = "paik_dev"
-            ReferencedContainer = "container:MCPlus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 91
MCPlus.xcodeproj/xcshareddata/xcschemes/paik_inhouse.xcscheme

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "29C30FA62269520700698CEA"
-               BuildableName = "paik_inhouse.app"
-               BlueprintName = "paik_inhouse"
-               ReferencedContainer = "container:MCPlus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C30FA62269520700698CEA"
-            BuildableName = "paik_inhouse.app"
-            BlueprintName = "paik_inhouse"
-            ReferencedContainer = "container:MCPlus.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C30FA62269520700698CEA"
-            BuildableName = "paik_inhouse.app"
-            BlueprintName = "paik_inhouse"
-            ReferencedContainer = "container:MCPlus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C30FA62269520700698CEA"
-            BuildableName = "paik_inhouse.app"
-            BlueprintName = "paik_inhouse"
-            ReferencedContainer = "container:MCPlus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 10 - 10
MCPlus.xcodeproj/xcuserdata/kangsh.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -59,11 +59,6 @@
 			<key>orderHint</key>
 			<integer>15</integer>
 		</dict>
-		<key>paik_dev.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>13</integer>
-		</dict>
 		<key>paik_haeundae.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
@@ -74,11 +69,6 @@
 			<key>orderHint</key>
 			<integer>9</integer>
 		</dict>
-		<key>paik_inhouse.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>14</integer>
-		</dict>
 		<key>paik_pusan.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
@@ -157,6 +147,16 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>29C30F3F2269513C00698CEA</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>29C30FA62269520700698CEA</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>

+ 1 - 1
MCPlus/CustomFiles/eumc/MCarePlusConstants-dev.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
    
     static var DOMAIN_NAME = "http://memr_dev.eumc.ac.kr/"
     
-    static var CERT_TYPE = "inHouse"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 0 - 27
MCPlus/CustomFiles/eumc/MCarePlusConstants-inHouse.swift

@@ -1,27 +0,0 @@
-//
-//  MCarePlusConstants-inHouseSwift.swift
-//  MCPlus_dev
-//
-//  Created by seo ha on 13/02/2019.
-//  Copyright © 2019 KangSH. All rights reserved.
-//
-
-import Foundation
-
-@objcMembers
-class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
-    static var MCARE_ALERT_TITLE_ICON = "iconImage-eumc"
-    #if SEOUL
-    static var DOMAIN_NAME = "http://14.40.2.60:18080"
-    #elseif BUSAN
-    static var DOMAIN_NAME = "http://10.10.10.36:18080"
-    #elseif SANGGAE
-    static var DOMAIN_NAME = "http://14.40.0.113:18080"
-    #elseif ILSAN
-    static var DOMAIN_NAME = "http://14.40.4.137:18080"
-    #elseif HAEUNDAE
-    static var DOMAIN_NAME = "http://100.100.251.251:18080"
-    #endif
-    static var CERT_TYPE = "inHouse"
-    static var APP_NAME = "mcare-plus"
-}

+ 1 - 1
MCPlus/CustomFiles/eumc/MCarePlusConstants.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
 
     static var DOMAIN_NAME = "http://memr.eumc.ac.kr/"
 
-    static var CERT_TYPE = "Store"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 2 - 2
MCPlus/CustomFiles/paik/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2</string>
+	<string>3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>DomainName</key>
 	<string>https://app.hyumc.com/</string>
 	<key>Fabric</key>

+ 0 - 28
MCPlus/CustomFiles/paik/MCarePlusConstants-dev.swift

@@ -1,28 +0,0 @@
-//
-//  MCarePlusConstants-devSwift.swift
-//  MCPlus_lemon
-//
-//  Created by seo ha on 13/02/2019.
-//  Copyright © 2019 KangSH. All rights reserved.
-//
-
-import Foundation
-
-@objcMembers
-class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
-    static var MCARE_ALERT_TITLE_ICON = "iconImage-paik"
-    //백병원 도메인을 바꿀시. otherswift flag를 바꿀것 ex -D SEOUL
-    #if SEOUL
-    static var DOMAIN_NAME = "http://14.40.2.60:18080"
-    #elseif BUSAN
-    static var DOMAIN_NAME = "http://10.10.10.36:18080"
-    #elseif SANGGAE
-    static var DOMAIN_NAME = "http://14.40.0.113:18080"
-    #elseif ILSAN
-    static var DOMAIN_NAME = "http://14.40.4.137:18080"
-    #elseif HAEUNDAE
-    static var DOMAIN_NAME = "http://100.100.251.251:18080"
-    #endif
-    static var CERT_TYPE = "inHouse"
-    static var APP_NAME = "mcare-plus-dev"
-}

+ 0 - 29
MCPlus/CustomFiles/paik/MCarePlusConstants-inHouse.swift

@@ -1,29 +0,0 @@
-//
-//  MCarePlusConstants-inHouseSwift.swift
-//  MCPlus_dev
-//
-//  Created by seo ha on 13/02/2019.
-//  Copyright © 2019 KangSH. All rights reserved.
-//
-
-import Foundation
-
-@objcMembers
-class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
-    
-    static var MCARE_ALERT_TITLE_ICON = "iconImage-paik"
-    //백병원 도메인을 바꿀시. otherswift flag를 바꿀것 ex -D SEOUL
-    #if SEOUL
-    static var DOMAIN_NAME = "http://14.40.2.60:18080"
-    #elseif BUSAN
-    static var DOMAIN_NAME = "http://10.10.10.36:18080"
-    #elseif SANGGAE
-    static var DOMAIN_NAME = "http://14.40.0.113:18080"
-    #elseif ILSAN
-    static var DOMAIN_NAME = "http://14.40.4.137:18080"
-    #elseif HAEUNDAE
-    static var DOMAIN_NAME = "http://100.100.251.251:18080"
-    #endif
-    static var CERT_TYPE = "inHouse"
-    static var APP_NAME = "mcare-plus"
-}

+ 1 - 1
MCPlus/CustomFiles/paik/MCarePlusConstants_haeundae.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
 
     static var DOMAIN_NAME = "http://100.100.251.251:18080/"
 
-    static var CERT_TYPE = "inHouse"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 1 - 1
MCPlus/CustomFiles/paik/MCarePlusConstants_ilsan.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
 
     static var DOMAIN_NAME = "http://14.40.4.137:18080/"
 
-    static var CERT_TYPE = "inHouse"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 1 - 1
MCPlus/CustomFiles/paik/MCarePlusConstants_pusan.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
 
     static var DOMAIN_NAME = "http://10.10.10.36:18080/"
 
-    static var CERT_TYPE = "inHouse"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 1 - 1
MCPlus/CustomFiles/paik/MCarePlusConstants_sanggye.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
 
     static var DOMAIN_NAME = "http://14.40.0.113:18080/"
 
-    static var CERT_TYPE = "inHouse"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 1 - 1
MCPlus/CustomFiles/paik/MCarePlusConstants_seoul.swift

@@ -14,6 +14,6 @@ class MCarePlusConstants:NSObject, MCarePlusConstantsProtocol {
 
     static var DOMAIN_NAME = "http://14.40.2.60:18080/"
 
-    static var CERT_TYPE = "inHouse"
+    static var CERT_TYPE = "InHouse"
     static var APP_NAME = "mcare-plus"
 }

+ 2 - 2
paik_haeundae-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2</string>
+	<string>3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>DomainName</key>
 	<string>https://app.hyumc.com/</string>
 	<key>Fabric</key>

+ 2 - 2
paik_ilsan-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2</string>
+	<string>3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>DomainName</key>
 	<string>https://app.hyumc.com/</string>
 	<key>Fabric</key>

+ 2 - 2
paik_pusan-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2</string>
+	<string>3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>DomainName</key>
 	<string>https://app.hyumc.com/</string>
 	<key>Fabric</key>

+ 2 - 2
paik_sanggye-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2</string>
+	<string>3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>DomainName</key>
 	<string>https://app.hyumc.com/</string>
 	<key>Fabric</key>

+ 0 - 5
podfile

@@ -79,8 +79,3 @@ target 'paik_haeundae' do
   use_frameworks!
   all_pods
 end
-target 'paik_dev' do
-  # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
-  use_frameworks!
-  all_pods
-end