Skip to content

G
galaxy-iOS
Commit 2c478063 authored by David黄金龙's avatar David黄金龙
Browse files
Options

合并 main-bugfix-alex的代码

parents 3025c326 a9469722
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 173 deletions
galaxy/dSYM_upload_result.log deleted 100644 → 0
View file @ 3025c326
Bugly(bugly.qq.com/bugly.qq.tds.com)符号表工具上传工具包 V3.3.5
用法 -- Usage
java -jar buglyoa-upload-symbol.jar -appid <APP ID> -appkey <APP KEY> -version <App Version> -platform <App Platform> -inputSymbol <Original Symbol File Path> -inputMapping <Original mapping File Path> -buildNo <buildNo>
参数说明 -- Introduction for arguments
-appid APP ID，可在bugly平台上查看
-appkey APP Key，可在bugly平台上查看
-version APP版本，务必和bugly平台上面看到的crash版本号保持一致
-platform 平台类型包含 Android、IOS、MAC三个选项，注意大小写要正确
-inputSymbol 原始符号表（ios平台是dsym/android平台是debug so）所在文件夹目录路径
-inputMapping [Android平台特有，ios忽略] mapping文件路径或所在文件夹目录路径
-buildNo [Android平台特有，ios忽略] 可选字段，只有当构建了多个相同版本号的apk，产生了多个mapping文件时，需要填写buildNo区分
##[info]args is ArgsParser{appId='3b10faa43e', appKey='e4bd292e-596d-4942-afda-dd841808218e', appPackage='com.intelligence.galaxy', appVersion='0.5.0.8', appBuildNo='null', platformId='IOS', enviroment='null', symbolPathName='/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp', mappingPathName='null', appPathName='null'}
##[info]param is : AtomParam{bundleId='com.intelligence.galaxy', version='0.5.0.8', secret='null', platform='IOS', symbolPath='/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp', appPath='null', mappingPath='null', secretSource='input', secretInputAppId='3b10faa43e', secretInputKey='e4bd292e-596d-4942-afda-dd841808218e', buildNo='null', buildPackageType='app', appModuleList='null', moduleName='null', envType='null'}
##[info]deleteDirFiles file path is /Users/edy/galaxy/galaxy/buglybin/symbolResult/BuglyIosStifListZip.zip
##[info]deleteDirFiles file path is /Users/edy/galaxy/galaxy/buglybin/symbolResult
##[info]deleteDirFiles file path is /Users/edy/galaxy/galaxy/buglybin
##[info]packSymbolFile file
##[info]workspace:null
##[info]buildPackageType:app
##[info]checkSymbolUpload request json is {"appID":"3b10faa43e","symbolUUIDs":["dde1fe1f7690329d9ba49ff0cdf36758","067701553e23321d9ff8de895e8956dc","4a48f4fdee753cd7b79374b64b4f781a","c6f99418189e31658c9bca8cce338549","e2e29881feed3e158bb6eb4a8e42d08d","24ef35e26edf3817a1fae42cd7ff285a","f325896ce90133b582eb02fd112f5817","7cc2170f7b6a3e359926abe00417cf3a","de905b01308e30f8843c0a415ab16eac","93fc29f9dbd135e8aa0f066cc5258472","c8c2200a65b13066bbc13794390a4242","b51428e402173b66bde0390fa04376ef","e86d4e10779b3ae993ffd78b34930d2d","0449640aab913cc8938189237bf88580","4c60d210eb13351da910d2422730d9bf","21280309a0b833b69f54e1c765fb41d0","6f37e6fae8233ab1bc3096f93e18e757","d9db75ef38f03b5c81779f5e6b2fc760","c1807b8e31a83dff9f5c82ccc410a31a","1d08656404be37b5b05ba7566d06705e","74839dc07b7937a5a7f935e587908058"]}
##[info]retCode: 200 response message: {"statusCode":0,"msg":"部分符号表未上传: 4c60d210eb13351da910d2422730d9bf","notExistUUIDs":["4c60d210eb13351da910d2422730d9bf"]}
##[info]find dsym file:[/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM]
##[info]pack dsym file
##[info]extractStif source file:/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM dest file:/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM.zip
##[info]bugly tools ios params: -i /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM -o /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM.zip -llvm
[SymtabTool-I] dSymFiles size is : 1
Bugly Symtab Tool for iOS: 3.3.16
[SymtabTool-I] Begin to parse file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/galaxy
[SymtabTool-I] Architecture: arm64
[SymtabTool-I] Begin to parse file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/galaxy
[SymtabTool-I] Architecture: arm64
[SymtabTool-I] Successfully parsed the file!
/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/galaxy [arm64] 4c60d210eb13351da910d2422730d9bf
[SymtabTool-I] Extracting symtab file: galaxy
[SymtabTool-I] Begin to parse file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/galaxy
[SymtabTool-I] Architecture: arm64
[SymtabTool-I] Successfully parsed the file!
[SymtabTool-I] Begin to parse file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/galaxy
[SymtabTool-I] Architecture: arm64
[SymtabTool-I] Begin to create symtab file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/buglySymbol&galaxy&arm64&4c60d210eb13351da910d2422730d9bf.symbol
[SymtabTool-I] Successfully created symtab file!
[SymtabTool-I] Add stif to symtab zip file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/buglySymbol&galaxy&arm64&4c60d210eb13351da910d2422730d9bf.stif
[SymtabTool-I] Begin to zip stif file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM/Contents/Resources/DWARF/buglySymbol&galaxy&arm64&4c60d210eb13351da910d2422730d9bf
[SymtabTool-I] Successfully zipped stif file!
[SymtabTool-I] Begin to zip symtab file: /Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM.zip
[SymtabTool-I] Successfully zipped symtab file!
##[info]extract stif success from:/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM to:/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM.zip
##[info]extractStifFileDetails, visit file name is : buglySymbol&galaxy&arm64&4c60d210eb13351da910d2422730d9bf.zip
##[info]parseStifFileName prefix : buglySymbol arg1 : galaxy
##[info]parseStifFileName arg2 : arm64 uuid : 4c60d210eb13351da910d2422730d9bf
##[info]parseStifFileName endfix : zip
##[info]zip stif to /Users/edy/galaxy/galaxy/buglybin/symbolResult/BuglyIosStifListZip.zip
##[info]sourceZipFile file path is :/Users/edy/galaxy/galaxy/App/ad-hoc/.upload_dsym_to_bugly_tmp/galaxy.app.dSYM.zip
##[info]dsym file detail :[SymbolFileDetail{name='buglySymbol&galaxy&arm64&4c60d210eb13351da910d2422730d9bf.zip, uuid='4c60d210eb13351da910d2422730d9bf, arch='arm64, type=101, moduleName='galaxy}]
##[info]target stif file is :/Users/edy/galaxy/galaxy/buglybin/symbolResult/BuglyIosStifListZip.zip
##[info]symbolFileDetailList size is :1
##[info]uploadSymbolFile file:/Users/edy/galaxy/galaxy/buglybin/symbolResult/BuglyIosStifListZip.zip size:1540177 child count:1
##[info]now begin to uploadFile
##[info]buildName :null&null
##[info]buildID :null
##[info]envtype is null
##[info]request upload Info Url is https://symbol-v2.bugly.qq.com/trpc.eff_tool.symbol_upload_gateway.SymbolUploadGateway/uploadInfo
##[info]request json is {"appID":"3b10faa43e","authSign":"e4bd292e-596d-4942-afda-dd841808218e","appVersion":"0.5.0.8","appBundleID":"com.intelligence.galaxy","appPlatform":2,"appBuildNumber":null,"fileType":201,"fileSize":1540177,"fileMD5":"c9404146458b4b3f331fce1d9c9f0937","clientType":7,"clientVersion":"3.3.5","buildPlatform":1,"buildID":null,"buildName":"null&null","fileInfoList":[{"name":"buglySymbol&galaxy&arm64&4c60d210eb13351da910d2422730d9bf.zip","uuid":"4c60d210eb13351da910d2422730d9bf","arch":"arm64","type":101,"moduleName":"galaxy"}],"buildRepo":null,"buildBranch":null,"buildCommitID":null,"appType":0}
##[info]retCode: 200 response message: {"statusCode":0,"msg":"success","uploadReqID":"3b10faa43e-1502bd79-dff2-4df0-a8a4-99765bb6e807"}
##[info]now begin to uploadFileContent
##[info]request uploadFileurl is https://symbol-v2.bugly.qq.com/trpc.eff_tool.symbol_upload_gateway.SymbolUploadGateway/uploadFile
##[info]retCode: 200 response message: {"statusCode":0,"msg":"success","uploadReqID":"3b10faa43e-1502bd79-dff2-4df0-a8a4-99765bb6e807"}
##[info]event_name:landun_symbol_plugin_execute_result
event_res:success
err_code:0
err_msg:null
err_type:0
symbol_build_id:com.intelligence.galaxy
user_app_platform:IOS
apk_arch_list:null
symbol_file_arch_list:null
event_duration:4760
user_client_type:7
origin_symbol_file_size_byte:23163529
symbol_file_size_byte:1540177
##[info]atta statistics upload response code: 200 response message:
##[info]-----------------------------------------------------------------------------
##[info]-----------------------------------------------------------------------------
##[info]上传成功！您可以在异常详情页点击"手工还原"以及时还原堆栈信息。
##[info]-----------------------------------------------------------------------------
##[info]-----------------------------------------------------------------------------
galaxy/fastlane/Fastfile
View file @ 2c478063
......@@ -29,9 +29,10 @@ platform :ios do
youhua_branch = "youhua-dev"
uat = "uat"
davidhuang_branch = "davidhuang"
alex_branch = "main-bugfix-alex"
#打包正使用的分支
myPack_branch = develop_branch
myPack_branch = alex_branch
# 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do
......@@ -126,7 +127,7 @@ platform :ios do
# 显示git当前分支最新submit id
sh "git rev-parse HEAD"
# 更新pod第三方库
cocoapods(use_bundle_exec: true)
#cocoapods(use_bundle_exec: true)
# 先清空打包路径下的文件
sh "pwd"
......
galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift
View file @ 2c478063
......@@ -59,7 +59,9 @@ class YHButlerServiceManager: NSObject {
guard isUatAllowed() else {
return
}
initSDKAccountAndLastMessage()
initSDKAccountAndLastMessage { _ in
//
}
}
func updateApnsToken(token: Data) {
......@@ -132,8 +134,9 @@ extension YHButlerServiceManager {
}
/// 初始化SDK用户信息
func initSDKAccountAndLastMessage() {
updateSDKAccountInfo(completion: { _ in
func initSDKAccountAndLastMessage(completion: @escaping (Bool) -> Void) {
updateSDKAccountInfo(completion: { flag in
completion(flag)
})
}
......@@ -153,14 +156,20 @@ extension YHButlerServiceManager {
guard isUatAllowed() else {
return
}
initSDKAccountAndLastMessage()
initSDKAccountAndLastMessage { _ in
// 为了更新状态
NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
}
}
@objc private func loginSuccess() {
guard isUatAllowed() else {
return
}
initSDKAccountAndLastMessage()
initSDKAccountAndLastMessage { _ in
// 为了更新状态
NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
}
}
@objc private func logoutSuccess() {
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ 2c478063
......@@ -411,7 +411,6 @@ extension YHHomePageViewController {
}
self.viewModel.getLastTwoMessagesForSigner { success, error in
self.showOrderTipsView(isShow)
if success {
self.homeHeaderView.orderTipsView.arrLastTwoMessage = self.viewModel.arrLastTwoMessages
self.updateMgrItem()
......@@ -419,8 +418,8 @@ extension YHHomePageViewController {
} else {
self.updateMgrItem()
self.homeHeaderView.updateSubViewsConstraints()
}
self.showOrderTipsView(isShow)
}
}
} else {
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @ 2c478063
......@@ -388,21 +388,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
printLog("\(error.localizedDescription)")
}
// MARK: - webview function
@objc func toBack() {
if webview.canGoBack {
webview.goBack()
}
}
@objc func toForward() {
if webview.canGoForward {
webview.goForward()
}
}
// MARK: - KVO
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
if keyPath == "estimatedProgress" {
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift
View file @ 2c478063
......@@ -231,18 +231,6 @@ private extension YHStatusAdvantageVC {
}
}
}
@objc func toBack() {
if webview.canGoBack {
webview.goBack()
}
}
@objc func toForward() {
if webview.canGoForward {
webview.goForward()
}
}
}
......
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
View file @ 2c478063
......@@ -71,7 +71,6 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
return vm
}()
//UI元素的控制变量 如下
//1、底部分享view
......@@ -89,6 +88,20 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
//4、是否需要重新刷新界面
var isNeedRefreshDataFlag : Bool = false
//webView内部返回
var isSupportWebviewInterBackFlag : Bool = false
override func backItemClick(_ sender: Any) {
if isSupportWebviewInterBackFlag {
if webview.canGoBack {
webview.goBack()
return
}
}
self.navigationController?.popViewController()
}
}
// MARK: - 内部方法
......@@ -121,6 +134,13 @@ private extension YHH5WebViewVC {
gk_navBarAlpha = 0.0
gk_navLineHidden = false
gk_navBackgroundColor = .white
if isFullScreenFlag {
gk_navBarAlpha = 0.0
} else {
gk_navTitle = navTitle
}
NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkUI), name: .reachabilityChanged, object: nil)
......@@ -199,10 +219,7 @@ private extension YHH5WebViewVC {
}
}
gk_navTitle = navTitle
if isFullScreenFlag {
gk_navBarAlpha = 1.0
}
// 加载网页的进度条
progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30))
......@@ -267,19 +284,6 @@ private extension YHH5WebViewVC {
}
}
}
// MARK: - webview function
@objc func toBack() {
if webview.canGoBack {
webview.goBack()
}
}
@objc func toForward() {
if webview.canGoForward {
webview.goForward()
}
}
}
......@@ -291,6 +295,11 @@ extension YHH5WebViewVC {
progBar.setProgress(Float(webview.estimatedProgress), animated: true)
//进度条的值最大为1.0
if(self.webview.estimatedProgress >= 1.0) {
if isFullScreenFlag {
gk_navBarAlpha = 0.0
gk_navTitle = ""
}
UIView.animate(withDuration: 0.3, delay: 0.1, options: .curveEaseInOut, animations: { () -> Void in
self.progBar.alpha = 0.0
}, completion: { (finished:Bool) -> Void in
......@@ -371,20 +380,22 @@ extension YHH5WebViewVC {
}
}
//MARK: - UIScrollViewDelegate
extension YHH5WebViewVC : UIScrollViewDelegate {
func scrollViewDidScroll(_ scrollView: UIScrollView) {
if scrollView.contentOffset.y > 0 {
var alpha = scrollView.contentOffset.y / (k_Height_NavigationtBarAndStatuBar)
if alpha > 1.0 {
alpha = 1.0
if isFullScreenFlag,scrollView == webview.scrollView {
if scrollView.contentOffset.y > 0 {
var alpha = scrollView.contentOffset.y / (k_Height_NavigationtBarAndStatuBar)
if alpha > 1.0 {
alpha = 1.0
}
gk_navBarAlpha = alpha
gk_navTitle = navTitle
} else {
gk_navBarAlpha = 0.0
gk_navTitle = ""
}
gk_navBarAlpha = alpha
} else {
gk_navBarAlpha = 0.0
}
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift
View file @ 2c478063
......@@ -80,20 +80,6 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
self.present(alert, animated: true, completion: nil)
}
// MARK: - webview function
@objc func toBack() {
if webview.canGoBack {
webview.goBack()
}
}
@objc func toForward() {
if webview.canGoForward {
webview.goForward()
}
}
// MARK: - KVO
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
......
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift
View file @ 2c478063
......@@ -153,10 +153,11 @@ class YHMessageListVC: YHBaseViewController {
@objc func loginSuccess() {
printLog("登录成功，进行相应的 UI刷新操作")
getUnreadMsgList()
}
@objc func logoutSuccess() {
getUnreadMsgList()
}
@objc func didBackButtonClicked() {
......@@ -197,6 +198,11 @@ class YHMessageListVC: YHBaseViewController {
// 保留第一个元素银河管家，删除其他元素
msgArr.removeAll()
if YHButlerServiceManager.shared.isUatAllowed() {
self.managerSession.unreadCount = YHButlerServiceManager.shared.unreadCount
if let lastMsg = YHButlerServiceManager.shared.getLastMessage() {
self.managerSession.lastMessage = lastMsg.content
self.managerSession.lastMessageTime = Int64(lastMsg.timeStamp)
}
msgArr.append(self.managerSession)
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 2c478063
......@@ -378,9 +378,11 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
token.insert(contentsOf: addtionString, at: indexToInsert)
url = url + "?param=" + token
let vc = YHHomeWebViewController()
vc.vcTitle = "积分中心"
let vc = YHH5WebViewVC()
vc.navTitle = "积分中心"
vc.url = url
vc.isSupportWebviewInterBackFlag = true
vc.isFullScreenFlag = false
self.navigationController?.pushViewController(vc)
}
case .myTestCode://我的测评码
......
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