fix audio

Bhagyashree.xcworkspace/xcuserdata/sunarctech2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -121,12 +121,12 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Bhagyashree/Sunarc/Controller/Me/MyCompletedOrdersViewController.swift"
-            timestampString = "560770072.590113"
+            filePath = "Bhagyashree/Sunarc/Controller/Me/MyAllServiceOrderViewController.swift"
+            timestampString = "561031158.873988"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "121"
-            endingLineNumber = "121"
+            startingLineNumber = "127"
+            endingLineNumber = "127"
             landmarkName = "tableView(_:didSelectRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -137,13 +137,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Bhagyashree/AppDelegate.swift"
-            timestampString = "560951661.375753"
+            filePath = "Bhagyashree/Sunarc/Controller/Me/MyAllServiceOrderViewController.swift"
+            timestampString = "561031158.874055"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "30"
-            endingLineNumber = "30"
-            landmarkName = "messaging(_:didReceiveRegistrationToken:)"
+            startingLineNumber = "124"
+            endingLineNumber = "124"
+            landmarkName = "tableView(_:didSelectRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

Bhagyashree/AppDelegate.swift

@@ -27,8 +27,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String) {
 //        UIPasteboard.general.string = fcmToken
         
-        print(fcmToken)
-        
         deviceTokenData = fcmToken
         let defaults = UserDefaults.standard;
         defaults.set(fcmToken, forKey: "deviceToken");

Bhagyashree/Fengshui.xcassets/pause.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "pause.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift

@@ -312,6 +312,7 @@ class MasterReplyCell: UITableViewCell {
     @IBOutlet weak var img2Height: NSLayoutConstraint!
     @IBOutlet weak var img1Height: NSLayoutConstraint!
 
+    var playingAudioAtIndex = 1000
     
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -402,6 +403,7 @@ class MasterReplyCell: UITableViewCell {
         if let postInFullScreenView = Utils.viewFrom("PostInFullScreenView") as? PostInFullScreenView {
             postInFullScreenView.setNeedsLayout()
             postInFullScreenView.layoutIfNeeded()
+            postInFullScreenView.lbContent.text = ""
             galleryPreview.overlayView = postInFullScreenView
         }
         
@@ -414,7 +416,7 @@ class MasterReplyCell: UITableViewCell {
     
 }
 
-extension MasterReplyCell: UITableViewDelegate, UITableViewDataSource {
+extension MasterReplyCell: UITableViewDelegate, UITableViewDataSource, ResultAudioCellDelegate {
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return arrayOfAudios.count
@@ -423,6 +425,16 @@ extension MasterReplyCell: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let audioCell = tableView.dequeueReusableCell(withIdentifier: "ResultAudioCell", for: indexPath) as! ResultAudioCell
         audioCell.audioPath = arrayOfAudios[indexPath.row]
+        audioCell.cellIndex = indexPath.row
+        audioCell.delegate = self
+        audioCell.btnPlay.tag = 0
+        
+        if indexPath.row == playingAudioAtIndex {
+            audioCell.btnPlay.setBackgroundImage(UIImage(named: "pause"), for: .normal)
+            audioCell.btnPlay.tag = 8080
+        } else {
+            audioCell.btnPlay.setBackgroundImage(UIImage(named: "play"), for: .normal)
+        }
         return audioCell
     }
     
@@ -430,18 +442,39 @@ extension MasterReplyCell: UITableViewDelegate, UITableViewDataSource {
         return 74.0
     }
     
+    func playingAudioAtIndex(index: Int) {
+        playingAudioAtIndex = index
+        self.tblAudio.reloadData()
+    }
+    
 }
 
+
+protocol ResultAudioCellDelegate {
+    func playingAudioAtIndex(index: Int)
+}
 class ResultAudioCell: UITableViewCell {
     
     @IBOutlet var btnPlay: UIButton!
     var audioPath: String?
+    var delegate: ResultAudioCellDelegate?
+    var cellIndex = 0
     
     
     @IBAction func play() {
         
+        print("tag = \(btnPlay.tag)")
+        
+        if btnPlay.tag == 8080 {
+            Audio.pause()
+            btnPlay.tag = 0
+            delegate?.playingAudioAtIndex(index: 1000)
+            return
+        }
+        
         if let audioPath = audioPath {
             Audio.playAudio(audioPath: audioPath, success: {
+                self.delegate?.playingAudioAtIndex(index: cellIndex)
             }) { (errorMesssage) in
                 self.viewController()?.view.showToast(errorMesssage, position: .bottom, popTime: 2.0, dismissOnTap: false)
             }

Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/FloorPlanFengshuiViewController.swift

@@ -107,6 +107,7 @@ class FloorPlanFengshuiViewController: UIViewController {
         if let postInFullScreenView = Utils.viewFrom("PostInFullScreenView") as? PostInFullScreenView {
             postInFullScreenView.setNeedsLayout()
             postInFullScreenView.layoutIfNeeded()
+            postInFullScreenView.lbContent.text = ""
             galleryPreview.overlayView = postInFullScreenView
         }
         

Bhagyashree/Sunarc/Controller/Forms/FormViewController.swift

@@ -8,6 +8,8 @@
 
 import UIKit
 import Kingfisher
+import INSPhotoGallery
+
 
 class FormViewController: UIViewController {
 
@@ -101,6 +103,12 @@ class CustomOptionImageCell: UITableViewCell {
     @IBOutlet var lblTitle: UILabel!
     @IBOutlet var imgImageView: UIImageView!
     
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        let tap = UITapGestureRecognizer(target: self, action: #selector(self.imageTapped(gesture:)))
+        imgImageView.addGestureRecognizer(tap)
+    }
+
     var customOption: CustomOption? {
         didSet {
             if let customOption = customOption {
@@ -108,10 +116,38 @@ class CustomOptionImageCell: UITableViewCell {
                 
                 if let image = customOption.value {
                     let url = URL(string: image)
-                    self.imgImageView.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
+                    self.imgImageView.kf.setImage(with: url, placeholder: nil, options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
+                }
+            }
+        }
+    }
+    
+    
+    
+    @objc func imageTapped(gesture: UITapGestureRecognizer) {
+        
+        if let image = imgImageView.image {
+
+            var photos = [INSPhoto]()
+            let photo = INSPhoto(image: image, thumbnailImage: nil)
+            photos.append(photo)
+            
+            let galleryPreview = INSPhotosViewController(photos: photos, initialPhoto: nil, referenceView: self.viewController()?.navigationController?.view)
+            if let postInFullScreenView = Utils.viewFrom("PostInFullScreenView") as? PostInFullScreenView {
+                postInFullScreenView.setNeedsLayout()
+                postInFullScreenView.layoutIfNeeded()
+                postInFullScreenView.lbContent.text = ""
+                galleryPreview.overlayView = postInFullScreenView
             }
+            galleryPreview.referenceViewForPhotoWhenDismissingHandler = { photo in
+                return nil
             }
+            
+            self.viewController()?.present(galleryPreview, animated: true, completion: {
+            })
+
         }
+        
     }
 
 }

Bhagyashree/Sunarc/Controller/Home/HomePageViewController.swift

@@ -166,6 +166,7 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
                 if let orderId = order.orderId {
                     chatViewController.orderId = orderId
                     chatViewController.customerId = order.customerDetail.customerId!
+                    chatViewController.customerProfileImage = dashboard.orders[indexPath.row-1].customerDetail.profileImage
                     self.navigationController?.pushViewController(chatViewController, animated: true)
                 }
             } else {
@@ -173,27 +174,13 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
                 enquiryDetailsViewController.incrementId = order.incrementId!
                 enquiryDetailsViewController.orderId = order.orderId!
                 enquiryDetailsViewController.customerName = dashboard.orders[indexPath.row-1].customerDetail.name
-                enquiryDetailsViewController.customerName = dashboard.orders[indexPath.row-1].customerDetail.profileImage
+                enquiryDetailsViewController.customerImage = dashboard.orders[indexPath.row-1].customerDetail.profileImage
                 self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
             }
             
         } else if order.products.first?.serviceType == .FORM{
             
             
-            if order.status == .COMPLETE {
-                let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
-                appointmentdetails.orderStatus = dashboard.orders[indexPath.row-1].status
-                appointmentdetails.incrementId = order.incrementId
-                appointmentdetails.orderId = order.orderId
-                self.navigationController?.pushViewController(appointmentdetails, animated: true)
-            } else {
-                let formVC = Utils.viewController(storyboardName: "Forms", ofType: FormViewController.self)
-                formVC.incrementId = order.incrementId
-                formVC.orderId = order.orderId
-                self.navigationController?.pushViewController(formVC, animated: true)
-            }
-
-            
 //            if order.status == .COMPLETE {
 //                let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
 //                appointmentdetails.orderStatus = dashboard.orders[indexPath.row-1].status
@@ -201,11 +188,25 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
 //                appointmentdetails.orderId = order.orderId
 //                self.navigationController?.pushViewController(appointmentdetails, animated: true)
 //            } else {
-//                if let form = Form.VC(with: order.incrementId!, orderId: order.orderId!, categoryType: order.products.first!.categoryType){
-//                    self.navigationController?.pushViewController(form, animated: true)
-//                }
+//                let formVC = Utils.viewController(storyboardName: "Forms", ofType: FormViewController.self)
+//                formVC.incrementId = order.incrementId
+//                formVC.orderId = order.orderId
+//                self.navigationController?.pushViewController(formVC, animated: true)
 //            }
 
+            
+            if order.status == .COMPLETE {
+                let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
+                appointmentdetails.orderStatus = dashboard.orders[indexPath.row-1].status
+                appointmentdetails.incrementId = order.incrementId
+                appointmentdetails.orderId = order.orderId
+                self.navigationController?.pushViewController(appointmentdetails, animated: true)
+            } else {
+                if let form = Form.VC(with: order.incrementId!, orderId: order.orderId!, categoryType: order.products.first!.categoryType){
+                    self.navigationController?.pushViewController(form, animated: true)
+                }
+            }
+            
         } else {
             self.view.showToast("Unknown service", position: .bottom, popTime: 2.0, dismissOnTap: false)
         }

Bhagyashree/Sunarc/Controller/Home/OnlineEnquiryViewController.swift

@@ -285,10 +285,10 @@ extension OnlineEnquiryViewController: UITextViewDelegate {
     
     func textViewDidChange(_ textView: UITextView) {
         if textView.text.count == 0 {
-            commentViewHeight.constant = 56
+//            commentViewHeight.constant = 56
             lblPlaceHolder.isHidden = false
         } else {
-            commentViewHeight.constant = txtComment.contentSize.height + (56-28) // 28 is height of txtComment
+//            commentViewHeight.constant = txtComment.contentSize.height + (56-28) // 28 is height of txtComment
             lblPlaceHolder.isHidden = true
         }
     }

Bhagyashree/Sunarc/Controller/Me/MyAllServiceOrderViewController.swift

@@ -180,16 +180,18 @@ extension MyAllServiceOrderViewController: UITableViewDelegate, UITableViewDataS
                 appointmentdetails.orderId = selectedService.orderId
                 self.navigationController?.pushViewController(appointmentdetails, animated: true)
             } else {
-                let formVC = Utils.viewController(storyboardName: "Forms", ofType: FormViewController.self)
-                formVC.incrementId = selectedService.incrementId
-                formVC.orderId = selectedService.orderId
-                self.navigationController?.pushViewController(formVC, animated: true)
+//                let formVC = Utils.viewController(storyboardName: "Forms", ofType: FormViewController.self)
+//                formVC.incrementId = selectedService.incrementId
+//                formVC.orderId = selectedService.orderId
+//                self.navigationController?.pushViewController(formVC, animated: true)
+                
+                if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
+                    self.navigationController?.pushViewController(form, animated: true)
+                }
+
             }
             
             
-//            if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
-//                self.navigationController?.pushViewController(form, animated: true)
-//            }
         } else {
             self.view.showToast("Unknown service", position: .bottom, popTime: 2.0, dismissOnTap: false)
         }

Bhagyashree/Sunarc/Controller/Me/MyCompletedOrdersViewController.swift

@@ -128,9 +128,14 @@ extension MyCompletedOrdersViewController: UITableViewDelegate, UITableViewDataS
             
         } else if selectedService.serviceType == .FORM{
             
-            if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
-                self.navigationController?.pushViewController(form, animated: true)
-            }
+            let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
+            appointmentdetails.incrementId = selectedService.incrementId
+            appointmentdetails.orderId = selectedService.orderId
+            self.navigationController?.pushViewController(appointmentdetails, animated: true)
+            
+//            if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
+//                self.navigationController?.pushViewController(form, animated: true)
+//            }
         } else {
             self.view.showToast("Unknown service", position: .bottom, popTime: 2.0, dismissOnTap: false)
         }

Bhagyashree/Sunarc/Model/Me/Service.swift

@@ -58,6 +58,7 @@ class Service {
         
         if let productsInfo = json["productNames"] as? [[String: Any]] {
             if let productInfo = productsInfo.first {
+                
                 self.productName    = productInfo["name"] as? String
                 self.productId      = productInfo["productId"] as? String
                 self.customerId     = productInfo["customer_id"] as? String

Bhagyashree/Sunarc/View/Appointment.storyboard

@@ -553,7 +553,7 @@
                                                                                         <constraints>
                                                                                             <constraint firstAttribute="width" secondItem="yGv-zf-IaV" secondAttribute="height" multiplier="1:1" id="zhg-EN-iQN"/>
                                                                                         </constraints>
-                                                                                        <state key="normal" image="play"/>
+                                                                                        <state key="normal" backgroundImage="play"/>
                                                                                         <connections>
                                                                                             <action selector="play" destination="r0F-XL-bfW" eventType="touchUpInside" id="6BG-4Q-rEd"/>
                                                                                         </connections>

Bhagyashree/Sunarc/View/Forms.storyboard

@@ -28,6 +28,16 @@
                                             <constraint firstAttribute="width" constant="20" id="rZq-aB-M5Z"/>
                                         </constraints>
                                     </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zea-ZP-79R">
+                                        <rect key="frame" x="40" y="35" width="295" height="21"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="21" id="mim-Wo-mB6"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" red="0.023529411760000001" green="0.41960784309999999" blue="0.64313725489999995" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u4j-hn-0zQ">
                                         <rect key="frame" x="0.0" y="0.0" width="69" height="64"/>
                                         <constraints>
@@ -38,27 +48,18 @@
                                             <action selector="back" destination="yVT-eK-TPJ" eventType="touchUpInside" id="vli-L5-DiF"/>
                                         </connections>
                                     </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zea-ZP-79R">
-                                        <rect key="frame" x="40" y="35" width="295" height="21"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="21" id="0oh-Ka-Yv4"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
                                 </subviews>
                                 <color key="backgroundColor" red="0.7843137255" green="0.92156862750000001" blue="0.99607843139999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstItem="u4j-hn-0zQ" firstAttribute="leading" secondItem="Agr-j8-uxE" secondAttribute="leading" id="0nI-5S-D2O"/>
-                                    <constraint firstAttribute="trailing" secondItem="zea-ZP-79R" secondAttribute="trailing" constant="40" id="CK6-Cd-k7g"/>
-                                    <constraint firstItem="zea-ZP-79R" firstAttribute="top" secondItem="KL2-fU-EaS" secondAttribute="bottom" constant="-21" id="R4V-Rd-hzR"/>
+                                    <constraint firstAttribute="bottom" secondItem="zea-ZP-79R" secondAttribute="bottom" constant="8" id="Fdp-Ep-BWZ"/>
+                                    <constraint firstItem="zea-ZP-79R" firstAttribute="leading" secondItem="KL2-fU-EaS" secondAttribute="trailing" constant="13" id="T5q-hH-V8g"/>
                                     <constraint firstItem="u4j-hn-0zQ" firstAttribute="top" secondItem="Agr-j8-uxE" secondAttribute="top" id="TtW-6R-usG"/>
                                     <constraint firstAttribute="bottom" secondItem="KL2-fU-EaS" secondAttribute="bottom" constant="8" id="Up3-8I-hHN"/>
                                     <constraint firstAttribute="bottom" secondItem="u4j-hn-0zQ" secondAttribute="bottom" id="Xi8-bJ-D2t"/>
+                                    <constraint firstAttribute="trailing" secondItem="zea-ZP-79R" secondAttribute="trailing" constant="40" id="e8q-vp-sKw"/>
                                     <constraint firstItem="KL2-fU-EaS" firstAttribute="leading" secondItem="Agr-j8-uxE" secondAttribute="leading" constant="7" id="mfH-eg-nXt"/>
                                     <constraint firstAttribute="height" constant="64" id="nlY-aR-9Kz"/>
-                                    <constraint firstAttribute="bottom" secondItem="zea-ZP-79R" secondAttribute="bottom" constant="8" id="rFv-3b-UaJ"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
@@ -149,8 +150,9 @@
                                                         <constraint firstAttribute="height" constant="1" id="prn-5n-udi"/>
                                                     </constraints>
                                                 </view>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jPD-VZ-2Tx">
+                                                <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jPD-VZ-2Tx">
                                                     <rect key="frame" x="9" y="45" width="356" height="178"/>
+                                                    <gestureRecognizers/>
                                                 </imageView>
                                             </subviews>
                                             <constraints>