Ver Fonte

사진찍었을때, 갤러리로 가면, 사진 전체선택이 되는 이슈 해결

강성희 há 6 anos atrás
pai
commit
617351be69

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

@@ -132,7 +132,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2Xu-xX-Z2f" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1610" y="822"/>
+            <point key="canvasLocation" x="1519" y="821"/>
         </scene>
         <!--Picture View Controller-->
         <scene sceneID="fkI-Y5-awn">
@@ -176,7 +176,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ObH-zG-MfG" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2402" y="822"/>
+            <point key="canvasLocation" x="2186" y="822"/>
         </scene>
         <!--Custom Camera View Controller-->
         <scene sceneID="hFe-8t-oPg">
@@ -487,7 +487,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ks9-gJ-jw3" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3240.8000000000002" y="821.67487684729065"/>
+            <point key="canvasLocation" x="3151" y="600"/>
         </scene>
         <!--Photo View Controller-->
         <scene sceneID="uEH-Iw-puj">
@@ -939,7 +939,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="5X6-Z1-ply" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4056.8000000000002" y="821.67487684729065"/>
+            <point key="canvasLocation" x="3151" y="1253"/>
         </scene>
         <!--Photo Detail View Controller-->
         <scene sceneID="aGf-vD-VaZ">
@@ -1221,7 +1221,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="M26-hv-4ja" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4850" y="822"/>
+            <point key="canvasLocation" x="3900" y="821"/>
         </scene>
         <!--Web View Controller-->
         <scene sceneID="iTK-sH-9d9">

+ 2 - 1
MCPlus/ViewControllers/CustomCameraViewController.swift

@@ -33,6 +33,7 @@ class CustomCameraViewController: UIViewController {
 
     @IBOutlet weak var previewView: UIView!
     
+    //사진 촬영 버튼
     @IBOutlet weak var takePhoto: UIButton!{
         didSet{
             takePhoto.addTapGestureRecognizer(action: self.takeAction)
@@ -221,7 +222,7 @@ extension CustomCameraViewController{
         if let image = image{
             if let data: Data = image.pngData(){
                 if data.format == "unknown"{
-                    self.showAlert("환부이미지촬영을 이용하시려면 라이브포토 기능을 off해주세요.", "", "확인")
+                    self.showAlert("환부이미지 촬영을 이용하시려면 라이브포토 기능을 off해주세요.", "", "확인")
                     return
                 }
             }

+ 3 - 3
MCPlus/ViewControllers/PhotoViewController.swift

@@ -151,7 +151,7 @@ extension PhotoViewController{
         //이미지 프로세싱 완료처리
         CustomCameraViewController.photoProcessCommit.signal.observe { [weak self](item) in
             DispatchQueue.main.async {
-                self?.reloadTable()
+                self?.reloadTable(checkAll: self?.allUserAlbumCheck.checked ?? false)
             }
         }
         
@@ -380,7 +380,7 @@ extension PhotoViewController{
         }
     }
     
-    //전체선택 / 해제
+    //전체선택 체크박스
     func allSelectAction(){
         //인덱스패스 저장용
         var selectedArr = Set<IndexPath>()
@@ -408,7 +408,7 @@ extension PhotoViewController{
         
     }
     
-    //전체앨범 or 선택환자
+    //전체환자 체크박스
     func allUserAlbumAction(){
 //        if self.allUserAlbumLabel.text == "전체환자"{
 //            self.allUserAlbumLabel.text = "개인환자"