Skip to content

Commit c0dace2

Browse files
shine2008shine2008
authored
Merge pull request #348 from Dongshanxu/master
9.2.7
2 parents 870b414 + 379a741 commit c0dace2

303 files changed

Lines changed: 27043 additions & 25710 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NEChatUIKit/NEKitChatUI.podspec‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
1616
#
1717

1818
spec.name = "NEKitChatUI"
19-
spec.version = "9.2.6-rc01"
19+
spec.version = "9.2.7"
2020
spec.summary = "Chat Module of IM."
2121

2222
# This description is used to generate tags and improve search results.
@@ -34,6 +34,10 @@ TODO: Add long description of the pod here.
3434

3535
spec.ios.deployment_target = '9.0'
3636
spec.source_files = 'NEKitChatUI/Classes/**/*'
37+
spec.pod_target_xcconfig = {
38+
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'
39+
}
40+
spec.user_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
3741

3842
spec.resource_bundles = {
3943
'NEKitChatUI' => ['NEKitChatUI/Assets/*.png']

‎NEChatUIKit/NEKitChatUI/Assets/en.lproj/Localizable.strings‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
/*
2-
YXLogin.strings
3-
Pods
41

5-
Created by yu chen on 2021/12/24.
6-
7-
*/
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
5+
86
//MAKR：common
97
"ok"="ok";
108
"send_to"="To ";

‎NEChatUIKit/NEKitChatUI/Assets/zh-Hans.lproj/Localizable.strings‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/*
2-
YXLogin.strings
3-
Pods
41

5-
Created by yu chen on 2021/12/24.
6-
7-
*/
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
85

96
//MAKR：common
107
"ok"="确认";

‎NEChatUIKit/NEKitChatUI/Classes/Base/BaseView/ChatBaseCell.swift‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11

2-
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3-
// Use of this source code is governed by a MIT license that can be found in the LICENSE file.
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
45

56
import UIKit
67

78
public class ChatBaseCell: UITableViewCell {
8-
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
9-
super.init(style: style, reuseIdentifier: reuseIdentifier)
10-
self.selectionStyle = .none
11-
}
12-
13-
required init?(coder: NSCoder) {
14-
fatalError("init(coder:) has not been implemented")
15-
}
16-
17-
public func uploadProgress(_ progress: Float){
18-
fatalError("override in sub class")
19-
}
9+
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
10+
super.init(style: style, reuseIdentifier: reuseIdentifier)
11+
selectionStyle = .none
12+
}
2013

14+
required init?(coder: NSCoder) {
15+
fatalError("init(coder:) has not been implemented")
16+
}
17+
18+
public func uploadProgress(_ progress: Float) {
19+
fatalError("override in sub class")
20+
}
2121
}

‎NEChatUIKit/NEKitChatUI/Classes/Base/BaseView/ChatBaseCollectionViewCell.swift‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11

2-
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3-
// Use of this source code is governed by a MIT license that can be found in the LICENSE file.
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
45

56
import UIKit
67

7-
class ChatBaseCollectionViewCell: UICollectionViewCell {
8-
9-
}
8+
class ChatBaseCollectionViewCell: UICollectionViewCell {}

‎NEChatUIKit/NEKitChatUI/Classes/Base/BaseView/ChatCenterTextCell.swift‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11

2-
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3-
// Use of this source code is governed by a MIT license that can be found in the LICENSE file.
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
45

56
import UIKit
67

78
class ChatCenterTextCell: ChatCornerCell {
9+
public var titleLabel: UILabel = .init()
10+
public var line = UIView()
11+
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
12+
super.init(style: style, reuseIdentifier: reuseIdentifier)
813

9-
public var titleLabel: UILabel = UILabel()
10-
public var line = UIView()
11-
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
12-
super.init(style: style, reuseIdentifier: reuseIdentifier)
13-
14-
self.titleLabel.font = UIFont.systemFont(ofSize: 16)
15-
self.titleLabel.translatesAutoresizingMaskIntoConstraints = false
16-
self.titleLabel.textColor = .ne_redText
17-
self.titleLabel.textAlignment = .center
18-
self.contentView.addSubview(self.titleLabel)
19-
NSLayoutConstraint.activate([
20-
self.titleLabel.leftAnchor.constraint(equalTo: self.contentView.leftAnchor, constant: 36),
21-
self.titleLabel.rightAnchor.constraint(equalTo: self.contentView.rightAnchor, constant: -36),
22-
self.titleLabel.topAnchor.constraint(equalTo: self.contentView.topAnchor),
23-
self.titleLabel.bottomAnchor.constraint(equalTo: self.contentView.bottomAnchor)
24-
])
25-
self.titleLabel.text = "title"
26-
self.line.backgroundColor = .ne_greyLine
27-
self.line.translatesAutoresizingMaskIntoConstraints = false
28-
self.contentView.addSubview(self.line)
29-
NSLayoutConstraint.activate([
30-
self.line.leftAnchor.constraint(equalTo: self.contentView.leftAnchor, constant: 20),
31-
self.line.rightAnchor.constraint(equalTo: self.contentView.rightAnchor, constant: -20),
32-
self.line.heightAnchor.constraint(equalToConstant: 1.0),
33-
self.line.bottomAnchor.constraint(equalTo: self.contentView.bottomAnchor)
34-
])
35-
}
36-
37-
required init?(coder: NSCoder) {
38-
fatalError("init(coder:) has not been implemented")
39-
}
40-
14+
titleLabel.font = UIFont.systemFont(ofSize: 16)
15+
titleLabel.translatesAutoresizingMaskIntoConstraints = false
16+
titleLabel.textColor = .ne_redText
17+
titleLabel.textAlignment = .center
18+
contentView.addSubview(titleLabel)
19+
NSLayoutConstraint.activate([
20+
titleLabel.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant: 36),
21+
titleLabel.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: -36),
22+
titleLabel.topAnchor.constraint(equalTo: contentView.topAnchor),
23+
titleLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
24+
])
25+
titleLabel.text = "title"
26+
line.backgroundColor = .ne_greyLine
27+
line.translatesAutoresizingMaskIntoConstraints = false
28+
contentView.addSubview(line)
29+
NSLayoutConstraint.activate([
30+
line.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant: 20),
31+
line.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: -20),
32+
line.heightAnchor.constraint(equalToConstant: 1.0),
33+
line.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
34+
])
35+
}
36+
37+
required init?(coder: NSCoder) {
38+
fatalError("init(coder:) has not been implemented")
39+
}
4140
}

‎NEChatUIKit/NEKitChatUI/Classes/Base/BaseView/ChatCornerCell.swift‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11

2-
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3-
// Use of this source code is governed by a MIT license that can be found in the LICENSE file.
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
45

5-
//this cell has rounding corner style
6+
// this cell has rounding corner style
67
import UIKit
78
import NEKitCommonUI
89

9-
class ChatCornerCell: CornerCell {
10-
11-
}
10+
class ChatCornerCell: CornerCell {}

‎NEChatUIKit/NEKitChatUI/Classes/Base/BaseView/ChatHeaderView.swift‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11

2-
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3-
// Use of this source code is governed by a MIT license that can be found in the LICENSE file.
2+
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
3+
// Use of this source code is governed by a MIT license that can be
4+
// found in the LICENSE file.
45

56
import UIKit
67

78
public class ChatHeaderView: UIView {
8-
9-
public lazy var titleLabel: UILabel = {
10-
let label = UILabel()
11-
label.font = DefaultTextFont(12)
12-
label.textColor = .ne_greyText
13-
label.translatesAutoresizingMaskIntoConstraints = false
14-
return label
15-
}()
16-
17-
/*
18-
// Only override draw() if you perform custom drawing.
19-
// An empty implementation adversely affects performance during animation.
20-
override func draw(_ rect: CGRect) {
21-
// Drawing code
22-
}
23-
*/
24-
25-
override init(frame: CGRect) {
26-
super.init(frame: frame)
27-
setupUI()
28-
}
29-
30-
required init?(coder: NSCoder) {
31-
super.init(coder: coder)
32-
}
33-
34-
func setupUI(){
35-
clipsToBounds = false
36-
addSubview(titleLabel)
37-
NSLayoutConstraint.activate([
38-
titleLabel.bottomAnchor.constraint(equalTo: self.bottomAnchor, constant: -8),
39-
titleLabel.leftAnchor.constraint(equalTo: self.leftAnchor, constant: 33)
40-
])
41-
backgroundColor = .clear
42-
}
43-
44-
public func setTitle(_ name: String){
45-
titleLabel.text = name.count > 2 ? String(name[name.index(name.endIndex, offsetBy: -2)...]) : name
46-
}
9+
public lazy var titleLabel: UILabel = {
10+
let label = UILabel()
11+
label.font = DefaultTextFont(12)
12+
label.textColor = .ne_greyText
13+
label.translatesAutoresizingMaskIntoConstraints = false
14+
return label
15+
}()
4716

17+
/*
18+
// Only override draw() if you perform custom drawing.
19+
// An empty implementation adversely affects performance during animation.
20+
override func draw(_ rect: CGRect) {
21+
// Drawing code
22+
}
23+
*/
24+
25+
override init(frame: CGRect) {
26+
super.init(frame: frame)
27+
setupUI()
28+
}
29+
30+
required init?(coder: NSCoder) {
31+
super.init(coder: coder)
32+
}
33+
34+
func setupUI() {
35+
clipsToBounds = false
36+
addSubview(titleLabel)
37+
NSLayoutConstraint.activate([
38+
titleLabel.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -8),
39+
titleLabel.leftAnchor.constraint(equalTo: leftAnchor, constant: 33),
40+
])
41+
backgroundColor = .clear
42+
}
43+
44+
public func setTitle(_ name: String) {
45+
titleLabel.text = name
46+
.count > 2 ? String(name[name.index(name.endIndex, offsetBy: -2)...]) : name
47+
}
4848
}

0 commit comments

Comments
 (0)