세브란스 추가 (이 브런치가 메인임)

MCPlus/Base.lproj/Main.storyboard

@@ -52,7 +52,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="103.66666666666667" height="24"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_back.png" translatesAutoresizingMaskIntoConstraints="NO" id="dkM-pC-dd5">
-                                                        <rect key="frame" x="39.666666666666657" y="0.0" width="24" height="24"/>
+                                                        <rect key="frame" x="39.666666666666664" y="0.0" width="24" height="24"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" secondItem="dkM-pC-dd5" secondAttribute="height" multiplier="1:1" id="JXr-jm-Rpa"/>
                                                         </constraints>
@@ -85,7 +85,7 @@
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VdS-0w-Gwi">
-                                                <rect key="frame" x="207" y="0.0" width="103.66666666666666" height="24"/>
+                                                <rect key="frame" x="206.99999999999997" y="0.0" width="103.66666666666666" height="24"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_reflash.png" translatesAutoresizingMaskIntoConstraints="NO" id="PVv-yo-Zch">
                                                         <rect key="frame" x="39.666666666666657" y="0.0" width="24" height="24"/>
@@ -134,7 +134,7 @@
                                 </constraints>
                             </view>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="kHo-X3-vgH">
-                                <rect key="frame" x="188.66666666666663" y="349.66666666666669" width="37" height="37"/>
+                                <rect key="frame" x="188.66666666666666" y="349.66666666666669" width="37" height="37"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <color key="color" cocoaTouchSystemColor="darkTextColor"/>
                             </activityIndicatorView>
@@ -176,12 +176,12 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
-                        <segue destination="ySz-mN-COb" kind="relationship" relationship="rootViewController" id="OiY-3Q-erd"/>
+                        <segue destination="RXv-9L-g0q" kind="relationship" relationship="rootViewController" id="NG4-0f-VyG"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2N1-sD-EIH" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="796" y="124"/>
+            <point key="canvasLocation" x="796" y="122"/>
         </scene>
         <!--Test2 View Controller-->
         <scene sceneID="t4G-8e-KCr">
@@ -278,7 +278,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="환부이미지촬영" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Gz-wR-Tkc">
-                                        <rect key="frame" x="146.33333333333331" y="13.666666666666664" width="121.33333333333334" height="21"/>
+                                        <rect key="frame" x="146.33333333333334" y="13.666666666666664" width="121.33333333333334" height="21"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -592,7 +592,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="환부이미지관리" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3rO-EJ-s84">
-                                                <rect key="frame" x="146.33333333333331" y="13.666666666666664" width="121.33333333333334" height="21"/>
+                                                <rect key="frame" x="149.33333333333334" y="12.999999999999998" width="115.33333333333334" height="22.333333333333329"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -631,7 +631,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="132.66666666666666" height="151"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="홍길동" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="caU-Qr-psb">
-                                                        <rect key="frame" x="41.666666666666657" y="17" width="49.333333333333343" height="20"/>
+                                                        <rect key="frame" x="43" y="17" width="47" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -674,7 +674,7 @@
                                                 <rect key="frame" x="132.66666666666669" y="0.0" width="132.66666666666669" height="151"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1000100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wHc-QH-9WF">
-                                                        <rect key="frame" x="22" y="17" width="89" height="20"/>
+                                                        <rect key="frame" x="25.333333333333343" y="17" width="82" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -719,7 +719,7 @@
                                                 <rect key="frame" x="265.33333333333331" y="0.0" width="132.66666666666669" height="151"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20 / M" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bv4-jp-Xep">
-                                                        <rect key="frame" x="39.333333333333371" y="17" width="54.333333333333343" height="20"/>
+                                                        <rect key="frame" x="40.333333333333371" y="17" width="52" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -857,7 +857,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="207" height="40"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chk_default" translatesAutoresizingMaskIntoConstraints="NO" id="xQ4-Tv-FEb" customClass="CheckImageButton" customModule="SEVERANCE" customModuleProvider="target">
-                                                                <rect key="frame" x="61" y="12.666666666666629" width="15.000000000000021" height="15"/>
+                                                                <rect key="frame" x="61" y="12.666666666666629" width="15" height="15"/>
                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" secondItem="xQ4-Tv-FEb" secondAttribute="height" multiplier="1:1" id="gAI-OZ-qwj"/>
@@ -888,7 +888,7 @@
                                                         <rect key="frame" x="207" y="0.0" width="207" height="40"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chk_default" translatesAutoresizingMaskIntoConstraints="NO" id="vZ9-I9-ilh" customClass="CheckImageButton" customModule="SEVERANCE" customModuleProvider="target">
-                                                                <rect key="frame" x="61" y="12.666666666666629" width="15.000000000000021" height="15"/>
+                                                                <rect key="frame" x="61" y="12.666666666666629" width="15" height="15"/>
                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="15" id="CjR-YQ-h11"/>
@@ -1041,7 +1041,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="환부이미지상세" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GFe-Mw-H6W">
-                                        <rect key="frame" x="146.33333333333337" y="13.666666666666664" width="121.33333333333334" height="21"/>
+                                        <rect key="frame" x="146.33333333333334" y="13.666666666666664" width="121.33333333333334" height="21"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1311,38 +1311,6 @@
             </objects>
             <point key="canvasLocation" x="3900" y="821"/>
         </scene>
-        <!--Web View Controller-->
-        <scene sceneID="iTK-sH-9d9">
-            <objects>
-                <viewController storyboardIdentifier="WebViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="ySz-mN-COb" customClass="WebViewController" customModule="SEVERANCE" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="FvJ-I3-Lal">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i01-15-nXY" customClass="StoryBoardableWKWebView" customModule="SEVERANCE" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="i01-15-nXY" firstAttribute="leading" secondItem="Nsy-7M-Ce9" secondAttribute="leading" id="0Bl-y1-PhW"/>
-                            <constraint firstItem="Nsy-7M-Ce9" firstAttribute="trailing" secondItem="i01-15-nXY" secondAttribute="trailing" id="8HR-pE-1D1"/>
-                            <constraint firstItem="i01-15-nXY" firstAttribute="top" secondItem="Nsy-7M-Ce9" secondAttribute="top" id="NsQ-NO-sYF"/>
-                            <constraint firstItem="Nsy-7M-Ce9" firstAttribute="bottom" secondItem="i01-15-nXY" secondAttribute="bottom" id="iWE-WH-0Wi"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="Nsy-7M-Ce9"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="797-zX-QaQ"/>
-                    <nil key="simulatedTopBarMetrics"/>
-                    <nil key="simulatedBottomBarMetrics"/>
-                    <connections>
-                        <outlet property="webView" destination="i01-15-nXY" id="tQ4-TN-nje"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="UyT-zt-IRG" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1519" y="123"/>
-        </scene>
         <!--Barcode View Controller-->
         <scene sceneID="imo-ig-Kdc">
             <objects>
@@ -1355,7 +1323,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="스캔" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tzg-sE-Hgh">
-                                        <rect key="frame" x="189.66666666666663" y="13.666666666666664" width="35" height="21"/>
+                                        <rect key="frame" x="189.66666666666666" y="13.666666666666664" width="35" height="21"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1403,14 +1371,22 @@
             </objects>
             <point key="canvasLocation" x="796" y="822"/>
         </scene>
-        <!--Web View Controller-->
+        <!--WebViewController-->
         <scene sceneID="3m7-Ud-WaQ">
             <objects>
-                <viewController storyboardIdentifier="WebViewController_sev" useStoryboardIdentifierAsRestorationIdentifier="YES" id="RXv-9L-g0q" customClass="WebViewController" customModule="SEVERANCE" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="WebViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="RXv-9L-g0q" userLabel="WebViewController" customClass="WebViewController" customModule="SEVERANCE" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="gz5-7G-MJR">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Enf-5I-TD8">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                                <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <wkWebViewConfiguration key="configuration">
+                                    <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
+                                    <wkPreferences key="preferences"/>
+                                </wkWebViewConfiguration>
+                            </wkWebView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="center_back" translatesAutoresizingMaskIntoConstraints="NO" id="J7S-el-PIN">
                                 <rect key="frame" x="127" y="681" width="160" height="55"/>
                                 <color key="tintColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -1471,8 +1447,12 @@
                             <constraint firstItem="aDw-VO-IRd" firstAttribute="trailing" secondItem="XZF-8x-ai7" secondAttribute="trailing" id="WCJ-Zo-pzE"/>
                             <constraint firstItem="C2f-m6-yw0" firstAttribute="top" secondItem="hUm-mL-rGV" secondAttribute="top" constant="-30" id="Z4n-fE-CKy"/>
                             <constraint firstItem="aDw-VO-IRd" firstAttribute="bottom" secondItem="XZF-8x-ai7" secondAttribute="bottom" id="cCb-Ox-PSp"/>
+                            <constraint firstItem="aDw-VO-IRd" firstAttribute="trailing" secondItem="Enf-5I-TD8" secondAttribute="trailing" id="fAe-Zf-kEc"/>
+                            <constraint firstItem="Enf-5I-TD8" firstAttribute="leading" secondItem="aDw-VO-IRd" secondAttribute="leading" id="hjc-Ll-rC9"/>
                             <constraint firstItem="hUm-mL-rGV" firstAttribute="leading" secondItem="aDw-VO-IRd" secondAttribute="leading" id="iME-HW-KRb"/>
                             <constraint firstItem="hUm-mL-rGV" firstAttribute="height" secondItem="J7S-el-PIN" secondAttribute="height" id="kmL-iH-dW9"/>
+                            <constraint firstItem="Enf-5I-TD8" firstAttribute="top" secondItem="aDw-VO-IRd" secondAttribute="top" id="oNa-XB-a0p"/>
+                            <constraint firstItem="aDw-VO-IRd" firstAttribute="bottom" secondItem="Enf-5I-TD8" secondAttribute="bottom" id="obo-eb-YPT"/>
                             <constraint firstItem="aDw-VO-IRd" firstAttribute="bottom" secondItem="J7S-el-PIN" secondAttribute="bottom" id="xFw-EF-QjQ"/>
                             <constraint firstItem="hUm-mL-rGV" firstAttribute="top" secondItem="J7S-el-PIN" secondAttribute="top" id="zvV-8m-ias"/>
                         </constraints>
@@ -1481,10 +1461,17 @@
                     <navigationItem key="navigationItem" id="Yd5-if-raL"/>
                     <nil key="simulatedTopBarMetrics"/>
                     <nil key="simulatedBottomBarMetrics"/>
+                    <connections>
+                        <outlet property="bmenu_barcode" destination="C2f-m6-yw0" id="WEZ-R0-NVz"/>
+                        <outlet property="bmenu_center" destination="J7S-el-PIN" id="OMy-6B-2KI"/>
+                        <outlet property="bmenu_hamburger" destination="XZF-8x-ai7" id="7f1-RY-2Zn"/>
+                        <outlet property="bmenu_speaker" destination="hUm-mL-rGV" id="1pK-tc-IO2"/>
+                        <outlet property="webView" destination="Enf-5I-TD8" id="xsA-w1-SZe"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="MaK-yr-aBj" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1513.0434782608697" y="-542.11956521739137"/>
+            <point key="canvasLocation" x="1494" y="122"/>
         </scene>
     </scenes>
     <resources>

MCPlus/ViewControllers/WebViewController.swift

@@ -57,6 +57,15 @@ class WebViewController: UIViewController {
     var rememberme:String?
     let urlString = "\(MCarePlusConstants.DOMAIN_NAME)\(MCarePlusConstants.APP_NAME)\(Constants.SERVICE_START_ADDR)"
     
+    
+    //세브란스 하단 메뉴바 세팅
+    @IBOutlet weak var bmenu_speaker: UIView!
+    @IBOutlet weak var bmenu_hamburger: UIView!
+    @IBOutlet weak var bmenu_barcode: UIImageView!
+    
+    @IBOutlet weak var bmenu_center: UIImageView!
+    
+    
 }
 
 extension WebViewController{