diff --git a/NEChatUIKit/NEChatUIKit.podspec b/NEChatUIKit/NEChatUIKit.podspec
index 1668ce72..d40707ae 100644
--- a/NEChatUIKit/NEChatUIKit.podspec
+++ b/NEChatUIKit/NEChatUIKit.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
#
spec.name = 'NEChatUIKit'
- spec.version = '9.2.10'
+ spec.version = '9.2.11'
spec.summary = 'Chat Module of IM.'
# This description is used to generate tags and improve search results.
@@ -40,16 +40,16 @@ TODO: Add long description of the pod here.
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'
}
spec.user_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
- spec.resource_bundles = {
- 'NEChatUIKit' => ['NEChatUIKit/Assets/*.png']
- }
+# spec.resource_bundles = {
+# 'NEChatUIKit' => ['NEChatUIKit/Assets/*.png']
+# }
spec.resource = 'NEChatUIKit/Assets/**/*'
spec.dependency 'NEChatKit'
spec.dependency 'NECommonUIKit'
spec.dependency 'RSKPlaceholderTextView'
spec.dependency 'MJRefresh'
- spec.dependency 'NIMSDK_LITE', '9.2.5'
+ spec.dependency 'NIMSDK_LITE'
spec.dependency 'YXAlog_iOS'
end
diff --git a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji.plist b/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji.plist
deleted file mode 100755
index 01d60176..00000000
--- a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji.plist
+++ /dev/null
@@ -1,1020 +0,0 @@
-
-
-
-
-
- data
-
-
- file
- emoji_01.png
- id
- emoticon_emoji_01
- tag
- [可爱]
-
-
- file
- emoji_00.png
- id
- emoticon_emoji_0
- tag
- [大笑]
-
-
- file
- emoji_02.png
- id
- emoticon_emoji_02
- tag
- [色]
-
-
- file
- emoji_03.png
- id
- emoticon_emoji_03
- tag
- [嘘]
-
-
- file
- emoji_04.png
- id
- emoticon_emoji_04
- tag
- [亲]
-
-
- file
- emoji_05.png
- id
- emoticon_emoji_05
- tag
- [呆]
-
-
- file
- emoji_06.png
- id
- emoticon_emoji_06
- tag
- [口水]
-
-
- file
- emoji_145.png
- id
- emoticon_emoji_145
- tag
- [汗]
-
-
- file
- emoji_07.png
- id
- emoticon_emoji_07
- tag
- [呲牙]
-
-
- file
- emoji_08.png
- id
- emoticon_emoji_08
- tag
- [鬼脸]
-
-
- file
- emoji_09.png
- id
- emoticon_emoji_09
- tag
- [害羞]
-
-
- file
- emoji_10.png
- id
- emoticon_emoji_10
- tag
- [偷笑]
-
-
- file
- emoji_11.png
- id
- emoticon_emoji_11
- tag
- [调皮]
-
-
- file
- emoji_12.png
- id
- emoticon_emoji_12
- tag
- [可怜]
-
-
- file
- emoji_13.png
- id
- emoticon_emoji_13
- tag
- [敲]
-
-
- file
- emoji_14.png
- id
- emoticon_emoji_14
- tag
- [惊讶]
-
-
- file
- emoji_15.png
- id
- emoticon_emoji_15
- tag
- [流感]
-
-
- file
- emoji_16.png
- id
- emoticon_emoji_16
- tag
- [委屈]
-
-
- file
- emoji_17.png
- id
- emoticon_emoji_17
- tag
- [流泪]
-
-
- file
- emoji_18.png
- id
- emoticon_emoji_18
- tag
- [嚎哭]
-
-
- file
- emoji_19.png
- id
- emoticon_emoji_19
- tag
- [惊恐]
-
-
- file
- emoji_20.png
- id
- emoticon_emoji_20
- tag
- [怒]
-
-
- file
- emoji_21.png
- id
- emoticon_emoji_21
- tag
- [酷]
-
-
- file
- emoji_22.png
- id
- emoticon_emoji_22
- tag
- [不说]
-
-
- file
- emoji_23.png
- id
- emoticon_emoji_23
- tag
- [鄙视]
-
-
- file
- emoji_24.png
- id
- emoticon_emoji_24
- tag
- [阿弥陀佛]
-
-
- file
- emoji_25.png
- id
- emoticon_emoji_25
- tag
- [奸笑]
-
-
- file
- emoji_26.png
- id
- emoticon_emoji_26
- tag
- [睡着]
-
-
- file
- emoji_27.png
- id
- emoticon_emoji_27
- tag
- [口罩]
-
-
- file
- emoji_28.png
- id
- emoticon_emoji_28
- tag
- [努力]
-
-
- file
- emoji_29.png
- id
- emoticon_emoji_29
- tag
- [抠鼻孔]
-
-
- file
- emoji_30.png
- id
- emoticon_emoji_30
- tag
- [疑问]
-
-
- file
- emoji_31.png
- id
- emoticon_emoji_31
- tag
- [怒骂]
-
-
- file
- emoji_32.png
- id
- emoticon_emoji_32
- tag
- [晕]
-
-
- file
- emoji_33.png
- id
- emoticon_emoji_33
- tag
- [呕吐]
-
-
- file
- emoji_160.png
- id
- emoticon_emoji_160
- tag
- [拜一拜]
-
-
- file
- emoji_161.png
- id
- emoticon_emoji_161
- tag
- [惊喜]
-
-
- file
- emoji_162.png
- id
- emoticon_emoji_162
- tag
- [流汗]
-
-
- file
- emoji_163.png
- id
- emoticon_emoji_163
- tag
- [卖萌]
-
-
- file
- emoji_164.png
- id
- emoticon_emoji_164
- tag
- [默契眨眼]
-
-
- file
- emoji_165.png
- id
- emoticon_emoji_165
- tag
- [烧香拜佛]
-
-
- file
- emoji_166.png
- id
- emoticon_emoji_166
- tag
- [晚安]
-
-
- file
- emoji_34.png
- id
- emoticon_emoji_34
- tag
- [强]
-
-
- file
- emoji_35.png
- id
- emoticon_emoji_35
- tag
- [弱]
-
-
- file
- emoji_36.png
- id
- emoticon_emoji_36
- tag
- [OK]
-
-
- file
- emoji_37.png
- id
- emoticon_emoji_37
- tag
- [拳头]
-
-
- file
- emoji_38.png
- id
- emoticon_emoji_38
- tag
- [胜利]
-
-
- file
- emoji_39.png
- id
- emoticon_emoji_39
- tag
- [鼓掌]
-
-
- file
- emoji_200.png
- id
- emoticon_emoji_200
- tag
- [握手]
-
-
- file
- emoji_40.png
- id
- emoticon_emoji_40
- tag
- [发怒]
-
-
- file
- emoji_41.png
- id
- emoticon_emoji_41
- tag
- [骷髅]
-
-
- file
- emoji_42.png
- id
- emoticon_emoji_42
- tag
- [便便]
-
-
- file
- emoji_43.png
- id
- emoticon_emoji_43
- tag
- [火]
-
-
- file
- emoji_44.png
- id
- emoticon_emoji_44
- tag
- [溜]
-
-
- file
- emoji_45.png
- id
- emoticon_emoji_45
- tag
- [爱心]
-
-
- file
- emoji_46.png
- id
- emoticon_emoji_46
- tag
- [心碎]
-
-
- file
- emoji_47.png
- id
- emoticon_emoji_47
- tag
- [钟情]
-
-
- file
- emoji_48.png
- id
- emoticon_emoji_48
- tag
- [唇]
-
-
- file
- emoji_49.png
- id
- emoticon_emoji_49
- tag
- [戒指]
-
-
- file
- emoji_50.png
- id
- emoticon_emoji_50
- tag
- [钻石]
-
-
- file
- emoji_51.png
- id
- emoticon_emoji_51
- tag
- [太阳]
-
-
- file
- emoji_52.png
- id
- emoticon_emoji_52
- tag
- [有时晴]
-
-
- file
- emoji_53.png
- id
- emoticon_emoji_53
- tag
- [多云]
-
-
- file
- emoji_54.png
- id
- emoticon_emoji_54
- tag
- [雷]
-
-
- file
- emoji_55.png
- id
- emoticon_emoji_55
- tag
- [雨]
-
-
- file
- emoji_56.png
- id
- emoticon_emoji_56
- tag
- [雪花]
-
-
- file
- emoji_57.png
- id
- emoticon_emoji_57
- tag
- [爱人]
-
-
- file
- emoji_58.png
- id
- emoticon_emoji_58
- tag
- [帽子]
-
-
- file
- emoji_59.png
- id
- emoticon_emoji_59
- tag
- [皇冠]
-
-
- file
- emoji_60.png
- id
- emoticon_emoji_60
- tag
- [篮球]
-
-
- file
- emoji_61.png
- id
- emoticon_emoji_61
- tag
- [足球]
-
-
- file
- emoji_62.png
- id
- emoticon_emoji_62
- tag
- [垒球]
-
-
- file
- emoji_63.png
- id
- emoticon_emoji_63
- tag
- [网球]
-
-
- file
- emoji_64.png
- id
- emoticon_emoji_64
- tag
- [台球]
-
-
- file
- emoji_65.png
- id
- emoticon_emoji_65
- tag
- [咖啡]
-
-
- file
- emoji_66.png
- id
- emoticon_emoji_66
- tag
- [啤酒]
-
-
- file
- emoji_67.png
- id
- emoticon_emoji_67
- tag
- [干杯]
-
-
- file
- emoji_68.png
- id
- emoticon_emoji_68
- tag
- [柠檬汁]
-
-
- file
- emoji_69.png
- id
- emoticon_emoji_69
- tag
- [餐具]
-
-
- file
- emoji_70.png
- id
- emoticon_emoji_70
- tag
- [汉堡]
-
-
- file
- emoji_71.png
- id
- emoticon_emoji_71
- tag
- [鸡腿]
-
-
- file
- emoji_72.png
- id
- emoticon_emoji_72
- tag
- [面条]
-
-
- file
- emoji_73.png
- id
- emoticon_emoji_73
- tag
- [冰淇淋]
-
-
- file
- emoji_74.png
- id
- emoticon_emoji_74
- tag
- [沙冰]
-
-
- file
- emoji_75.png
- id
- emoticon_emoji_75
- tag
- [生日蛋糕]
-
-
- file
- emoji_76.png
- id
- emoticon_emoji_76
- tag
- [蛋糕]
-
-
- file
- emoji_77.png
- id
- emoticon_emoji_77
- tag
- [糖果]
-
-
- file
- emoji_78.png
- id
- emoticon_emoji_78
- tag
- [葡萄]
-
-
- file
- emoji_79.png
- id
- emoticon_emoji_79
- tag
- [西瓜]
-
-
- file
- emoji_80.png
- id
- emoticon_emoji_80
- tag
- [光碟]
-
-
- file
- emoji_81.png
- id
- emoticon_emoji_81
- tag
- [手机]
-
-
- file
- emoji_82.png
- id
- emoticon_emoji_82
- tag
- [电话]
-
-
- file
- emoji_83.png
- id
- emoticon_emoji_83
- tag
- [电视]
-
-
- file
- emoji_84.png
- id
- emoticon_emoji_84
- tag
- [声音开启]
-
-
- file
- emoji_85.png
- id
- emoticon_emoji_85
- tag
- [声音关闭]
-
-
- file
- emoji_86.png
- id
- emoticon_emoji_86
- tag
- [铃铛]
-
-
- file
- emoji_87.png
- id
- emoticon_emoji_87
- tag
- [锁头]
-
-
- file
- emoji_88.png
- id
- emoticon_emoji_88
- tag
- [放大镜]
-
-
- file
- emoji_89.png
- id
- emoticon_emoji_89
- tag
- [灯泡]
-
-
- file
- emoji_90.png
- id
- emoticon_emoji_90
- tag
- [锤头]
-
-
- file
- emoji_91.png
- id
- emoticon_emoji_91
- tag
- [烟]
-
-
- file
- emoji_92.png
- id
- emoticon_emoji_92
- tag
- [炸弹]
-
-
- file
- emoji_93.png
- id
- emoticon_emoji_93
- tag
- [枪]
-
-
- file
- emoji_94.png
- id
- emoticon_emoji_94
- tag
- [刀]
-
-
- file
- emoji_95.png
- id
- emoticon_emoji_95
- tag
- [药]
-
-
- file
- emoji_96.png
- id
- emoticon_emoji_96
- tag
- [打针]
-
-
- file
- emoji_97.png
- id
- emoticon_emoji_97
- tag
- [钱袋]
-
-
- file
- emoji_98.png
- id
- emoticon_emoji_98
- tag
- [钞票]
-
-
- file
- emoji_99.png
- id
- emoticon_emoji_99
- tag
- [银行卡]
-
-
- file
- emoji_101.png
- id
- emoticon_emoji_101
- tag
- [麻将]
-
-
- file
- emoji_102.png
- id
- emoticon_emoji_102
- tag
- [调色板]
-
-
- file
- emoji_103.png
- id
- emoticon_emoji_103
- tag
- [电影]
-
-
- file
- emoji_104.png
- id
- emoticon_emoji_104
- tag
- [麦克风]
-
-
- file
- emoji_105.png
- id
- emoticon_emoji_105
- tag
- [耳机]
-
-
- file
- emoji_106.png
- id
- emoticon_emoji_106
- tag
- [音乐]
-
-
- file
- emoji_107.png
- id
- emoticon_emoji_107
- tag
- [吉他]
-
-
- file
- emoji_108.png
- id
- emoticon_emoji_108
- tag
- [火箭]
-
-
- file
- emoji_109.png
- id
- emoticon_emoji_109
- tag
- [飞机]
-
-
- file
- emoji_110.png
- id
- emoticon_emoji_110
- tag
- [火车]
-
-
- file
- emoji_111.png
- id
- emoticon_emoji_111
- tag
- [公交]
-
-
- file
- emoji_112.png
- id
- emoticon_emoji_112
- tag
- [轿车]
-
-
- file
- emoji_113.png
- id
- emoticon_emoji_113
- tag
- [出租车]
-
-
- file
- emoji_114.png
- id
- emoticon_emoji_114
- tag
- [警车]
-
-
- file
- emoji_115.png
- id
- emoticon_emoji_115
- tag
- [自行车]
-
-
- id
- emoticon_emoji_1001
- tag
- [快捷表情1]
-
-
- info
-
- id
- default
- normal
- emoj_s_normal.png
- pressed
- emoj_s_pressed.png
- title
- emoji
-
-
-
-
diff --git a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji.xml b/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji.xml
deleted file mode 100644
index 55b87daa..00000000
--- a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_cn.plist b/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_cn.plist
index 9321af33..5dc7b136 100644
--- a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_cn.plist
+++ b/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_cn.plist
@@ -459,7 +459,7 @@
id
emoticon_emoji_56
tag
- [不要]
+ [举着]
file
@@ -525,6 +525,38 @@
tag
[睡觉]
+
+ file
+ emoji_65.png
+ id
+ emoticon_emoji_65
+ tag
+ [筋斗云]
+
+
+ file
+ emoji_66.png
+ id
+ emoticon_emoji_66
+ tag
+ [火箭]
+
+
+ file
+ emoji_67.png
+ id
+ emoticon_emoji_67
+ tag
+ [救护车]
+
+
+ file
+ emoji_68.png
+ id
+ emoticon_emoji_68
+ tag
+ [便便]
+
info
diff --git a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_en.plist b/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_en.plist
index 79c2625f..3fd28da7 100644
--- a/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_en.plist
+++ b/NEChatUIKit/NEChatUIKit/Assets/NIMKitEmoticon.bundle/Emoji/emoji_ios_en.plist
@@ -525,6 +525,38 @@
tag
[Sleep]
+
+ file
+ emoji_65.png
+ id
+ emoticon_emoji_65
+ tag
+ [Cloud]
+
+
+ file
+ emoji_66.png
+ id
+ emoticon_emoji_66
+ tag
+ [Rocket]
+
+
+ file
+ emoji_67.png
+ id
+ emoticon_emoji_67
+ tag
+ [Ambulance]
+
+
+ file
+ emoji_68.png
+ id
+ emoticon_emoji_68
+ tag
+ [Poop]
+
info
diff --git a/NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift b/NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift
index 2475e90b..61316294 100644
--- a/NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift
+++ b/NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift
@@ -1451,12 +1451,20 @@ extension ChatViewController: ChatBaseCellDelegate {
viewmodel.downLoad(urlString, path) { progress in
NELog.infoLog(ModuleName + " " + self.tag, desc: "CALLBACK downLoad ")
- let trueProgress = -progress / Float(object.fileLength)
- videoModel.progress = trueProgress
- if trueProgress >= 1.0 {
+
+ videoModel.progress = progress
+ if progress >= 1.0 {
videoModel.state = .Success
}
- videoModel.cell?.uploadProgress(trueProgress)
+ videoModel.cell?.uploadProgress(progress)
+
+ // SDK返回异常导致
+// let trueProgress = -progress / Float(object.fileLength)
+// videoModel.progress = trueProgress
+// if trueProgress >= 1.0 {
+// videoModel.state = .Success
+// }
+// videoModel.cell?.uploadProgress(trueProgress)
} _: { error in
if let err = error as NSError? {
weakSelf?.showToast(err.localizedDescription)
diff --git a/NEContactUIKit/NEContactUIKit.podspec b/NEContactUIKit/NEContactUIKit.podspec
index bcc27a87..b13abf6b 100644
--- a/NEContactUIKit/NEContactUIKit.podspec
+++ b/NEContactUIKit/NEContactUIKit.podspec
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'NEContactUIKit'
- s.version = '9.2.10'
+ s.version = '9.2.11'
s.summary = 'Netease XKit'
# This description is used to generate tags and improve search results.
diff --git a/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithDetailTextCell.swift b/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithDetailTextCell.swift
index 5a58afe4..3286b9b8 100644
--- a/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithDetailTextCell.swift
+++ b/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithDetailTextCell.swift
@@ -5,7 +5,7 @@
import UIKit
@objcMembers
-public class TextWithDetailTextCell: TextBaseCell {
+public class TextWithDetailTextCell: ContactBaseTextCell {
public var detailTitleLabel = UILabel()
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
diff --git a/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithSwitchCell.swift b/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithSwitchCell.swift
index 1f1720f7..ae188ee3 100644
--- a/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithSwitchCell.swift
+++ b/NEContactUIKit/NEContactUIKit/Classes/UserInfo/Views/TextWithSwitchCell.swift
@@ -7,7 +7,7 @@ import UIKit
public typealias ValueChangeBlock = (_ title: String?, _ value: Bool) -> Void
@objcMembers
-public class TextWithSwitchCell: TextBaseCell {
+public class TextWithSwitchCell: ContactBaseTextCell {
public var block: ValueChangeBlock?
public var switchButton = UISwitch()
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
diff --git a/NEConversationUIKit/NEConversationUIKit.podspec b/NEConversationUIKit/NEConversationUIKit.podspec
index f9e79e2d..906f395a 100644
--- a/NEConversationUIKit/NEConversationUIKit.podspec
+++ b/NEConversationUIKit/NEConversationUIKit.podspec
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'NEConversationUIKit'
- s.version = '9.2.10'
+ s.version = '9.2.11'
s.summary = 'Netease XKit'
# This description is used to generate tags and improve search results.
@@ -41,5 +41,5 @@ TODO: Add long description of the pod here.
s.dependency 'NECommonUIKit'
s.dependency 'NEConversationKit'
s.dependency 'YXAlog_iOS'
- s.dependency 'NIMSDK_LITE', '9.2.5'
+ s.dependency 'NIMSDK_LITE'
end
diff --git a/NEQChatUIKit/NEQChatUIKit.podspec b/NEQChatUIKit/NEQChatUIKit.podspec
index 632fb5e9..5a5682a7 100644
--- a/NEQChatUIKit/NEQChatUIKit.podspec
+++ b/NEQChatUIKit/NEQChatUIKit.podspec
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'NEQChatUIKit'
- s.version = '9.2.10'
+ s.version = '9.2.11'
s.summary = 'Netease XKit'
# This description is used to generate tags and improve search results.
@@ -34,16 +34,16 @@ TODO: Add long description of the pod here.
s.source_files = 'NEQChatUIKit/Classes/**/*'
- s.resource_bundles = {
- 'NEQChatUIKit' => ['NEQChatUIKit/Assets/*.png']
- }
+# s.resource_bundles = {
+# 'NEQChatUIKit' => ['NEQChatUIKit/Assets/*.png']
+# }
s.resource = 'NEQChatUIKit/Assets/**/*'
s.dependency 'NECommonUIKit'
s.dependency 'NEQChatKit'
s.dependency 'SDWebImageWebPCoder'
s.dependency 'SDWebImageSVGKitPlugin'
s.dependency 'MJRefresh'
- s.dependency 'NIMSDK_LITE', '9.2.5'
+ s.dependency 'NIMSDK_LITE'
s.dependency 'YXAlog_iOS'
end
diff --git a/NETeamUIKit/NETeamUIKit.podspec b/NETeamUIKit/NETeamUIKit.podspec
index b4523e46..d47818a2 100644
--- a/NETeamUIKit/NETeamUIKit.podspec
+++ b/NETeamUIKit/NETeamUIKit.podspec
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'NETeamUIKit'
- s.version = '9.2.10'
+ s.version = '9.2.11'
s.summary = 'Netease XKit'
# This description is used to generate tags and improve search results.
@@ -44,7 +44,7 @@ TODO: Add long description of the pod here.
# s.frameworks = 'UIKit', 'MapKit'
s.dependency 'NECommonUIKit'
s.dependency 'NETeamKit'
- s.dependency 'NIMSDK_LITE', '9.2.5'
+ s.dependency 'NIMSDK_LITE'
s.dependency 'YXAlog_iOS'
end
diff --git a/NETeamUIKit/NETeamUIKit/Classes/Setting/TeamNameViewController.swift b/NETeamUIKit/NETeamUIKit/Classes/Setting/TeamNameViewController.swift
index 093436b4..9ab5aa0d 100644
--- a/NETeamUIKit/NETeamUIKit/Classes/Setting/TeamNameViewController.swift
+++ b/NETeamUIKit/NETeamUIKit/Classes/Setting/TeamNameViewController.swift
@@ -194,11 +194,10 @@ public class TeamNameViewController: NEBaseViewController, UITextFieldDelegate {
weakSelf?.navigationController?.popViewController(animated: true)
}
}
- } else if type == .NickName, let tid = team?.teamId, let uid = teamMember?.userId {
+ } else if type == .NickName, let teamId = team?.teamId, let uid = teamMember?.userId {
let n = textField.text ?? ""
view.makeToastActivity(.center)
- repo.updateMemberNick(uid, n, tid) { error in
-
+ repo.updateMemberNick(teamId, uid, n) { error in
weakSelf?.view.hideToastActivity()
if let err = error {
weakSelf?.showToast(err.localizedDescription)
diff --git a/Podfile b/Podfile
index c5f2a517..4b492623 100644
--- a/Podfile
+++ b/Podfile
@@ -9,25 +9,25 @@ target 'app' do
pod 'YXLogin', '1.0.0'
#可选UI库
- pod 'NEContactUIKit', '9.2.10'
- pod 'NEQChatUIKit', '9.2.10'
- pod 'NEConversationUIKit', '9.2.10'
- pod 'NEChatUIKit', '9.2.10'
- pod 'NETeamUIKit', '9.2.10'
+ pod 'NEContactUIKit', '9.2.11'
+ pod 'NEQChatUIKit', '9.2.11'
+ pod 'NEConversationUIKit', '9.2.11'
+ pod 'NEChatUIKit', '9.2.11'
+ pod 'NETeamUIKit', '9.2.11'
#可选Kit库(和UIKit对应)
- pod 'NEContactKit', '9.2.10'
- pod 'NEQChatKit', '9.2.10'
- pod 'NEConversationKit', '9.2.10'
- pod 'NEChatKit', '9.2.10'
- pod 'NETeamKit', '9.2.10'
+ pod 'NEContactKit', '9.2.11'
+ pod 'NEQChatKit', '9.2.11'
+ pod 'NEConversationKit', '9.2.11'
+ pod 'NEChatKit', '9.2.11'
+ pod 'NETeamKit', '9.2.11'
#基础kit库
- pod 'NECommonUIKit', '9.2.10'
- pod 'NECommonKit', '9.2.10'
- pod 'NECoreIMKit', '9.2.10'
- pod 'NECoreKit', '9.2.10'
+ pod 'NECommonUIKit', '9.2.11'
+ pod 'NECommonKit', '9.2.11'
+ pod 'NECoreIMKit', '9.2.11'
+ pod 'NECoreKit', '9.2.11'
# 如果需要查看UI部分源码请注释掉以上在线依赖,打开下面的本地依赖