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:
  细节修改
  //  返回按钮

galaxy/galaxy/AppDelegate.swift

@@ -136,6 +136,7 @@ extension AppDelegate {
                 IQKeyboardManager.shared.enable = true
                 IQKeyboardManager.shared.enableAutoToolbar = false
                 IQKeyboardManager.shared.resignOnTouchOutside = true  //控制点击背景是否收起键盘
+                IQKeyboardManager.shared.keyboardDistanceFromTextField = 10 // 输入框距离键盘的距离
             }
         }
         

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

@@ -82,6 +82,8 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
             imageView.isUserInteractionEnabled = true
             imageView.layer.cornerRadius = 46.5
             imageView.layer.masksToBounds = true
+            imageView.layer.borderWidth = 1
+            imageView.layer.borderColor =  UIColor(hex: 0xF4F6FA).cgColor
             return imageView
         }()
         view.addSubview(photoImageView)

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

@@ -47,7 +47,7 @@ class YHCustomNavigationBar: UIView {
     
     lazy var backButton: UIButton = {
        let btn = UIButton()
-        btn.setImage(UIImage(named: "nav_back_icon"), for: .normal)
+        btn.setImage(UIImage(named: "back_icon"), for: .normal)
         btn.addTarget(self, action: #selector(didBackBtnClicked), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift

@@ -33,6 +33,10 @@ class YHImagePickerView: UIView {
         let view = YHImagePickerView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
         view.backImage = callBack
         view.titleLabel.text = title
+        if title != "请选择上传方式" {
+            view.takePhotoBtton.setTitle("拍照", for: .normal)
+            view.selectPhotoButton.setTitle("从相册中选择", for: .normal)
+        }
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)
     }

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHUserInfoSettingViewController.swift

@@ -59,6 +59,8 @@ class YHUserInfoSettingViewController: YHBaseViewController {
             imageView.isUserInteractionEnabled = true
             imageView.layer.cornerRadius = 46.5
             imageView.layer.masksToBounds = true
+            imageView.layer.borderWidth = 1
+            imageView.layer.borderColor =  UIColor(hex: 0xF4F6FA).cgColor
             return imageView
         }()
         view.addSubview(photoImageView)

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

@@ -20,7 +20,7 @@ class YHMyLikeActivityViewController: YHBaseViewController {
 
     var arrItemTitles: [String] = ["我的点赞", "我的收藏", "最近浏览"]
     var arrItemVCs : [YHMyLikeViewController] = []
-    var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: KScreenWidth, height: 55))
+    var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: KScreenWidth, height: 48))
     lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
         dataSource.titles = arrItemTitles
@@ -88,16 +88,6 @@ class YHMyLikeActivityViewController: YHBaseViewController {
         gk_navBarAlpha = 1.0
     }
     
-    func updateViews() {
-        if arrItemTitles.count != 1 {
-            segmentedView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: view.bounds.size.width, height: 55)
-            listContainerView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar + 55, width: view.bounds.size.width, height: view.bounds.size.height - 55 - k_Height_NavigationtBarAndStatuBar)
-        } else {
-            segmentedView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: view.bounds.size.width, height: 0)
-            listContainerView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: view.bounds.size.width, height: view.bounds.size.height - k_Height_NavigationtBarAndStatuBar)
-        }
-    }
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
@@ -114,8 +104,8 @@ class YHMyLikeActivityViewController: YHBaseViewController {
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
-        segmentedView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: view.bounds.size.width, height: 55)
-        listContainerView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar + 55, width: view.bounds.size.width, height: view.bounds.size.height - 55 - k_Height_NavigationtBarAndStatuBar)
+        segmentedView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: view.bounds.size.width, height: 48)
+        listContainerView.frame = CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar + 48, width: view.bounds.size.width, height: view.bounds.size.height - 48 - k_Height_NavigationtBarAndStatuBar)
         
         segmentedView.backgroundColor = .white
     }

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift

@@ -52,6 +52,8 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
             imageView.isUserInteractionEnabled = true
             imageView.layer.cornerRadius = 46.5
             imageView.layer.masksToBounds = true
+            imageView.layer.borderWidth = 1
+            imageView.layer.borderColor =  UIColor(hex: 0xF4F6FA).cgColor
             return imageView
         }()
         view.addSubview(photoImageView)
@@ -112,6 +114,7 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
             view.messageBlock = {[weak self] message in
                 guard let self = self else { return }
                 self.viewModel.didChange = true
+                self.viewModel.model.signature = message
             }
             return view
         }()

galaxy/galaxy/Res/Assets.xcassets/NavigationBar/nav_back_icon.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "箭头@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "箭头@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}