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
2ad9ef0f
Commit
2ad9ef0f
authored
Oct 14, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 steve 的本机IP
parent
4ec4fd4d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
12 deletions
+29
-12
Fastfile
galaxy/fastlane/Fastfile
+2
-1
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+20
-8
YHHomeBannerView.swift
.../galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
+5
-1
YHJsApi.swift
...galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift
+1
-1
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+1
-1
No files found.
galaxy/fastlane/Fastfile
View file @
2ad9ef0f
...
...
@@ -30,9 +30,10 @@ platform :ios do
uat = "uat"
davidhuang_branch = "davidhuang"
alex_branch = "main-bugfix-alex"
double11 = "double11"
#打包正使用的分支
myPack_branch = d
evelop_branch
myPack_branch = d
ouble11
# 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do
...
...
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
2ad9ef0f
...
...
@@ -5631,9 +5631,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS
=
YES
;
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxyTestEnv.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
CODE_SIGN_STYLE
=
Manual
;
CURRENT_PROJECT_VERSION
=
2
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
DEVELOPMENT_TEAM
=
""
;
"DEVELOPMENT_TEAM[sdk=iphoneos*]"
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
...
...
@@ -5662,6 +5664,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev.profile
;
SWIFT_ACTIVE_COMPILATION_CONDITIONS
=
TESTENV
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
...
...
@@ -5773,9 +5776,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS
=
YES
;
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxy.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
CODE_SIGN_STYLE
=
Manual
;
CURRENT_PROJECT_VERSION
=
2
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
DEVELOPMENT_TEAM
=
""
;
"DEVELOPMENT_TEAM[sdk=iphoneos*]"
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
...
...
@@ -5804,6 +5809,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev.profile
;
SWIFT_ACTIVE_COMPILATION_CONDITIONS
=
UATENV
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
...
...
@@ -5978,9 +5984,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS
=
YES
;
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxyDebug.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
CODE_SIGN_STYLE
=
Manual
;
CURRENT_PROJECT_VERSION
=
2
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
DEVELOPMENT_TEAM
=
""
;
"DEVELOPMENT_TEAM[sdk=iphoneos*]"
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
...
...
@@ -6009,6 +6017,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev.profile
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
SWIFT_VERSION
=
5.0
;
...
...
@@ -6025,9 +6034,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS
=
YES
;
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxy.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
CODE_SIGN_STYLE
=
Manual
;
CURRENT_PROJECT_VERSION
=
2
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
DEVELOPMENT_TEAM
=
""
;
"DEVELOPMENT_TEAM[sdk=iphoneos*]"
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
...
...
@@ -6056,6 +6067,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev.profile
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
SWIFT_VERSION
=
5.0
;
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
View file @
2ad9ef0f
...
...
@@ -135,7 +135,11 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
if
model
.
skip_url
.
isEmpty
==
false
{
switch
model
.
skip_type
{
case
1
:
//跳转H5
// var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"//建明的本机IP
//建明的本机IP for test hjl
//var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"
//for test hjl Steve本机IP
model
.
skip_url
=
"http://192.168.52.158:10300/superAppBridge.html#/double11-home"
var
url
=
""
if
YHLoginManager
.
shared
.
isLogin
()
{
let
token
=
YHLoginManager
.
shared
.
h5Token
...
...
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift
View file @
2ad9ef0f
...
...
@@ -51,7 +51,7 @@ extension YHJsApi {
DispatchQueue
.
main
.
async
{
if
let
tag
=
tag
as?
String
,
tag
.
count
==
1
{
if
let
delegate
=
self
.
delegate
as?
YHH5WebViewVC
{
delegate
.
supportFullScreen
Syn
(
tag
)
delegate
.
hideNavigationBar
Syn
(
tag
)
}
}
}
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
2ad9ef0f
...
...
@@ -420,7 +420,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
var
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge.html#/tohkList"
// url = "¶m=" + YHLoginManager.shared.h5Token
url
=
"https://www.baidu.com"
printLog
(
"U
U
RL:
\(
url
)
"
)
printLog
(
"URL:
\(
url
)
"
)
let
vc
=
YHH5WebViewVC
()
vc
.
url
=
url
vc
.
isFullScreenFlag
=
false
...
...
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