Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  UI
  选择器

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

@@ -106,6 +106,12 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         return view
     }()
     
+    lazy var headBackImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "people_user_head_back")
+        return view
+    }()
+    
     lazy var signImgV:UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "people_sign")
@@ -201,6 +207,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         self.contentView.backgroundColor = .clear
         
         self.contentView.addSubview(self.cardView)
+        self.contentView.addSubview(self.headBackImgV)
         self.contentView.addSubview(self.headBgImgV)
         self.contentView.addSubview(self.headImgV)
         self.contentView.addSubview(self.signImgV)
@@ -227,6 +234,11 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             make.top.equalTo(16)
         }
         
+        self.headBackImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(headWidth+10)
+            make.center.equalTo(self.headImgV)
+        }
+        
         self.headBgImgV.snp.makeConstraints { make in
             make.width.height.equalTo(headWidth+6)
             make.center.equalTo(self.headImgV)

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

@@ -90,6 +90,12 @@ class YHNameCardInfoView: DragCardView {
         return view
     }()
     
+    lazy var headBackImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "people_user_head_back")
+        return view
+    }()
+    
     lazy var headBgImgV:UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "people_user_head_bg")
@@ -113,7 +119,7 @@ class YHNameCardInfoView: DragCardView {
     lazy var professionalLabel:UILabel = {
         let label = UILabel()
         label.textAlignment = .center
-        label.textColor = UIColor.mainTextColor
+        label.textColor = UIColor.mainTextColor70
         label.font = UIFont.PFSC_R(ofSize:14)
         label.numberOfLines = 2
         return label
@@ -187,6 +193,8 @@ class YHNameCardInfoView: DragCardView {
     private func setupUI() {
         
         self.contentView.addSubview(self.bgImgV)
+        
+        self.contentView.addSubview(self.headBackImgV)
         self.contentView.addSubview(self.headBgImgV)
         self.contentView.addSubview(self.headImgV)
         self.contentView.addSubview(self.signImgV)
@@ -210,7 +218,10 @@ class YHNameCardInfoView: DragCardView {
             make.width.height.equalTo(98+6)
             make.center.equalTo(self.headImgV)
         }
-        
+        self.headBackImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(98+10)
+            make.center.equalTo(self.headImgV)
+        }
         self.signImgV.snp.makeConstraints { make in
             make.centerX.equalTo(self.headImgV)
             make.width.equalTo(49)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift

@@ -298,6 +298,7 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
             return label
             
         default:
+            let view = UIView()
             let label = UILabel()
             label.textColor = UIColor.mainTextColor
             label.font = UIFont.PFSC_M(ofSize: 14)
@@ -319,7 +320,13 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
             if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
                 pickerView.subviews[1].backgroundColor = UIColor.brandMainColor6
             }
-            return label
+            view.addSubview(label)
+            label.snp.makeConstraints { make in
+                make.top.bottom.equalToSuperview()
+                make.left.equalTo(16)
+                make.right.equalTo(-16)
+            }
+            return view
             
         }
         

galaxy/galaxy/Res/Assets.xcassets/People/people_user_head_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Ellipse 1789@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Ellipse 1789@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}