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

galaxy/fastlane/Fastfile

@@ -19,7 +19,6 @@ platform :ios do
   #打包正使用的分支
   myPack_branch = youhua_branch
 
-
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 
     # add actions here: https://docs.fastlane.tools/actions

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3792,7 +3792,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4137,7 +4137,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4183,7 +4183,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -265,7 +265,13 @@ extension YHHKPlanItemView : UITextViewDelegate {
 //        if model.type == .planOther {
 //            number = maxNumbler
 //        }
-        numberLabel.text = myTextView.text.count.string + "/\(maxNumbler)"
+        
+        if model.type == .planOther {
+            numberLabel.text = myTextView.text.count.string + "/\(maxNumbler)"
+        } else {
+            numberLabel.text = myTextView.text.count.string + "/\(maxNumbler)" //for test hjl
+        }
+        
         if myTextView.text.count > maxNumbler {
             numberLabel.textColor = .failColor
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -664,6 +664,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         if follow != 1 && follow != 2 { // 默认随行
             follow = 1
         }
+        
         // 父母和兄弟姐妹无随行配置
         if self.relationType == .father || self.relationType == .mother || self.relationType == .brother {
             follow = 0

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

@@ -184,18 +184,18 @@ class YHOtherLoginViewController: YHBaseViewController {
                 make.height.width.equalTo(44)
             }
         } else {
-            appleButton = {
-                let button = UIButton(type: .custom)
-                button.setImage(UIImage(named: "login_apple"), for: .normal)
-                button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside)
-                return button
-            }()
-            view.addSubview(appleButton)
-            appleButton.snp.makeConstraints { make in
-                make.centerX.equalToSuperview()
-                make.bottom.equalTo(-58)
-                make.height.width.equalTo(44)
-            }
+//            appleButton = {
+//                let button = UIButton(type: .custom)
+//                button.setImage(UIImage(named: "login_apple"), for: .normal)
+//                button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside)
+//                return button
+//            }()
+//            view.addSubview(appleButton)
+//            appleButton.snp.makeConstraints { make in
+//                make.centerX.equalToSuperview()
+//                make.bottom.equalTo(-58)
+//                make.height.width.equalTo(44)
+//            }
         }
     }