Prechádzať zdrojové kódy

환부이미지 상세보기 api 수정

서용하 6 rokov pred
rodič
commit
f15c9fa50d

+ 10 - 10
MCPlus/Base.lproj/Main.storyboard

@@ -528,7 +528,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" 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="127" y="13.666666666666664" width="121.33333333333331" height="21"/>
+                                                <rect key="frame" x="130" y="12.999999999999998" width="115.33333333333331" height="22.333333333333329"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -567,13 +567,13 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="89.666666666666671" height="110"/>
                                                 <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="20.333333333333332" y="17" width="49.333333333333343" height="20"/>
+                                                        <rect key="frame" x="21.333333333333329" y="17" width="47" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qe6-Vy-qzG">
-                                                        <rect key="frame" x="0.0" y="56.666666666666657" width="89.666666666666671" height="36.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="55" width="89.666666666666671" height="38"/>
                                                         <attributedString key="attributedText">
                                                             <fragment content="내용">
                                                                 <attributes>
@@ -610,13 +610,13 @@
                                                 <rect key="frame" x="89.666666666666686" y="0.0" width="90" height="110"/>
                                                 <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="0.3333333333333286" y="17" width="89" height="20"/>
+                                                        <rect key="frame" x="4" y="17" width="82" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vg7-0U-jun">
-                                                        <rect key="frame" x="0.0" y="56.666666666666657" width="90" height="36.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="55" width="90" height="38"/>
                                                         <attributedString key="attributedText">
                                                             <fragment>
                                                                 <string key="content">내용 텍스트 
@@ -655,7 +655,7 @@
                                                 <rect key="frame" x="179.66666666666666" y="0.0" width="89.666666666666657" height="110"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1is-iz-dvA">
-                                                        <rect key="frame" x="0.0" y="56.666666666666657" width="89.666666666666671" height="36.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="55" width="89.666666666666671" height="38"/>
                                                         <attributedString key="attributedText"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
@@ -682,13 +682,13 @@
                                                 <rect key="frame" x="269.33333333333331" y="0.0" width="89.666666666666686" height="110"/>
                                                 <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="17.666666666666689" y="17" width="54.333333333333343" height="20"/>
+                                                        <rect key="frame" x="18.666666666666686" y="17" width="52" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B3J-gw-Uea">
-                                                        <rect key="frame" x="0.0" y="56.666666666666657" width="89.666666666666671" height="36.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="55" width="89.666666666666671" height="38"/>
                                                         <attributedString key="attributedText">
                                                             <fragment>
                                                                 <string key="content">내용 텍스트 
@@ -821,7 +821,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="187.66666666666666" height="40"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chk_default" translatesAutoresizingMaskIntoConstraints="NO" id="xQ4-Tv-FEb" customClass="CheckImageButton" customModule="kunkuk" customModuleProvider="target">
-                                                                <rect key="frame" x="51.333333333333336" y="12.666666666666629" width="15.000000000000021" height="15"/>
+                                                                <rect key="frame" x="51.333333333333336" y="12.666666666666629" width="15.000000000000007" 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"/>
@@ -852,7 +852,7 @@
                                                         <rect key="frame" x="187.66666666666663" y="0.0" width="187.33333333333337" height="40"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chk_default" translatesAutoresizingMaskIntoConstraints="NO" id="vZ9-I9-ilh" customClass="CheckImageButton" customModule="kunkuk" customModuleProvider="target">
-                                                                <rect key="frame" x="51" y="12.666666666666629" width="15.000000000000014" height="15"/>
+                                                                <rect key="frame" x="51" 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"/>

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

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

+ 4 - 3
MCPlus/ViewControllers/PhotoDetailViewController.swift

@@ -139,7 +139,7 @@ extension PhotoDetailViewController:UIScrollViewDelegate{
         param["searchCls"] = photo.user?.treatCls ?? ""
         param["thumbnail"] = ""
         param["excutionDtTm"] = Date().fromString(format: "yyyy-MM-dd hh:mm:ss")
-        param["excutionDtTm"] = photo.user?.visitDt ?? ""
+        param["visitDt"] = photo.user?.visitDt ?? ""
         
         if let dir = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
             //원본 이미지 찾기
@@ -154,9 +154,10 @@ extension PhotoDetailViewController:UIScrollViewDelegate{
             .param(reqParam: param)
             .enType(.json)
             .connect { [weak self](result:[String:Any]) in
-                
+                guard let `result` = result["result"] as? [[String:Any]] else{ return }
+                let returnCd = result.first?["returnCd"] as? String
                 //성공일시
-                if result["returnCd"] as? String == "0000"{
+                if returnCd == "0000"{
                     photo.isSended = true
                     photo.update()
                     self?.showAlert("서버에 업로드 되었습니다.", "", "확인", nil, { action in

+ 1 - 1
MCPlus/ViewControllers/PhotoViewController.swift

@@ -202,7 +202,7 @@ extension PhotoViewController{
         param["searchCls"] = photo.user?.treatCls ?? ""
         param["thumbnail"] = ""
         param["excutionDtTm"] = Date().fromString(format: "yyyy-MM-dd hh:mm:ss")
-        param["excutionDtTm"] = photo.user?.visitDt ?? ""
+        param["visitDt"] = photo.user?.visitDt ?? ""
         
         if let dir = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
             //원본 이미지 찾기