首页 数据展示

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

@@ -24,6 +24,8 @@ class YHHomePageViewController: YHBaseViewController {
     let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
     var homeHeaderViewHeight = YHHomeHeadView.fixViewH
     
+    var needReloadDataFlag : Bool = false
+    
     lazy var homeCollectView = {
         // 设置布局方向
         let flowLayout = YHHomeCollectionLayout()
@@ -45,12 +47,19 @@ class YHHomePageViewController: YHBaseViewController {
         super.viewDidLoad()
         setupUI()
         
+        NotificationCenter.default.addObserver(self, selector: #selector(clickMsgitem), name: YhConstant.YhNotification.clickHomeMsgNotifiction, object: nil)
+        
         //1、加载默认数据
         homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
         getCacheDataForHomeNewsData()
         
         //2、请求新的数据
         getData()
+        
+        //3、
+        requestOrder()
+        
+        
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -60,8 +69,11 @@ class YHHomePageViewController: YHBaseViewController {
         YHOSSManager.share.getOSSID()
         updateDefaultSearchKeyWord()
         getTotalUnreadMsgCount()
-//        requestOrder()
         
+        if needReloadDataFlag {
+            needReloadDataFlag = false
+            requestOrder()
+        }
     }
     
     lazy var searchView: YHHomeSearchView = {
@@ -124,7 +136,6 @@ class YHHomePageViewController: YHBaseViewController {
                             }
                         }
                     }
-                    
                 } else {
                     DispatchQueue.main.async {
                         self.showOrderTipsView(isShow)
@@ -163,6 +174,9 @@ class YHHomePageViewController: YHBaseViewController {
 }
 
 private extension YHHomePageViewController {
+    @objc func clickMsgitem() {
+        needReloadDataFlag = true
+    }
     
     
     @objc func didSearchBarClicked() {

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift

@@ -144,6 +144,8 @@ extension YHOrderTipsItemView {
             vc.type = Int(msg.type)
             vc.title = self.getTypeString()
             UIViewController.current?.navigationController?.pushViewController(vc)
+            
+            NotificationCenter.default.post(name: YhConstant.YhNotification.clickHomeMsgNotifiction, object: nil)
         }
     }
     
@@ -199,9 +201,9 @@ extension YHOrderTipsItemView {
             make.right.equalTo(lableTime.snp.left).offset(-12)
         }
         
-        let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor70))
-        let bb: ASAttributedString = .init("3", .font(UIFont.PFSC_B(ofSize: 13)),.foreground(UIColor.brandMainColor))
-        let cc: ASAttributedString = .init("份证件需要上传份证件需要上传份证件需要上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor70))
-        lableName.attributed.text = aa+bb+cc
+//        let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor70))
+//        let bb: ASAttributedString = .init("3", .font(UIFont.PFSC_B(ofSize: 13)),.foreground(UIColor.brandMainColor))
+//        let cc: ASAttributedString = .init("份证件需要上传份证件需要上传份证件需要上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor70))
+//        lableName.attributed.text = aa+bb+cc
     }
 }

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

@@ -33,6 +33,8 @@ class YHHomePageViewModel : YHBaseViewModel {
     
     //首页 签约用户信息
     var signerModel : YHSignerInfoModel?
+    
+//    var testNumber : Int = 5 //for test hjl
 }
 
 //接口
@@ -76,7 +78,32 @@ extension YHHomePageViewModel {
             }
             arrLastTwoMessages = result.list
             
-            //for test hjl 测试数据
+//            let model1 = YHHomeLastMessageModel()
+//            model1.id = "1"
+//            model1.content = "我是内容呀 消息填写"
+//            model1.time = 1609459200
+//            model1.type = 1
+//
+//
+//            let model2 = YHHomeLastMessageModel()
+//            model2.id = "2"
+//            model2.content = "我是内容呀 消息填写"
+//            model2.time = 1609459200
+//            model2.type = 2
+//
+//            
+//            
+//            if testNumber > 2 {
+//                arrLastTwoMessages = [model1,model2] //for test hjl // //测试数据
+//            } else if testNumber == 1 {
+//                arrLastTwoMessages = [model1] //for test hjl // //测试数据
+//            } else {
+//                arrLastTwoMessages = []
+//            }
+//            
+//            testNumber = testNumber - 1
+            
+            
             
             callBackBlock(true,nil)
         } failBlock: { err in

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -254,5 +254,9 @@ extension YhConstant {
         // 跳转 社区的人脉页
         public static let goConnectionVCNotifiction = Notification.Name(rawValue: "com.yinhe.goConnectionVCNotifiction")
         
+        
+        // 点击了 首页的消息
+        public static let  clickHomeMsgNotifiction = Notification.Name(rawValue: "com.yinhe.clickHomeMsgNotifiction")
+
     }
 }