Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit b8c75dc1 by pierce
Options

fixed bugs

parent 09d64b03
Inline Side-by-side
Showing with 56 additions and 71 deletions
LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/UserLoginThirdIcon/user_login_third_icon_circle.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "circle.png",
"filename" : "朋友圈@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/UserLoginThirdIcon/user_login_third_icon_more.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "icon_更多.png",
"filename" : "更多@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/UserLoginThirdIcon/user_login_third_icon_visitor.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "icon_游客.png",
"filename" : "游客@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
LocalPodSpec/GDToolBox/GDToolBox/Classes/Base/WebView/GDWebView.swift
......@@ -178,6 +178,9 @@ public class GDWebView: WKWebView, WKNavigationDelegate, WKScriptMessageHandler
GDToolBoxPlugins.shared.webviewPlugin.checkSplashUrl(url: urlStr)
if DevConfig.gd_envConfig == .developing {
UIPasteboard.general.string = urlStr
}
self.addJavaScriptClickEvent(GDWebView.kJavaScriptInteractKey)
return wkNavigation
}
......
LocalPodSpec/GDToolBox/GDToolBox/Classes/Foundation/DataBase/GDDataBase.swift
......@@ -37,7 +37,6 @@ public class GDDataBase: BaseViewModel {
// 数据库配置
let config = Realm.Configuration(fileURL: URL(string: dbPath),
inMemoryIdentifier: nil,
syncConfiguration: nil,
encryptionKey: nil,
readOnly: false,
schemaVersion: DevConfig.gd_dataBaseVersion,
......
Module/GDChatMessage/GDChatMessage/GDChatMessageBundle.bundle/GDChatMessage.xcassets/friend_list_icon.imageset/Contents.json
{
"images": [
"images" : [
{
"idiom": "universal",
"scale": "1x"
"idiom" : "universal",
"scale" : "1x"
},
{
"filename": "friend_list_icon@2x.png",
"idiom": "universal",
"scale": "2x"
"filename" : "好友@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom": "universal",
"scale": "3x"
"idiom" : "universal",
"scale" : "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"info" : {
"author" : "xcode",
"version" : 1
}
}
Module/GDFriend/GDFriend/GDFriendBundle.bundle/GDFriend.xcassets/Friend/friend_list_icon.imageset/Contents.json deleted 100644 → 0
{
"images": [
{
"idiom": "universal",
"scale": "1x"
},
{
"filename": "friend_list_icon@2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
}
}
\ No newline at end of file
Module/GDPersonalModule/GDPersonalModule/Features/Main/View/Cell/DiamondAndCoin/GDMyPageModuleDiamondCell.swift
......@@ -56,7 +56,7 @@ class GDMyPageModuleDiamondCell: UITableViewCell {
goldBgView.addSubview(bgImageView)
let titleLabel = UILabel(frame: .zero)
titleLabel.text = "收益"
titleLabel.text = "充值"
titleLabel.font = .gd_defaultBold(16)
titleLabel.textColor = .hexColor("#5F0000")
goldBgView.addSubview(titleLabel)
......@@ -119,7 +119,7 @@ class GDMyPageModuleDiamondCell: UITableViewCell {
coinBgView.addSubview(bgImageView)
let titleLabel = UILabel(frame: .zero)
titleLabel.text = "充值"
titleLabel.text = "收益"
titleLabel.font = .gd_defaultBold(16)
titleLabel.textColor = .hexColor("#5F0000")
coinBgView.addSubview(titleLabel)
......
Module/GDShowRoomListModule/GDShowRoomListModule/GDShowRoomListBundle.bundle/GDShowRoomListAssets.xcassets/roomlist_newStar_icon.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "roomlist_newStar_icon@2x.png",
"filename" : "组 6@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
Module/GDShowRoomModule/GDShowRoomModule/Features/Function/View/WarnMessage/GDLiveWarnMessageView.swift
......@@ -70,9 +70,7 @@ class GDLiveWarnMessageView: BaseView {
bgView.layer.masksToBounds = true
bgView.layer.cornerRadius = 15
bgView.layer.masksToBounds = true
bgView.layer.borderWidth = 2
bgView.layer.borderColor = UIColor.init(white: 1, alpha: 0.15).cgColor
bgView.backgroundColor = .init(white: 0, alpha: 0.3)
bgView.backgroundColor = .white
let width: CGFloat = GDScreen.isSmallScreen ? 250 : 300
var height: CGFloat = role == .anchor ? 181 : 150
......@@ -93,12 +91,12 @@ class GDLiveWarnMessageView: BaseView {
}
private func makeContentView() {
titleLabel.textColor = .white
titleLabel.textColor = .hexColor("121212")
titleLabel.font = .gd_pingfang(16)
titleLabel.textAlignment = .center
bgView.addSubview(titleLabel)
contentLabel.textColor = .init(white: 1, alpha: 0.6)
contentLabel.textColor = .hexColor("666666")
contentLabel.font = .gd_pingfang(14)
contentLabel.textAlignment = .left
contentLabel.numberOfLines = 0
......@@ -109,7 +107,7 @@ class GDLiveWarnMessageView: BaseView {
confirmBtn.setTitle("确定", for: .normal)
confirmBtn.titleLabel?.font = .gd_pingfang(16)
confirmBtn.setTitleColor(.white, for: .normal)
confirmBtn.setTitleColor(.hexColor("212121"), for: .normal)
bgView.addSubview(confirmBtn)
confirmBtn.snp.makeConstraints { make in
......
Module/GDShowRoomModule/GDShowRoomModule/GDShowRoomBundle.bundle/GDShowRoomAssets.xcassets/icon_live_input_message.imageset/Contents.json
{
"images": [
"images" : [
{
"idiom": "universal",
"scale": "1x"
"idiom" : "universal",
"scale" : "1x"
},
{
"filename": "icon_live_input_message.png",
"idiom": "universal",
"scale": "2x"
"filename" : "发言@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom": "universal",
"scale": "3x"
"idiom" : "universal",
"scale" : "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"info" : {
"author" : "xcode",
"version" : 1
}
}
Module/GDShowRoomModule/GDShowRoomModule/GDShowRoomBundle.bundle/GDShowRoomAssets.xcassets/live_official_end_icon.imageset/Contents.json
{
"images": [
"images" : [
{
"idiom": "universal",
"scale": "1x"
"idiom" : "universal",
"scale" : "1x"
},
{
"filename": "live_official_end_icon.png",
"idiom": "universal",
"scale": "2x"
"filename" : "empty_bg.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom": "universal",
"scale": "3x"
"idiom" : "universal",
"scale" : "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"info" : {
"author" : "xcode",
"version" : 1
}
}
Module/GDUserZoneModule/GDUserZoneModule/Feature/Search/View/GDUserSearchController.swift
......@@ -31,9 +31,6 @@ class GDUserSearchController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
if inputTextField.canBecomeFirstResponder {
inputTextField.becomeFirstResponder()
}
}
override func viewDidDisappear(_ animated: Bool) {
......@@ -49,6 +46,16 @@ class GDUserSearchController: BaseViewController {
self.navigationController?.isNavigationBarHidden = true
}
var isFirstShow = true
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
if isFirstShow == true && inputTextField.canBecomeFirstResponder {
isFirstShow = false
inputTextField.becomeFirstResponder()
}
}
// MARK: UI
override func makeUI() {
super.makeUI()
......
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