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/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -600,6 +600,8 @@ extension YHBrotherInfoVC {
         }
         
         guard let brotherInfo = brotherInfo else { return }
+        // 父母兄弟姐妹 随行必须置为0
+        brotherInfo.follow = 0
         guard let info = brotherInfo.toDictionary() else { return }
         
         let dict:[String: Any] = ["order_id":orderId,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -643,6 +643,8 @@ extension YHParentInfoVC {
         }
         
         guard let parentInfo = parentInfo else { return }
+        // 父母兄弟姐妹 随行必须置为0
+        parentInfo.follow = 0
         guard let info = parentInfo.toDictionary() else { return }
         
         let dict:[String: Any] = ["order_id":orderId,

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

@@ -70,6 +70,7 @@ class YHAboutGalaxyViewController: YHBaseViewController {
     
     lazy var headerView:UIView = {
        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 496))
+       view.clipsToBounds = true
        view.addSubview(bgImageView)
        view.addSubview(aboutLabel)
        view.addSubview(detailLabel)

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

@@ -67,7 +67,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "播放设置".local, type:.playSettings),
-                PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
@@ -77,7 +76,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "播放设置".local, type:.playSettings),
-                PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
@@ -86,7 +84,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "播放设置".local, type:.playSettings),
-                PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
@@ -94,7 +91,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "播放设置".local, type:.playSettings),
-                PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
@@ -281,11 +277,7 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
                 let vc = YHVideoPlaySettingVC()
                 self.navigationController?.pushViewController(vc)
                 
-            } else if item.type == .aboutUs {
-                let vc = YHAboutGalaxyViewController()
-                self.navigationController?.pushViewController(vc)
-                
-            } else if item.type == .userItems {
+            }  else if item.type == .userItems {
                 // 用户条款
                 let vc = YHWebViewViewController()
                 vc.url = YHBaseUrlManager.shared.curUserItemsUrl()

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

@@ -83,7 +83,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
             PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
             PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay),
-            PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity)
+            PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity),
+            PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
         ]
         return arrData
     }()
@@ -274,19 +275,11 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         if (indexPath.row >= items.count) { return }
-        
-//#if DEBUG
-//        let vc = YHCodeSueecssWithVideoBkgViewController()
-//        vc.phoneNumber = "15818743775"
-//        self.navigationController?.pushViewController(vc)
-//        return
-//#endif
-        
+                
         if !checkLogin() {
             return
         }
         
-        
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {
         case .myCard://我的名片
@@ -347,7 +340,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             let vc = YHActivityListViewController()
             vc.type = 1
             self.navigationController?.pushViewController(vc)
-            
+        case .aboutUs:
+            let vc = YHAboutGalaxyViewController()
+            self.navigationController?.pushViewController(vc)
         default:
             printLog("不需要响应")
         }

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

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