// UI

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchResultListViewController.swift

@@ -53,6 +53,16 @@ class YHMatchResultListViewController: YHBaseViewController {
         return label
     }()
     
+    lazy var wingLeftImgV: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "people_match_wing_left"))
+        return view
+    }()
+    
+    lazy var wingRightImgV: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "people_match_wing_right"))
+        return view
+    }()
+    
     lazy var guideView:YHMatchCardUsageGuideView = {
         let view = YHMatchCardUsageGuideView.createView()
         view.isHidden = true
@@ -79,6 +89,12 @@ class YHMatchResultListViewController: YHBaseViewController {
         return btn
     }()
     
+    lazy var lineView: UIView = {
+        let lineView = UIView()
+        lineView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: 0.3)
+        return lineView
+    }()
+    
     lazy var rematchBtn:UIButton = {
        let btn = UIButton()
         btn.isHidden = true
@@ -100,6 +116,7 @@ class YHMatchResultListViewController: YHBaseViewController {
             self.rematchBtn.isHidden = true
             self.changeBtn.isHidden = false
             self.myCardBtn.isHidden = false
+            self.lineView.isHidden = false
             self.cardContainer.reloadData(forceReset: true)
         }
         return view
@@ -194,16 +211,10 @@ class YHMatchResultListViewController: YHBaseViewController {
         self.view.addSubview(topLabel)
         self.view.addSubview(changeBtn)
         self.view.addSubview(myCardBtn)
-        
-        let lineView = UIView()
-        lineView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: 0.3)
         self.view.addSubview(lineView)
         
-        let wingLeftImgV = UIImageView(image: UIImage(named: "people_match_wing_left"))
-        self.view.addSubview(wingLeftImgV)
-        
-        let wingRightImgV = UIImageView(image: UIImage(named: "people_match_wing_right"))
-        self.view.addSubview(wingRightImgV)
+        self.view.addSubview(self.wingLeftImgV)
+        self.view.addSubview(self.wingRightImgV)
         
         self.view.addSubview(self.cardActionView)
         self.cardActionView.addSubview(cardContainer)
@@ -237,19 +248,19 @@ class YHMatchResultListViewController: YHBaseViewController {
             make.bottom.equalToSuperview().offset(-80)
             make.left.equalTo(self.view.snp.centerX)
         }
-        lineView.snp.makeConstraints { make in
+        self.lineView.snp.makeConstraints { make in
             make.width.equalTo(1)
             make.height.equalTo(13)
             make.centerX.equalToSuperview()
             make.centerY.equalTo(self.changeBtn)
         }
         
-        wingLeftImgV.snp.makeConstraints { make in
+        self.wingLeftImgV.snp.makeConstraints { make in
             make.width.height.equalTo(19)
             make.right.equalTo(self.topLabel.snp.left)
             make.centerY.equalTo(self.topLabel)
         }
-        wingRightImgV.snp.makeConstraints { make in
+        self.wingRightImgV.snp.makeConstraints { make in
             make.width.height.equalTo(19)
             make.left.equalTo(self.topLabel.snp.right)
             make.centerY.equalTo(self.topLabel)
@@ -441,6 +452,7 @@ extension YHMatchResultListViewController: DragCardDelegate {
             self.rematchBtn.isHidden = false
             self.changeBtn.isHidden = true
             self.myCardBtn.isHidden = true
+            self.lineView.isHidden = true
         })
     }
 

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendRequestView.swift

@@ -13,7 +13,7 @@ class YHFriendRequestView: UIView {
     var sendBlock:((String?)->())?
     static let cardHeight = 313.0
     let textMaxCount = 200
-    let placeHolderStr = "在银河相遇，期待与你共话未来，互学互鉴，盼成为好友，谢谢~"
+    let defaultStr = "在银河相遇，期待与你共话未来，互学互鉴，盼成为好友，谢谢~"
     var userModel:YHMatchUserInfo = YHMatchUserInfo()  {
         didSet {
             if let url = URL(string: self.userModel.avatar) {
@@ -88,7 +88,7 @@ class YHFriendRequestView: UIView {
     
     lazy var msgContentView:UIView = {
         let view = UIView()
-        view.backgroundColor = UIColor(hex: 0xF4F6FA)
+        view.backgroundColor = UIColor(hex: 0xF8F8F8)
         view.layer.cornerRadius = 3.0
         return view
     }()
@@ -98,6 +98,7 @@ class YHFriendRequestView: UIView {
         view.textColor = .mainTextColor70
         view.font = UIFont.PFSC_R(ofSize: 14)
         view.backgroundColor = .clear
+        view.text = self.defaultStr
         view.delegate = self
         return view
     }()
@@ -107,7 +108,7 @@ class YHFriendRequestView: UIView {
         label.textColor = UIColor.mainTextColor30
         label.textAlignment = .right
         label.font = UIFont.PFSC_R(ofSize:14)
-        label.text = "0/\(self.textMaxCount)"
+        label.text = "\(self.defaultStr.count)/\(self.textMaxCount)"
         return label
     }()
     
@@ -140,7 +141,6 @@ class YHFriendRequestView: UIView {
         label.textColor = UIColor.placeHolderColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_R(ofSize: 14)
-        label.text = self.placeHolderStr
         label.numberOfLines = 0
         label.isHidden = false
         return label
@@ -175,7 +175,7 @@ class YHFriendRequestView: UIView {
     @objc func didSendBtnClicked() {
         var text = self.textView.text
         if isEmptyString(text) {
-            text = self.placeHolderStr
+            text = self.defaultStr
         }
         self.sendBlock?(text)
         dismiss()
@@ -208,7 +208,7 @@ class YHFriendRequestView: UIView {
         
         cardView.addSubview(msgContentView)
         msgContentView.addSubview(textView)
-        msgContentView.addSubview(placeHolderLabel)
+//        msgContentView.addSubview(placeHolderLabel)
         msgContentView.addSubview(textCountLabel)
         
         cardView.addSubview(cancelBtn)
@@ -264,11 +264,11 @@ class YHFriendRequestView: UIView {
             make.right.equalTo(-10)
         }
         
-        self.placeHolderLabel.snp.makeConstraints { make in
-            make.top.equalTo(self.textView.snp.top).offset(7)
-            make.left.equalTo(self.textView.snp.left).offset(7)
-            make.right.equalTo(self.textView)
-        }
+//        self.placeHolderLabel.snp.makeConstraints { make in
+//            make.top.equalTo(self.textView.snp.top).offset(7)
+//            make.left.equalTo(self.textView.snp.left).offset(7)
+//            make.right.equalTo(self.textView)
+//        }
         
         self.textCountLabel.snp.makeConstraints { make in
             make.left.equalTo(16)