Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit 87e65467 by pierce
Options

fixed bugs

parent 40fe6817
Inline Side-by-side
Showing with 31 additions and 29 deletions
LocalPodSpec/GDToolBox/GDToolBox/Classes/GDConfiguration.swift
...@@ -28,8 +28,8 @@ public let GDlog = XCGLogger(identifier: "xiuse.log.identifier", includeDefaultD ...@@ -28,8 +28,8 @@ public let GDlog = XCGLogger(identifier: "xiuse.log.identifier", includeDefaultD
public struct GDAppConfig { public struct GDAppConfig {
/// 版本 /// 版本
public static let gd_versionCode = "43005" public static let gd_versionCode = "43006"
public static let gd_version = "43.0.0.5" public static let gd_version = "43.0.0.6"
public static var realVersion: String { Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""} public static var realVersion: String { Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""}
/// App ID /// App ID
......
Module/GDFightTeamModule/GDFightTeamModule/GDFightTeamBundle.bundle/FightTeamAssets.xcassets/FightTeam/fightTeam_live_textInput_icon.imageset/Contents.json
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "说点_半屏.png", "filename" : "发言@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
Module/GDLoginAndRegistModule/GDLoginAndRegistModule/Features/Login/LoginViewController.swift
...@@ -191,8 +191,8 @@ class LoginViewController: BaseViewController { ...@@ -191,8 +191,8 @@ class LoginViewController: BaseViewController {
} }
} }
override func viewWillDisappear(_ animated: Bool) { override func viewDidDisappear(_ animated: Bool) {
super.viewWillDisappear(animated) super.viewDidDisappear(animated)
if self.player.player != nil { if self.player.player != nil {
self.player.player?.pause() self.player.player?.pause()
...@@ -304,6 +304,7 @@ class LoginViewController: BaseViewController { ...@@ -304,6 +304,7 @@ class LoginViewController: BaseViewController {
if let videoUrl = GDLoginBundle.bundle()?.url(forResource: "login_page_preview", withExtension: "mp4") { if let videoUrl = GDLoginBundle.bundle()?.url(forResource: "login_page_preview", withExtension: "mp4") {
player.player = AVPlayer(url: videoUrl) player.player = AVPlayer(url: videoUrl)
player.player?.isMuted = true
player.frame = GDScreen.frame player.frame = GDScreen.frame
player.videoGravity = .resizeAspectFill player.videoGravity = .resizeAspectFill
player.repeatCount = 100 player.repeatCount = 100
...@@ -673,7 +674,7 @@ class LoginViewController: BaseViewController { ...@@ -673,7 +674,7 @@ class LoginViewController: BaseViewController {
} }
GDStatistics.track(.socialLogin, params: [.type: plat.platName]) GDStatistics.track(.socialLogin, params: [.type: plat.platName])
FTIndicator.showProgress(withMessage: "")
GDRouter.UserRouter?.login(on: plat, currentVC: nil).subscribe(onSuccess: {[weak self] (_) in GDRouter.UserRouter?.login(on: plat, currentVC: nil).subscribe(onSuccess: {[weak self] (_) in
FTIndicator.dismissProgress() FTIndicator.dismissProgress()
self?.isSocialLogin = false self?.isSocialLogin = false
...@@ -865,10 +866,6 @@ extension LoginViewController { ...@@ -865,10 +866,6 @@ extension LoginViewController {
self.navigationController?.pushViewController(registerVC, animated: true) self.navigationController?.pushViewController(registerVC, animated: true)
default: default:
FTIndicator.showToastMessage(error.msg) FTIndicator.showToastMessage(error.msg)
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
let _ = GDAlertView.showAlertView(viewController: UIViewController.topViewController(), title: "测试弹窗", message: error.localizedDescription)
}
} }
}).disposed(by: self.disposeBag) }).disposed(by: self.disposeBag)
......
Module/GDShowRoomListModule/GDShowRoomListModule/Features/View/DailySignView/Cell/GDDailySignResultCell.swift
...@@ -18,15 +18,15 @@ class GDDailySignResultCell: BaseCollectionViewCell { ...@@ -18,15 +18,15 @@ class GDDailySignResultCell: BaseCollectionViewCell {
override func makeUI() { override func makeUI() {
super.makeUI() super.makeUI()
bgView.backgroundColor = .gd_main.withAlphaComponent(0.6) bgView.backgroundColor = .hexColor("FFE2E0")
bgView.layer.cornerRadius = 5 bgView.layer.cornerRadius = 10
bgView.layer.masksToBounds = true bgView.layer.masksToBounds = true
self.contentView.addSubview(bgView) self.contentView.addSubview(bgView)
iconImageView.contentMode = .scaleAspectFit iconImageView.contentMode = .scaleAspectFit
bgView.addSubview(iconImageView) bgView.addSubview(iconImageView)
numberLabel.font = .gd_YZNumber(10) numberLabel.font = .gd_signFont(11)
numberLabel.textColor = .hexColor("EF3874") numberLabel.textColor = .hexColor("EF3874")
bgView.addSubview(numberLabel) bgView.addSubview(numberLabel)
...@@ -58,7 +58,7 @@ class GDDailySignResultCell: BaseCollectionViewCell { ...@@ -58,7 +58,7 @@ class GDDailySignResultCell: BaseCollectionViewCell {
iconImageView.image = nil iconImageView.image = nil
iconImageView.setWebImage(model.icon) iconImageView.setWebImage(model.icon)
numberLabel.text = model.num numberLabel.text = "x\(String(describing: model.num))"
} }
......
Module/GDShowRoomListModule/GDShowRoomListModule/Features/View/DailySignView/Cell/GDDailySingAwardCell.swift
...@@ -18,8 +18,8 @@ class GDDailySingAwardCell: BaseCollectionViewCell { ...@@ -18,8 +18,8 @@ class GDDailySingAwardCell: BaseCollectionViewCell {
override func makeUI() { override func makeUI() {
super.makeUI() super.makeUI()
bgView.backgroundColor = .gd_main.withAlphaComponent(0.6) bgView.backgroundColor = .hexColor("#FFE2E0")
bgView.layer.cornerRadius = 5 bgView.layer.cornerRadius = 10
bgView.layer.masksToBounds = true bgView.layer.masksToBounds = true
self.contentView.addSubview(bgView) self.contentView.addSubview(bgView)
...@@ -100,10 +100,10 @@ class GDDailySingAwardCell: BaseCollectionViewCell { ...@@ -100,10 +100,10 @@ class GDDailySingAwardCell: BaseCollectionViewCell {
awardBgView.addSubview(iconImageView) awardBgView.addSubview(iconImageView)
let numLabel = GDGradientLabel(frame: .zero) let numLabel = GDGradientLabel(frame: .zero)
numLabel.font = .gd_pingfangBold(10) numLabel.font = .gd_signFont(10)
numLabel.textColor = .hexColor("EF3874") numLabel.textColor = .hexColor("EF3874")
numLabel.strokeColor = .white numLabel.strokeColor = .white
numLabel.text = content.num numLabel.text = "x\(String(describing: content.num))"
numLabel.sizeToFit() numLabel.sizeToFit()
iconImageView.addSubview(numLabel) iconImageView.addSubview(numLabel)
......
Module/GDShowRoomListModule/GDShowRoomListModule/Features/View/RoomListViewController.swift
...@@ -159,7 +159,7 @@ class RoomListViewController: BaseViewController { ...@@ -159,7 +159,7 @@ class RoomListViewController: BaseViewController {
scrollView.showsVerticalScrollIndicator = false scrollView.showsVerticalScrollIndicator = false
scrollView.showsHorizontalScrollIndicator = false scrollView.showsHorizontalScrollIndicator = false
scrollView.alwaysBounceVertical = false scrollView.alwaysBounceVertical = false
scrollView.frame = CGRect(x: 0, y: segmentView.maxY + 8, width: self.view.width, height: self.view.height - segmentView.maxY - (tabBarHeight) - 8) scrollView.frame = CGRect(x: 0, y: segmentView.maxY + 14, width: self.view.width, height: self.view.height - segmentView.maxY - (tabBarHeight) - 8)
self.view.addSubview(scrollView) self.view.addSubview(scrollView)
// 游客模式下不能滚动 // 游客模式下不能滚动
...@@ -387,11 +387,11 @@ class RoomListViewController: BaseViewController { ...@@ -387,11 +387,11 @@ class RoomListViewController: BaseViewController {
// 创建对应视图 // 创建对应视图
for (index, item) in segmentTypes.enumerated() { for (index, item) in segmentTypes.enumerated() {
if let roomlistView = item.type.createView(CGRect(x: CGFloat(index) * self.scrollView.width, y: 0, width: self.scrollView.width, height: self.scrollView.height)) { if let roomlistView = item.type.createView(CGRect(x: CGFloat(index) * self.scrollView.width, y: 0, width: self.scrollView.width, height: self.scrollView.height)) {
roomlistView.scrollHander = {[weak self] offsetY in // roomlistView.scrollHander = {[weak self] offsetY in
if offsetY <= 0 { //// if offsetY <= 0 {
self?.bgImageView.height = 58 + GDScreen.SafeArea.top + (-offsetY) //// self?.bgImageView.height = 58 + GDScreen.SafeArea.top + (-offsetY)
} //// }
} // }
roomlistView.tag = item.type.rawValue roomlistView.tag = item.type.rawValue
if let roomlistView = roomlistView as? GDRecommendListView { if let roomlistView = roomlistView as? GDRecommendListView {
......
Module/GDShowRoomModule/GDShowRoomModule/Features/Function/View/LiveTimeView/DetailView/GDLiveTimeDetailCell.swift
...@@ -34,7 +34,7 @@ class GDLiveTimeDetailCell: BaseCollectionViewCell { ...@@ -34,7 +34,7 @@ class GDLiveTimeDetailCell: BaseCollectionViewCell {
self.contentView.addSubview(timeLabel) self.contentView.addSubview(timeLabel)
bondsLabel.font = .gd_pingfang(10) bondsLabel.font = .gd_pingfang(10)
bondsLabel.textColor = .white bondsLabel.textColor = .gd_main
self.contentView.addSubview(bondsLabel) self.contentView.addSubview(bondsLabel)
faceImageView.layer.borderWidth = 1 faceImageView.layer.borderWidth = 1
......
Module/GDSocialCenter/GDSocialCenter/SocialPlatCenter/GDSocialPlatCenter.swift
...@@ -167,7 +167,12 @@ class GDSocialPlatCenter: BaseViewModel { ...@@ -167,7 +167,12 @@ class GDSocialPlatCenter: BaseViewModel {
currentLoginModel = model currentLoginModel = model
switch model.plat { switch model.plat {
case .wechat: case .wechat:
if let wechatOpenUrl = URL(string: "weixin://"), UIApplication.shared.canOpenURL(wechatOpenUrl) == true {
GDPlat.WeChat.login(delegate: self, currentVc: vc) GDPlat.WeChat.login(delegate: self, currentVc: vc)
} else {
currentLoginModel?.completionHandler?(false, "请先安装微信", [:])
currentLoginModel = nil
}
case .qq: case .qq:
let success = tencentAuth!.authorize(GDPlat.QQ.permission, localAppId: GDSDK.gd_QQAppId) let success = tencentAuth!.authorize(GDPlat.QQ.permission, localAppId: GDSDK.gd_QQAppId)
......
TealiveModule/TealiveModule.xcodeproj/project.pbxproj
...@@ -611,7 +611,7 @@ ...@@ -611,7 +611,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements; CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.2; MARKETING_VERSION = 2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios; PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
...@@ -703,7 +703,7 @@ ...@@ -703,7 +703,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements; CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.2; MARKETING_VERSION = 2.3;
OTHER_SWIFT_FLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios; PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
......
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 sign in to comment