服务中心体验优化

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -32,9 +32,12 @@ class YHServiceCenterMainViewController: YHBaseViewController {
         view.isHidden = true
         return view
     }()
-    
+    var controllerOne: YHServiceOrderListView = YHServiceOrderListView()
+    var controllerTwo: YHServiceOrderListView = YHServiceOrderListView()
+    var controllerThree: YHServiceOrderListView = YHServiceOrderListView()
+    var controllerFour: YHServiceOrderListView = YHServiceOrderListView()
     var arrItemTitles = ["全部", "待开始", "进行中", "已完成"]
-    var arrItemVCs : [YHServiceOrderListView] = []
+    var arrItemVCs: [YHServiceOrderListView] = []
     var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
     lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
@@ -193,12 +196,15 @@ extension YHServiceCenterMainViewController {
             mobile = model.mobile
             UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
             UserDefaults.standard.synchronize()
-            segmentedView.dataSource = segmentedDataSource
-            segmentedView.reloadData()
-            arrItemVCs.removeAll()
             for i in 0..<arrItemTitles.count {
-                let vc = YHServiceOrderListView()
+                let vc = arrItemVCs[i] as YHServiceOrderListView
                 vc.type = i
+                if i == 1 {
+                    vc.type = 2
+                }
+                if i == 2 {
+                    vc.type = 1
+                }
                 vc.orderID = orderId
                 vc.mobile = mobile
                 vc.loadData()
@@ -209,19 +215,19 @@ extension YHServiceCenterMainViewController {
                     if type == 0 {
                         arrItemTitles[0] = "全部(\(count))"
                         
-                    } else if type == 1 {
-                        arrItemTitles[1] = "待开始(\(count))"
-                                           
                     } else if type == 2 {
-                        arrItemTitles[2] = "进行中(\(count))"
+                        arrItemTitles[1] = "进行中(\(count))"
+                                           
+                    } else if type == 1 {
+                        arrItemTitles[2] = "待开始(\(count))"
                                           
                     } else if type == 3 {
                         arrItemTitles[3] = "已完成(\(count))"
                     }
                     self.updata()
                 }
-                arrItemVCs.append(vc)
             }
+            segmentedView.dataSource = segmentedDataSource
             segmentedView.reloadData()
             serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) {[weak self] success, error in
                 guard let self = self else { return }
@@ -284,32 +290,39 @@ extension YHServiceCenterMainViewController {
             make.width.equalTo(KScreenWidth)
             make.height.equalTo(225)
         }
-                
-        for i in 0..<arrItemTitles.count {
-            let vc = YHServiceOrderListView()
-            vc.type = i
-            vc.orderID = orderId
-            vc.loadData()
-            vc.block = {[weak self] type, count in
-                guard let self = self else {
-                    return
-                }
-                if type == 0 {
-                    arrItemTitles[0] = "全部(\(count))"
-                    
-                } else if type == 1 {
-                    arrItemTitles[1] = "进行中(\(count))"
-                                       
-                } else if type == 2 {
-                    arrItemTitles[2] = "待开始(\(count))"
-                                      
-                } else if type == 3 {
-                    arrItemTitles[3] = "已完成(\(count))"
-                }
-                self.updata()
-            }
-            arrItemVCs.append(vc)
+        
+        controllerOne.type = 0
+        controllerOne.orderID = orderId
+        controllerOne.block = {[weak self] type, count in
+            guard let self = self else { return }
+            arrItemTitles[0] = "全部(\(count))"
+            self.updata()
+        }
+        controllerTwo.type = 2
+        controllerTwo.orderID = orderId
+        controllerTwo.block = {[weak self] type, count in
+            guard let self = self else { return }
+            arrItemTitles[1] = "进行中(\(count))"
+            self.updata()
+        }
+        controllerThree.type = 1
+        controllerThree.orderID = orderId
+        controllerThree.block = {[weak self] type, count in
+            guard let self = self else { return }
+            arrItemTitles[2] = "待开始(\(count))"
+            self.updata()
+        }
+        controllerFour.type = 3
+        controllerFour.orderID = orderId
+        controllerFour.block = {[weak self] type, count in
+            guard let self = self else { return }
+            arrItemTitles[3] = "已完成(\(count))"
+            self.updata()
         }
+        arrItemVCs.append(controllerOne)
+        arrItemVCs.append(controllerTwo)
+        arrItemVCs.append(controllerThree)
+        arrItemVCs.append(controllerFour)
         
         //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
         segmentedView.dataSource = segmentedDataSource

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -39,7 +39,12 @@ extension YHServiceOrderListView {
                 if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
                     self.homeTableView.isHidden = true
                 } else {
-                    self.homeTableView.reloadData()
+//                    DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
+//                        CATransaction.setDisableActions(true)
+                    self.homeTableView.isHidden = false
+                        self.homeTableView.reloadData()
+//                        CATransaction.commit()
+//                    })
                 }
             }
             if let block = self.block {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift

@@ -171,9 +171,10 @@ extension YHServiceOrderProgressTableViewCell {
             progressLabel.attributed.text = b + bb
         }
         if model.percentage == 0 {
-            progress.setProgress(0, animated: false)
+            progress.isHidden = true
         } else {
             progress.setProgress(Float(CGFloat(model.percentage))/100.0, animated: false)
+            progress.isHidden = false
         }
     }