Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
97be1855
Commit
97be1855
authored
Jul 07, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0913-fix'
* 0913-fix: 屏蔽 苹果账号登录功能 修改打包分支 修改版本号 0.9.1.4
parents
b219d390
66fc9ce3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
Fastfile
galaxy/fastlane/Fastfile
+1
-1
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+3
-3
YHOtherLoginViewController.swift
...sses/Modules/Login(登录)/C/YHOtherLoginViewController.swift
+12
-12
No files found.
galaxy/fastlane/Fastfile
View file @
97be1855
...
...
@@ -17,7 +17,7 @@ platform :ios do
youhua_branch = "youhua-dev"
#打包正使用的分支
myPack_branch = "091"
myPack_branch = "091
3-fix
"
# 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do
...
...
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
97be1855
...
...
@@ -3740,7 +3740,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
=
(
...
...
@@ -3944,7 +3944,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
=
(
...
...
@@ -3990,7 +3990,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/Login(登录)/C/YHOtherLoginViewController.swift
View file @
97be1855
...
...
@@ -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)
//
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment