Commit 97be1855 authored by David黄金龙's avatar David黄金龙

Merge branch '0913-fix'

* 0913-fix:
  屏蔽 苹果账号登录功能
  修改打包分支
  修改版本号 0.9.1.4
parents b219d390 66fc9ce3
...@@ -17,7 +17,7 @@ platform :ios do ...@@ -17,7 +17,7 @@ platform :ios do
youhua_branch = "youhua-dev" youhua_branch = "youhua-dev"
#打包正使用的分支 #打包正使用的分支
myPack_branch = "091" myPack_branch = "0913-fix"
# 打adhoc包 执行命令 fastlane galaxyTest # 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do lane :galaxyTest do
......
...@@ -3740,7 +3740,7 @@ ...@@ -3740,7 +3740,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3944,7 +3944,7 @@ ...@@ -3944,7 +3944,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3990,7 +3990,7 @@ ...@@ -3990,7 +3990,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
......
...@@ -184,18 +184,18 @@ class YHOtherLoginViewController: YHBaseViewController { ...@@ -184,18 +184,18 @@ class YHOtherLoginViewController: YHBaseViewController {
make.height.width.equalTo(44) make.height.width.equalTo(44)
} }
} else { } else {
appleButton = { // appleButton = {
let button = UIButton(type: .custom) // let button = UIButton(type: .custom)
button.setImage(UIImage(named: "login_apple"), for: .normal) // button.setImage(UIImage(named: "login_apple"), for: .normal)
button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside) // button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside)
return button // return button
}() // }()
view.addSubview(appleButton) // view.addSubview(appleButton)
appleButton.snp.makeConstraints { make in // appleButton.snp.makeConstraints { make in
make.centerX.equalToSuperview() // make.centerX.equalToSuperview()
make.bottom.equalTo(-58) // make.bottom.equalTo(-58)
make.height.width.equalTo(44) // make.height.width.equalTo(44)
} // }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment