几处bug修改

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -80,7 +80,7 @@ extension YHActivityDetailViewController {
                 showApplyUI()
             case .end:
                 printLog("活动已结束")
-                YHHUD.flash(message: "活动已结束")
+//                YHHUD.flash(message: "活动已结束")
             default:
                 printLog("")
             }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -190,14 +190,16 @@ extension YHActivityListViewController {
     func loadMoreData() {
         self.viewModel.getActivityList(firstFlag : false,type : type) {[weak self] success, error in
             guard let self = self else { return }
+            self.tableView.reloadData()
+            self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
+            
             DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
                 self.tableView.es.stopLoadingMore()
                 if self.viewModel.hasMoreForActivityList == false {
                     self.tableView.es.noticeNoMoreData()
                     self.tableView.footer?.alpha = 1
                 }
-                self.tableView.reloadData()
-                self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
+                
             })
         }
     }
@@ -206,17 +208,14 @@ extension YHActivityListViewController {
         self.viewModel.getActivityList(firstFlag : true,type: type) {[weak self] success, error in
             guard let self = self else { return }
             
+            self.tableView.reloadData()
+            self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
             DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                 self.tableView.es.stopPullToRefresh()
-                
-                
                 if self.viewModel.hasMoreForActivityList == false {
                     self.tableView.es.noticeNoMoreData()
                     self.tableView.footer?.alpha = 1
                 }
-                self.tableView.reloadData()
-                
-                self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
             })
         }
     }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailItemView.swift

@@ -34,25 +34,25 @@ class YHActivityDetailItemView: UIView {
     }()
     
     lazy var nameLabel:UILabel = {
-        let nameLabel = UILabel()
-        nameLabel.textColor = UIColor.mainTextColor
-        nameLabel.textAlignment = .left
-        nameLabel.font = UIFont.PFSC_M(ofSize:17)
-        nameLabel.text = "活动详情"
-        nameLabel.numberOfLines = 0
-        return nameLabel
+        let lable = UILabel()
+        lable.textColor = UIColor.mainTextColor
+        lable.textAlignment = .left
+        lable.font = UIFont.PFSC_M(ofSize:17)
+        lable.text = "活动详情"
+        lable.numberOfLines = 0
+        return lable
     }()
     
     lazy var describeLable:UILabel = {
-        let nameLabel = UILabel()
-        nameLabel.textColor = UIColor.mainTextColor70
-        nameLabel.textAlignment = .left
-        nameLabel.lineBreakMode = .byCharWrapping
-        nameLabel.font = UIFont.PFSC_R(ofSize:14)
-        nameLabel.text = "1. 从学渣到哈佛，小儿子经历的挫折和迷茫\r\n2. 诈骗到财富自由，大儿子的“啃老”生活\r\n3. 小女儿15岁写两本书，又获艺术类冠亚军\r\n4. 养育五部曲，精心散养、快乐养育"
-        nameLabel.numberOfLines = 0
-        nameLabel.isHidden = true
-        return nameLabel
+        let lable = UILabel()
+        lable.textColor = UIColor.mainTextColor70
+        lable.textAlignment = .left
+        lable.lineBreakMode = .byCharWrapping
+        lable.font = UIFont.PFSC_R(ofSize:14)
+        lable.text = " "
+        lable.numberOfLines = 0
+        lable.isHidden = true
+        return lable
     }()
 }
 
@@ -65,6 +65,10 @@ extension YHActivityDetailItemView {
         }
         
         
+        describeLable.text = model.introduce
+
+        
+        
         nameLabel.snp.remakeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalTo(bottomLine.snp.bottom).offset(24)
@@ -73,6 +77,10 @@ extension YHActivityDetailItemView {
         
         
         
+        
+        
+        
+        
         if model.introduce.isEmpty {
             
         } else {
@@ -136,6 +144,9 @@ extension YHActivityDetailItemView {
                 lastView = imageV
             }
         }
+        
+        
+        
     }
     
     

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

@@ -113,14 +113,8 @@ class YHHomePageViewController: YHBaseViewController {
                             
                         }
                         
-//                        DispatchQueue.main.async {
-//                            self.showOrderTipsView(isShow)
-//                        }
-                        
-                        
                         self.viewModel.getLastTwoMessagesForSigner { success, error in
                             if success {
-                                
                                 self.homeHeaderView.orderTipsView.arrLastTwoMessage = self.viewModel.arrLastTwoMessages
                                 
                             } else {

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHomeLastMessageModel.swift

@@ -11,9 +11,16 @@ import HandyJSON
 
 class YHHomeLastMessageModel: HandyJSON {
     var id: String = ""
-    var content: Int = 0
-    var time: Int64 = -1
+    var content: String = ""
+    var time: Int64 = 0
     var type: Int64 = -1 //消息类型：1-资料填写；2-证件上传；3-文书定稿；4-文件签字; 5-资料递交
     required init() {
     }
 }
+
+
+class YHHomeLastMessageListModel: HandyJSON {
+    var list: [YHHomeLastMessageModel] = []
+    required init() {
+    }
+}

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

@@ -16,7 +16,7 @@ class YHHomeHeadView: UIView {
 //    private static let viewHWithOrderTips: CGFloat = YHHomeHeadView.fixViewH + (20 + YHOrderTipsView.viewH)
     
     var homeHeadViewH : CGFloat {
-        return YHHomeHeadView.fixViewH + (20 + self.orderTipsView.tipViewH)
+        return YHHomeHeadView.fixViewH + (20 + orderTipsView.tipViewH)
     }
     
     override init(frame: CGRect) {
@@ -100,11 +100,13 @@ class YHHomeHeadView: UIView {
     
     override func layoutSubviews() {
         super.layoutSubviews()
-//        orderTipsView.snp.makeConstraints { make in
-//            make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
-//            make.left.right.equalToSuperview()
-//            make.height.equalTo(YHOrderTipsView.viewH)
-//        }
+        
+        
+        
+
+        
+        
+        
     }
 }
 

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

@@ -36,6 +36,9 @@ class YHOrderTipsView: UIView {
         
         let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
         addGestureRecognizer(tap)
+        
+        
+//        backgroundColor = .red //for test hjl
     }
     
     

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

@@ -69,12 +69,29 @@ extension YHHomePageViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             let dic = json.data
-            guard let result = [YHHomeLastMessageModel].deserialize(from: dic as? [Any]) else {
+            guard let result = YHHomeLastMessageListModel.deserialize(from: dic as? Dictionary) else {
                 self.arrLastTwoMessages = []
                 callBackBlock(false,nil)
                 return
             }
-            arrLastTwoMessages = result as? [YHHomeLastMessageModel] ?? []
+            arrLastTwoMessages = result.list
+            
+//            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
+//            
+//            arrLastTwoMessages = [model1,model2]
+            
+            
             
             callBackBlock(true,nil)
         } failBlock: { err in