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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // UI调整

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

@@ -12,6 +12,8 @@ import Kingfisher
 class YHSearchInfoCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHSearchInfoCell"
+    static let textFont = UIFont.PFSC_R(ofSize: 15)
+    
     var model: YHHomeListModel = YHHomeListModel()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -39,7 +41,7 @@ class YHSearchInfoCell: UITableViewCell {
     
     lazy var titleLabel: UILabel =  {
         var label = UILabel()
-        label.font = .PFSC_R(ofSize: 15)
+        label.font = Self.textFont
         label.textAlignment = .left
         label.textColor = UIColor(hex: 0x121A26)
         label.numberOfLines = 2
@@ -82,7 +84,8 @@ class YHSearchInfoCell: UITableViewCell {
     func renderHighLightText(_ text: String) {
         
         var attributedString = NSMutableAttributedString(string:self.model.title, attributes: [
-            .foregroundColor: UIColor(hex: 0x121A26)
+            .foregroundColor: UIColor(hex: 0x121A26),
+            .font: Self.textFont
         ])
         if isEmptyString(text) {
             self.titleLabel.attributedText = attributedString
@@ -91,7 +94,8 @@ class YHSearchInfoCell: UITableViewCell {
         
         // 设置高亮样式
         let highlightAttributes: [NSAttributedString.Key: Any] = [
-            .foregroundColor: UIColor.brandMainColor
+            .foregroundColor: UIColor.brandMainColor,
+            .font: Self.textFont
         ]
         
         let ranges = findOccurrencesOfString(text, inString:self.model.title)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateInfoCell.swift

@@ -69,7 +69,7 @@ class YHCertificateInfoCell: UITableViewCell {
         
         infoStr = "类型: \(typeStr)  |  所属人: \(ownerStr)"
         let attributes: [NSAttributedString.Key: Any] = [
-            .font: UIFont.PFSC_R(ofSize:11),
+            .font: UIFont.PFSC_R(ofSize:12),
             .foregroundColor: UIColor.labelTextColor2
         ]
         let attrString = NSMutableAttributedString(string: infoStr, attributes: attributes)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -245,7 +245,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 52
+        return 53.0
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_head_default.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 33334470@2x.png",
+      "filename" : "Group 2033194042@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 33334470@3x.png",
+      "filename" : "Group 2033194042@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }