Skip to content

G
galaxy-iOS
Commit b83e48b8 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'push' into 'develop' 

七鱼SDK升级

See merge request !10
parents a468a3b2 671d3325
Hide whitespace changes
Inline Side-by-side
Showing with 362 additions and 58 deletions
galaxy/Podfile
View file @ b83e48b8
......@@ -110,7 +110,7 @@ target 'galaxy' do
#列表截图
pod 'TYSnapshotScroll', '0.4.0'
#七鱼SDK
pod 'QY_iOS_SDK', '9.9.2'
pod 'QY_iOS_SDK', '10.5.0'
#阿里云日志
pod 'AliyunLogProducer', '4.3.3'
#加密
......
galaxy/fastlane/Fastfile
View file @ b83e48b8
......@@ -34,9 +34,10 @@ platform :ios do
main_fix = "main-fix"
jiaofei = "jiaofei"
plan = "4.25-1"
push = "push"
#打包正使用的分支
myPack_branch = plan
myPack_branch = push
# 打adhoc包 执行命令 fastlane galaxyTest
......
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ b83e48b8
......@@ -1268,6 +1268,8 @@
04D8FFB22DA5007A00703C75 /* YHPictureBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB12DA5007A00703C75 /* YHPictureBrowserViewController.swift */; };
04D8FFB42DA61DA300703C75 /* YHPlanTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB32DA61DA200703C75 /* YHPlanTestViewController.swift */; };
04D8FFB62DAE489A00703C75 /* YHVisitHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB52DAE489A00703C75 /* YHVisitHKAlertView.swift */; };
04D8FFB82DB0D50B00703C75 /* YHGalaxyNewsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB72DB0D50B00703C75 /* YHGalaxyNewsListViewController.swift */; };
04D8FFBA2DB0D95A00703C75 /* YHGalaxyNewsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB92DB0D95A00703C75 /* YHGalaxyNewsCell.swift */; };
04E4CF3E2D5C6D32004D4013 /* YHCountryMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4CF3D2D5C6D32004D4013 /* YHCountryMessageView.swift */; };
04E4CF402D5C83AE004D4013 /* YHSelectPhoneCountryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4CF3F2D5C83AE004D4013 /* YHSelectPhoneCountryViewController.swift */; };
04E507D62D6EE856005F758B /* YHUserLevelAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E507D52D6EE856005F758B /* YHUserLevelAlertView.swift */; };
......@@ -2578,6 +2580,8 @@
04D8FFB12DA5007A00703C75 /* YHPictureBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPictureBrowserViewController.swift; sourceTree = "<group>"; };
04D8FFB32DA61DA200703C75 /* YHPlanTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanTestViewController.swift; sourceTree = "<group>"; };
04D8FFB52DAE489A00703C75 /* YHVisitHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisitHKAlertView.swift; sourceTree = "<group>"; };
04D8FFB72DB0D50B00703C75 /* YHGalaxyNewsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGalaxyNewsListViewController.swift; sourceTree = "<group>"; };
04D8FFB92DB0D95A00703C75 /* YHGalaxyNewsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGalaxyNewsCell.swift; sourceTree = "<group>"; };
04E4CF3D2D5C6D32004D4013 /* YHCountryMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCountryMessageView.swift; sourceTree = "<group>"; };
04E4CF3F2D5C83AE004D4013 /* YHSelectPhoneCountryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSelectPhoneCountryViewController.swift; sourceTree = "<group>"; };
04E507D52D6EE856005F758B /* YHUserLevelAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserLevelAlertView.swift; sourceTree = "<group>"; };
......@@ -5767,6 +5771,7 @@
isa = PBXGroup;
children = (
045C0EC12D12CA5E00BD2DC0 /* YHMessageDetailListVC.swift */,
04D8FFB72DB0D50B00703C75 /* YHGalaxyNewsListViewController.swift */,
045C0EC22D12CA5E00BD2DC0 /* YHMessageListVC.swift */,
);
path = C;
......@@ -5793,6 +5798,7 @@
children = (
045C0EC82D12CA5E00BD2DC0 /* YHDetailMessageCell.swift */,
045C0EC92D12CA5E00BD2DC0 /* YHMessageSessionCell.swift */,
04D8FFB92DB0D95A00703C75 /* YHGalaxyNewsCell.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -7111,14 +7117,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks.sh\"\n";
......@@ -7132,14 +7134,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources.sh\"\n";
......@@ -7737,6 +7735,7 @@
045C11842D12CA5F00BD2DC0 /* YHActivityListModel.swift in Sources */,
045C11852D12CA5F00BD2DC0 /* YHActivityTravelCell.swift in Sources */,
045C11862D12CA5F00BD2DC0 /* YHMySignatureListModel.swift in Sources */,
04D8FFB82DB0D50B00703C75 /* YHGalaxyNewsListViewController.swift in Sources */,
045C11872D12CA5F00BD2DC0 /* YHProgressView.swift in Sources */,
045C11882D12CA5F00BD2DC0 /* YHAIHistoryMessage.swift in Sources */,
045C11892D12CA5F00BD2DC0 /* YHUploadCertificateViewModel.swift in Sources */,
......@@ -8049,6 +8048,7 @@
04D8FF752D978CF000703C75 /* YHPlanLinkShareView.swift in Sources */,
0411CF062D1A88EA00644D35 /* YHGCDocListCell.swift in Sources */,
045C128A2D12CA5F00BD2DC0 /* YHAITextInputView.swift in Sources */,
04D8FFBA2DB0D95A00703C75 /* YHGalaxyNewsCell.swift in Sources */,
045C128B2D12CA5F00BD2DC0 /* YHWorkExpDataModel.swift in Sources */,
045C128C2D12CA5F00BD2DC0 /* YHSearchInfoBar.swift in Sources */,
045C128D2D12CA5F00BD2DC0 /* YHHomeBannerCollectionViewCell.swift in Sources */,
......@@ -8494,7 +8494,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8521,7 +8521,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.2;
MARKETING_VERSION = 2.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -8642,7 +8642,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8669,7 +8669,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.2;
MARKETING_VERSION = 2.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -8852,7 +8852,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8879,7 +8879,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.2;
MARKETING_VERSION = 2.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -8902,7 +8902,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8929,7 +8929,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.2;
MARKETING_VERSION = 2.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIRobotChatViewController.swift
View file @ b83e48b8
......@@ -69,7 +69,7 @@ class YHAIRobotChatViewController: YHBaseViewController {
lazy var cleanBtn: UIButton = {
let btn = UIButton()
btn.frame = CGRect(x: KScreenWidth-24-20, y: k_Height_statusBar()+k_Height_NavContentBar/2.0-12, width: 24, height: 24)
btn.frame = CGRect(x: KScreenWidth-24-20, y: k_Height_StatusBar+k_Height_NavContentBar/2.0-12, width: 24, height: 24)
btn.setImage(UIImage(named: "msg_clean"), for: .normal)
btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
btn.addTarget(self, action: #selector(didCleanButtonClicked), for: .touchUpInside)
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchResultListViewController.swift
View file @ b83e48b8
......@@ -216,7 +216,7 @@ class YHMatchResultListViewController: YHBaseViewController {
self.navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchUserViewController.swift
View file @ b83e48b8
......@@ -165,14 +165,14 @@ class YHMatchUserViewController: YHBaseViewController {
bgImgV.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(-k_Height_statusBar()-48.0)
make.top.equalTo(-k_Height_StatusBar-48.0)
make.bottom.equalToSuperview().offset(k_Height_TabBar)
}
launchLottieView.snp.makeConstraints { make in
make.width.height.equalTo(KScreenWidth)
make.centerX.equalToSuperview()
make.top.equalTo(204-48-k_Height_statusBar())
make.top.equalTo(204-48-k_Height_StatusBar)
}
headLottieView.snp.makeConstraints { make in
make.width.height.equalTo(KScreenWidth)
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHNameCardViewController.swift
View file @ b83e48b8
......@@ -95,7 +95,7 @@ class YHNameCardViewController: YHBaseViewController {
self.view.addSubview(self.navBar)
self.navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
self.bgImgView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @ b83e48b8
......@@ -128,7 +128,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
// 获取导航栏高度
let navHeight = self.navigationController?.navigationBar.frame.height
// 获取状态栏高度
let statusHeight = k_Height_statusBar()
let statusHeight = k_Height_StatusBar
// 创建wkwebview
// webview = DWKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight! - 59 - k_Height_safeAreaInsetsBottom()))
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift
View file @ b83e48b8
......@@ -166,7 +166,7 @@ class YHSearchInfomationVC: YHBaseViewController {
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
searchBar.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift
View file @ b83e48b8
......@@ -119,7 +119,7 @@ private extension YHStatusAdvantageVC {
// 获取导航栏高度
let navHeight = self.navigationController?.navigationBar.frame.height
// 获取状态栏高度
let statusHeight = k_Height_statusBar()
let statusHeight = k_Height_StatusBar
// 创建wkwebview
webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight! - 59 - k_Height_safeAreaInsetsBottom()))
......
galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift
View file @ b83e48b8
......@@ -220,9 +220,9 @@ extension YHSelectViewController: UITableViewDelegate, UITableViewDataSource {
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
YHAnalytics.track("APP_GalaxySelectionPage_LiveAvatar")
let model = self.viewModel.goodsArray[indexPath.row]
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/goods/sales-detail" + "?id=\(model.id)"
YHAnalytics.track("APP_GalaxySelectionPage_ClickProduct", properties: ["productID": model.id])
if YHLoginManager.shared.isLogin() {
let token = YHLoginManager.shared.h5Token
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift
View file @ b83e48b8
......@@ -254,7 +254,7 @@ extension YHServiceCenterViewController {
view.addSubview(navBar)
navBar.snp.makeConstraints { make in
make.left.equalToSuperview()
// make.top.equalToSuperview().offset(k_Height_statusBar())
// make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
make.width.equalTo(47)
make.centerY.equalTo(titleLabel.snp.centerY)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/FileList(文件清单)/C/YHMyFileListViewController.swift
View file @ b83e48b8
......@@ -39,7 +39,7 @@ class YHMyFileListViewController: YHBaseViewController {
view.addSubview(self.navBar)
self.navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
view.clipsToBounds = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/C/YHCertificateListContainerVC.swift
View file @ b83e48b8
......@@ -176,7 +176,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
segmentContainerView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/C/YHMineCertificateEntryViewController.swift
View file @ b83e48b8
......@@ -113,7 +113,7 @@ extension YHMineCertificateEntryViewController {
view.addSubview(navBar)
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/FileList(文件清单)/C/YHGCMyFileListViewController.swift
View file @ b83e48b8
......@@ -39,7 +39,7 @@ class YHGCMyFileListViewController: YHBaseViewController {
view.addSubview(self.navBar)
self.navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
view.clipsToBounds = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCCertificateListContainerVC.swift
View file @ b83e48b8
......@@ -152,7 +152,7 @@ class YHGCCertificateListContainerVC: YHBaseViewController {
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
segmentContainerView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCMineCertificateEntryViewController.swift
View file @ b83e48b8
......@@ -113,7 +113,7 @@ extension YHGCMineCertificateEntryViewController {
view.addSubview(navBar)
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
......
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
View file @ b83e48b8
......@@ -155,12 +155,13 @@ private extension YHH5WebViewVC {
func reloadWebViewWithToken() {
if YHLoginManager.shared.isLogin() {
let token = YHLoginManager.shared.h5Token
let yhid = YHLoginManager.shared.userModel?.id ?? ""
if !url.contains("param=") {
// 无 param= 的情况
var tUrl = url + "?param=" + token
var tUrl = url + "?param=" + token + "&yhid=" + yhid
let urlHasParam = String.hasQueryParameters(urlString: url)
if urlHasParam {
tUrl = url + "&param=" + token
tUrl = url + "&param=" + token + "&yhid=" + yhid
}
if let url = URL(string: tUrl) {
......@@ -178,7 +179,7 @@ private extension YHH5WebViewVC {
let arr0 = url.components(separatedBy: separator)
if arr0.count == 1 {
// eg: httts://www.baidu.com?param=
let tUrl = arr0[0] + "?param=" + token
let tUrl = arr0[0] + "?param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -191,7 +192,7 @@ private extension YHH5WebViewVC {
if arr1.count == 1 {
// eg: httts://www.baidu.com?param=123434324
let tUrl = arr0[0] + "?param=" + token
let tUrl = arr0[0] + "?param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -199,7 +200,7 @@ private extension YHH5WebViewVC {
}
} else {
// eg: httts://www.baidu.com?param=123434324&key2=1232323
var tUrl = arr0[0] + "?param=" + token
var tUrl = arr0[0] + "?param=" + token + "&yhid=" + yhid
for(index, str) in arr1.enumerated() {
if index != 0 {
tUrl = tUrl + "&" + str
......@@ -219,7 +220,7 @@ private extension YHH5WebViewVC {
let arr0 = url.components(separatedBy: separator)
if arr0.count == 1 {
// eg: httts://www.baidu.com?key0=123434324 &param=
let tUrl = arr0[0] + "&param=" + token
let tUrl = arr0[0] + "&param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -234,7 +235,7 @@ private extension YHH5WebViewVC {
if arr1.count == 1 {
// eg: httts://www.baidu.com?key0=123434324 &param= 1234980
let tUrl = arr0[0] + "&param=" + token
let tUrl = arr0[0] + "&param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -242,7 +243,7 @@ private extension YHH5WebViewVC {
}
} else {
// eg: httts://www.baidu.com?key0=123434324 &param= 1234980 & key1=34234
var tUrl = arr0[0] + "&param=" + token
var tUrl = arr0[0] + "&param=" + token + "&yhid=" + yhid
for(index, str) in arr1.enumerated() {
if index != 0 {
tUrl = tUrl + "&" + str
......@@ -334,8 +335,7 @@ private extension YHH5WebViewVC {
}
url = tUrl
if !url.contains("yhid=") {
let id = YHLoginManager.shared.userModel?.id ?? ""
if !url.contains("yhid="), let id = YHLoginManager.shared.userModel?.id {
tUrl = url + "?yhid=\(id)"
if url.contains("?") {
tUrl = url + "&yhid=\(id)"
......
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLiveStateViewController.swift
View file @ b83e48b8
......@@ -114,7 +114,7 @@ class YHLiveStateViewController: YHBaseViewController {
view.addSubview(closeButton)
closeButton.snp.makeConstraints { make in
make.right.equalTo(-16)
make.top.equalTo(10 + k_Height_statusBar())
make.top.equalTo(10 + k_Height_StatusBar)
make.width.height.equalTo(24)
}
......@@ -127,7 +127,7 @@ class YHLiveStateViewController: YHBaseViewController {
view.addSubview(shareButton)
shareButton.snp.makeConstraints { make in
make.right.equalTo(-62)
make.top.equalTo(10 + k_Height_statusBar())
make.top.equalTo(10 + k_Height_StatusBar)
make.width.height.equalTo(24)
}
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift
View file @ b83e48b8
......@@ -23,7 +23,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
// 获取导航栏高度
let navHeight = self.navigationController?.navigationBar.frame.height
// 获取状态栏高度
let statusHeight = k_Height_statusBar()
let statusHeight = k_Height_StatusBar
// 创建wkwebview
webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - k_Height_NavigationtBarAndStatuBar))
......
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHGalaxyNewsListViewController.swift 0 → 100644
View file @ b83e48b8
//
// YHGalaxyNewsListViewController.swift
// galaxy
//
// Created by Dufet on 2025/4/17.
// Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHGalaxyNewsListViewController: YHBaseViewController {
var newsArr: [String] = ["", "", ""]
lazy var tableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
if #available(iOS 15.0, *) {
tableView.sectionHeaderTopPadding = 0
}
tableView.estimatedSectionHeaderHeight = 1.0
tableView.estimatedSectionFooterHeight = 1.0
tableView.showsVerticalScrollIndicator = false
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
tableView.backgroundColor = .clear
tableView.backgroundView = emptyDataTipsView
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHGalaxyNewsCell.self, forCellReuseIdentifier: YHGalaxyNewsCell.cellReuseIdentifier)
return tableView
}()
lazy var emptyDataTipsView: YHEmptyDataView = {
let view = YHEmptyDataView.createView("暂无消息", kEmptyMessageBgName)
let topMargin = 310-k_Height_NavigationtBarAndStatuBar
view.topMargin = topMargin
view.isHidden = true
return view
}()
override func viewDidLoad() {
super.viewDidLoad()
gk_navTitle = "银河资讯"
gk_navigationBar.backgroundColor = .white
let rightButtonItem = UIBarButtonItem(image: UIImage(named: "msg_clean")?.withRenderingMode(.alwaysOriginal), style: .plain, target: self, action: #selector(didCleanBtnClicked))
gk_navRightBarButtonItem = rightButtonItem
gk_navItemRightSpace = 16
view.backgroundColor = .init(hex: 0xF8F9FB)
view.addSubview(tableView)
tableView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
make.bottom.equalToSuperview()
}
}
@objc func didCleanBtnClicked() {
YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
}
}
}
extension YHGalaxyNewsListViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return newsArr.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHGalaxyNewsCell.cellReuseIdentifier, for: indexPath) as? YHGalaxyNewsCell else { return UITableViewCell() }
if 0 <= indexPath.row && indexPath.row < newsArr.count {
let item = newsArr[indexPath.row]
}
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
}
private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
return 1.0
}
private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
return 1.0
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
return UIView()
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
return UIView()
}
}
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift
View file @ b83e48b8
......@@ -177,7 +177,7 @@ class YHMessageDetailListVC: YHBaseViewController {
lazy var emptyDataTipsView: YHEmptyDataView = {
let view = YHEmptyDataView.createView("暂无消息", kEmptyMessageBgName)
let topMargin = 310-k_Height_NavigationtBarAndStatuBar
let topMargin = 222.0
view.topMargin = topMargin
view.isHidden = true
return view
......@@ -197,7 +197,7 @@ class YHMessageDetailListVC: YHBaseViewController {
view.addSubview(navBar)
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
tableView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift
View file @ b83e48b8
......@@ -23,8 +23,8 @@ class YHMessageListVC: YHBaseViewController {
private let serviceCenterViewModel = YHServiceCenterViewModel()
var isNotifyEnabled = false
lazy var tableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
tableView.estimatedSectionHeaderHeight = 1.0
tableView.estimatedSectionFooterHeight = 1.0
......@@ -126,7 +126,7 @@ class YHMessageListVC: YHBaseViewController {
// navBar.snp.makeConstraints { make in
// make.left.right.equalToSuperview()
// make.top.equalToSuperview().offset(k_Height_statusBar())
// make.top.equalToSuperview().offset(k_Height_StatusBar)
// make.height.equalTo(k_Height_NavContentBar)
// }
......@@ -436,6 +436,13 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
// do {
// // test
// let vc = YHGalaxyNewsListViewController()
// self.navigationController?.pushViewController(vc)
// return
// }
if 0 <= indexPath.row && indexPath.row < msgArr.count {
......
galaxy/galaxy/Classes/Modules/Message(消息)/V/YHGalaxyNewsCell.swift 0 → 100644
View file @ b83e48b8
//
// YHGalaxyNewsCell.swift
// galaxy
//
// Created by Dufet on 2025/4/17.
// Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHGalaxyNewsCell: UITableViewCell {
static let cellReuseIdentifier = "YHGalaxyNewsCell"
lazy var timeLabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor30
label.textAlignment = .center
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "00:00"
return label
}()
lazy var whiteContentView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = 6.0
view.clipsToBounds = true
return view
}()
lazy var coverImgV: UIImageView = {
let imgV = UIImageView()
imgV.image = UIImage(named: "msg_news_cover_default")
return imgV
}()
lazy var playImgV: UIImageView = {
let imgV = UIImageView()
imgV.image = UIImage(named: "msg_news_video_play")
return imgV
}()
lazy var titleLabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .left
label.font = UIFont.PFSC_M(ofSize: 15)
label.text = "这是标题"
return label
}()
lazy var descLabel = {
let label = UILabel()
label.textColor = UIColor.init(hex: 0x8993A2)
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize: 12)
label.numberOfLines = 0
label.text = "这是描述"
return label
}()
lazy var redPointView: UIView = {
let view = UIView()
view.backgroundColor = .failColor
view.layer.cornerRadius = 4.0
view.clipsToBounds = true
return view
}()
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
func setupUI() {
self.selectionStyle = .none
self.backgroundColor = .clear
contentView.backgroundColor = .clear
contentView.addSubview(timeLabel)
contentView.addSubview(whiteContentView)
whiteContentView.addSubview(coverImgV)
coverImgV.addSubview(playImgV)
whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(descLabel)
whiteContentView.addSubview(redPointView)
timeLabel.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(16)
make.height.equalTo(17)
}
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(timeLabel.snp.bottom).offset(12)
make.bottom.equalTo(0)
}
coverImgV.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.height.equalTo(146)
}
playImgV.snp.makeConstraints { make in
make.width.height.equalTo(42)
make.center.equalToSuperview()
}
titleLabel.snp.makeConstraints { make in
make.left.equalTo(16)
make.top.equalTo(coverImgV.snp.bottom).offset(16)
make.height.equalTo(21)
}
redPointView.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(6)
make.right.lessThanOrEqualTo(-6)
make.width.height.equalTo(8.0)
make.centerY.equalTo(titleLabel)
}
descLabel.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.bottom.equalTo(-16)
make.height.lessThanOrEqualTo(34.0)
make.top.equalTo(titleLabel.snp.bottom).offset(4)
}
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutGalaxyViewController.swift
View file @ b83e48b8
......@@ -118,13 +118,13 @@ class YHAboutGalaxyViewController: YHBaseViewController {
self.view.addSubview(navBar)
self.navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
self.statusBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview()
make.height.equalTo(k_Height_statusBar())
make.height.equalTo(k_Height_StatusBar)
}
self.tableView.snp.makeConstraints { make in
make.edges.equalToSuperview()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift
View file @ b83e48b8
......@@ -159,14 +159,14 @@ class YHMyNewViewController: YHBaseViewController {
tableView.snp.makeConstraints { make in
make.left.equalTo(20)
make.right.equalTo(-20)
make.top.equalToSuperview().offset(k_Height_statusBar()+44)
make.top.equalToSuperview().offset(k_Height_StatusBar+44)
make.bottom.equalToSuperview().offset(-k_Height_TabBar)
}
settingBtn.snp.makeConstraints { make in
make.width.height.equalTo(24.0)
make.right.equalToSuperview().offset(-17)
make.top.equalTo(k_Height_statusBar()+10)
make.top.equalTo(k_Height_StatusBar+10)
}
settingRedPointView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift
View file @ b83e48b8
......@@ -232,7 +232,7 @@ class YHUserInfoHeaderView: UIView {
settingView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(44.0)
}
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ b83e48b8
......@@ -97,8 +97,10 @@ class YHNetRequest: NSObject {
requestHeader.add(name: "app_platform", value: "iOS")
requestHeader.add(name: "app_os", value: "iOS")
requestHeader.add(name: "App-Os", value: "iOS")
let version = UIDevice.appVersion()
requestHeader.add(name: "app_version", value: version)
requestHeader.add(name: "App-Version", value: version)
requestHeader.add(name: "app_channel", value: "appStore")
requestHeader.add(name: "app_phoneModel", value: UIDevice.iPhoneModelName())
......@@ -110,7 +112,8 @@ class YHNetRequest: NSObject {
let signOrgiString = "appid=" + "1" + "&" + "timestamp=" + dateStr + "&" + "appkey=" + appkey
let sign = signOrgiString.md5()
print("sign = \(sign)")
let userid = YHLoginManager.shared.userModel?.id ?? ""
requestHeader.add(name: "Userid", value: userid)
requestHeader.add(name: "sign", value: sign)
requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
if !YHLoginManager.shared.deviceTokenModel.registerId.isEmpty {
......
galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerVC.swift
View file @ b83e48b8
......@@ -121,7 +121,7 @@ class YHVideoPlayerVC: YHBaseViewController {
}
navBar.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_statusBar())
make.top.equalToSuperview().offset(k_Height_StatusBar)
make.height.equalTo(k_Height_NavContentBar)
}
......
galaxy/galaxy/Res/Assets.xcassets/Message/msg_news_cover_default.imageset/Contents.json 0 → 100644
View file @ b83e48b8
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 2033197585@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 2033197585@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Message/msg_news_video_play.imageset/Contents.json 0 → 100644
View file @ b83e48b8
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "点击播放icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "点击播放icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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