首页 自测优化

galaxy/galaxy/AppDelegate.swift

@@ -158,9 +158,7 @@ extension AppDelegate {
     
     //1.设置HomePageView为主窗口
     func setupRootVCWithTabBar() {
-//        gk_navigationBar.isHidden = false
         let tabBarController = YHTabBarViewController()
-//        let homeVC = YHHomePageViewController() //for test hjl
         let homeVC = YHHomeHoldViewPageViewController()
         tabBarController.delegate = homeVC
         let v0 = YHNavigationController(rootVC:homeVC)

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift

@@ -88,12 +88,8 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
         let offy = k_Height_safeAreaInsetsTop() + 6 + YHHomeSearchView.viewH + 6
         segmentedView.frame = CGRect(x: 0, y: offy, width: view.bounds.size.width, height: 48)
         
-        let offy1 = offy + 48 + 8
+        let offy1 = offy + 48
         listContainerView.frame = CGRect(x: 0, y: offy1, width: view.bounds.size.width, height: view.bounds.size.height - offy1 - k_Height_TabBar)
-        
-//        listContainerView.backgroundColor = .red//for test hjl
-//        homePageVC.homeCollectView.backgroundColor = .yellow//for test hjl
-//        homePageVC.view.backgroundColor = .purple//for test hjl
     }
     
     lazy var searchView: YHHomeSearchView = {

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -192,9 +192,6 @@ private extension YHHomePageViewController {
                 return
             }
             
-            
-            
-            
             if self.viewModel.hasMoreForHomeNews == false {
                 self.homeCollectView.es.noticeNoMoreData()
                 self.homeCollectView.footer?.alpha = 1
@@ -205,11 +202,9 @@ private extension YHHomePageViewController {
                     item.calHeightParam()
                 }
                 
-                
                 self.viewModel.arrHomeNewsData = arrData
                 self.homeCollectView.reloadData()
             }
-            
             self.homeCollectView.setContentOffset(CGPoint(x: 0, y: -homeHeaderViewHeight), animated: false)
         }
     }
@@ -259,19 +254,19 @@ private extension YHHomePageViewController {
                     UserDefaults.standard.synchronize()
                 }
                 
-                    self.homeCollectView.es.stopPullToRefresh()
-                    
-                    
-                    if self.viewModel.hasMoreForHomeNews == false {
-                        self.homeCollectView.es.noticeNoMoreData()
-                        self.homeCollectView.footer?.alpha = 1
-                    }
-                    
-                    self.homeCollectView.reloadData()
-                    
-                    DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25, execute: {
-                        self.requestOrder()
-                    })
+                self.homeCollectView.es.stopPullToRefresh()
+                
+                
+                if self.viewModel.hasMoreForHomeNews == false {
+                    self.homeCollectView.es.noticeNoMoreData()
+                    self.homeCollectView.footer?.alpha = 1
+                }
+                
+                self.homeCollectView.reloadData()
+                
+                DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25, execute: {
+                    self.requestOrder()
+                })
             }
     }
     
@@ -356,6 +351,7 @@ extension YHHomePageViewController {
     // 请求订单数据
     func requestOrder() {
         if YHLoginManager.shared.isLogin()  == false {
+            self.showOrderTipsView(false)
             return
         }
         self.serviceCenterMainReqVM.getContactList {

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -92,7 +92,7 @@ extension YHHomePageViewModel {
 //            
 //            
 //            if testNumber > 2 {
-//                arrLastTwoMessages = [model1,model2] //for test hjl // //测试数据
+//                arrLastTwoMessages = [model1,model2]
 //            } else if testNumber == 1 {
 //                arrLastTwoMessages = [model1] //for test hjl // //测试数据
 //            } else {

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

@@ -47,20 +47,7 @@ class YHServiceListViewController: YHBaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         loadData()
-        updateDefaultSearchKeyWord()
     }
-    
-    func updateDefaultSearchKeyWord() {
-        var placeHolder = "香港身份"
-        if isHaveLocalSearchRecords() {
-            let latestValidSearchWord = getLatestValidSearchWord()
-            if !latestValidSearchWord.isEmpty {
-                placeHolder = latestValidSearchWord
-            }
-        }
-//        tableHeadView.searchPlaceHolder = placeHolder
-    }
-    
 }
 
 extension YHServiceListViewController {
@@ -127,10 +114,10 @@ extension YHServiceListViewController {
         tableHeadView = YHServerTableHeadView()
         tableHeadView.titleLabel.text = "香港身份攻略"
         tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH)
-        sectionView.frame = CGRect(x: 0, y: -48, width: KScreenWidth, height: 48)
+        sectionView.frame = CGRect(x: 0, y: -YHServiceSectionView.viewH, width: KScreenWidth, height: YHServiceSectionView.viewH)
         homeCollectView.addSubview(tableHeadView)
         homeCollectView.addSubview(sectionView)
-        homeCollectView.contentInset = UIEdgeInsets(top: YHServerTableHeadView.viewH + 48, left: 0, bottom: 0, right: 0)
+        homeCollectView.contentInset = UIEdgeInsets(top: YHServerTableHeadView.viewH + YHServiceSectionView.viewH, left: 0, bottom: 0, right: 0)
         homeCollectView.delegate = self
         homeCollectView.dataSource = self
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -219,7 +219,6 @@ private extension YHHKPlanItemView {
             maxNumbler = 500
         } else {
             maxNumbler = 300
-//            maxNumbler = 10 //for test hjl
         }
         tipsLable.text = tipsTxt
         myTextView.text = getFuckString(string: model.content)
@@ -397,12 +396,6 @@ extension YHHKPlanItemView : UITextViewDelegate {
             return true
         }
         
-//        var newLength = (textView.text as NSString).length + text.count - range.length
-//        if dataMode?.type == .planOther {
-//            return newLength <= maxNumbler
-//        } else {
-//            newLength = calcTextLength(string: textView.text)
-//        }
         var newLength = calcTextLength(string: textView.text)
         return newLength <= maxNumbler - 1
     }
@@ -412,31 +405,9 @@ extension YHHKPlanItemView : UITextViewDelegate {
         guard let text = textView.text else { return }
         
         var txtNum : Int = 0
-//        if model.type == .planOther {
-//            txtNum = myTextView.text.count
-//            numberLabel.text = txtNum.string + "/\(maxNumbler)"
-//            
-//            
-//            model.content = text
-//        } else {
-//            txtNum = calcTextLength(string: text)
-//            numberLabel.text =  txtNum.string + "/\(maxNumbler)" //for test hjl
-//            
-//            
-//            printLog(text.count)
-//            if text.count <= maxNumbler{
-//                model.content = text
-//            } else {
-//                var ttt = text
-//                let subString = ttt.slice(from: 0, length: maxNumbler)
-//                
-//                model.content = subString
-//            }
-//            
-//        }
         
         txtNum = calcTextLength(string: text)
-        numberLabel.text =  txtNum.string + "/\(maxNumbler)" //for test hjl
+        numberLabel.text =  txtNum.string + "/\(maxNumbler)"
         
         
         printLog(text.count)

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

@@ -11,14 +11,16 @@ import UIKit
 class YHServerTableHeadView: UIView {
 //    var search: YHHomeSearchView!
     
-    static let viewH : CGFloat = 365.0 - 36.0
+//    static let viewH : CGFloat = 365.0 - 36.0
+    
+    static let viewH : CGFloat = 8 + 235 + 32 + 25 + 10
     
     var bannarView: YHServiceBannerView!
     var titleLabel: UILabel!
 
     var dataSource: YHScemeHeadModel? {
         didSet {
-            updateAllViews()
+//            updateAllViews()
         }
     }
 //    var searchPlaceHolder:String = "" {
@@ -78,19 +80,19 @@ class YHServerTableHeadView: UIView {
         }
     }
     
-    func updateAllViews() {
-        guard let model = dataSource else { return }
-    }
+//    func updateAllViews() {
+//        guard let model = dataSource else { return }
+//    }
     
     
-    @objc func goNext() {
-        UIViewController.current?.navigationController?.pushViewController(YHScoreDetailViewController())
-    }
+//    @objc func goNext() {
+//        UIViewController.current?.navigationController?.pushViewController(YHScoreDetailViewController())
+//    }
     
-    @objc func didSearchBarClicked() {
-        let vc = YHSearchInfomationVC()
-//        vc.searchPlaceHolder = self.searchPlaceHolder
-//        printLog("placeHolder: \(searchPlaceHolder)")
-        UIViewController.current?.navigationController?.pushViewController(vc)
-    }
+//    @objc func didSearchBarClicked() {
+//        let vc = YHSearchInfomationVC()
+////        vc.searchPlaceHolder = self.searchPlaceHolder
+////        printLog("placeHolder: \(searchPlaceHolder)")
+//        UIViewController.current?.navigationController?.pushViewController(vc)
+//    }
 }

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

@@ -9,6 +9,8 @@
 import UIKit
 
 class YHServiceSectionView: UIView {
+    
+    static let viewH : CGFloat = 48.0
 
     typealias Block = (YHClassifyModel) -> ()
     var block: Block?