Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9.2.12问题修复 #87

Merged
merged 2 commits into from
Dec 8, 2022
Merged

9.2.12问题修复 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc92e3
fix(imkit):问题修复
shuine Dec 8, 2022
6ab65bf
fix(imkit):更新依赖库版本
shuine Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ dependencies {
// implementation(project(":teamkit-ui"))
// implementation(project(":chatkit-ui"))
// implementation(project(":searchkit-ui"))
implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.2.12-rc01")
implementation("com.netease.yunxin.kit.qchat:qchatkit-ui:9.2.12-rc01")
implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.2.12-rc01")
implementation("com.netease.yunxin.kit.team:teamkit-ui:9.2.12-rc01")
implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.2.12-rc01")
implementation("com.netease.yunxin.kit.search:searchkit-ui:9.2.12-rc01")
implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.2.12-rc02")
implementation("com.netease.yunxin.kit.qchat:qchatkit-ui:9.2.12-rc02")
implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.2.12-rc02")
implementation("com.netease.yunxin.kit.team:teamkit-ui:9.2.12-rc02")
implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.2.12-rc02")
implementation("com.netease.yunxin.kit.search:searchkit-ui:9.2.12-rc02")
implementation("com.airbnb.android:lottie:5.0.3")
implementation("com.github.bumptech.glide:glide:4.13.1")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
Expand Down
4 changes: 2 additions & 2 deletions chatkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.chat:chatkit:9.2.12-rc01")
api("com.netease.yunxin.kit.common:common-ui:1.1.10")
api("com.netease.yunxin.kit.chat:chatkit:9.2.12-rc02")
api("com.netease.yunxin.kit.common:common-ui:1.1.12")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("androidx.appcompat:appcompat:1.4.2")
implementation("com.google.android.material:material:1.5.0")
Expand Down
8 changes: 7 additions & 1 deletion .../main/java/com/netease/yunxin/kit/chatkit/ui/view/message/adapter/ChatMessageAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,14 @@ private void removeSameMessage(List<ChatMessageBean> message) {

public void appendMessage(ChatMessageBean message) {
int pos = messageList.size();
int deletePos = getMessageIndex(message);
messageList.add(message);
notifyItemInserted(pos);
if (deletePos >= 0) {
messageList.remove(deletePos);
notifyItemRangeChanged(deletePos, pos - deletePos);
} else {
notifyItemInserted(pos);
}
}

public void clearMessageList() {
Expand Down
4 changes: 2 additions & 2 deletions contactkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.contact:contactkit:9.2.12-rc01")
api("com.netease.yunxin.kit.common:common-ui:1.1.10")
api("com.netease.yunxin.kit.contact:contactkit:9.2.12-rc02")
api("com.netease.yunxin.kit.common:common-ui:1.1.12")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("androidx.appcompat:appcompat:1.4.2")
implementation("com.google.android.material:material:1.5.0")
Expand Down
4 changes: 2 additions & 2 deletions conversationkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.conversation:conversationkit:9.2.12-rc01")
api("com.netease.yunxin.kit.common:common-ui:1.1.10")
api("com.netease.yunxin.kit.conversation:conversationkit:9.2.12-rc02")
api("com.netease.yunxin.kit.common:common-ui:1.1.12")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("androidx.appcompat:appcompat:1.4.2")
implementation("com.google.android.material:material:1.5.0")
Expand Down
4 changes: 2 additions & 2 deletions qchatkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.qchat:qchatkit:9.2.12-rc01")
api("com.netease.yunxin.kit.common:common-ui:1.1.10")
api("com.netease.yunxin.kit.qchat:qchatkit:9.2.12-rc02")
api("com.netease.yunxin.kit.common:common-ui:1.1.12")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("androidx.appcompat:appcompat:1.4.2")
implementation("com.google.android.material:material:1.5.0")
Expand Down
4 changes: 2 additions & 2 deletions searchkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.search:searchkit:9.2.12-rc01")
api("com.netease.yunxin.kit.common:common-ui:1.1.10")
api("com.netease.yunxin.kit.search:searchkit:9.2.12-rc02")
api("com.netease.yunxin.kit.common:common-ui:1.1.12")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("androidx.appcompat:appcompat:1.4.2")
implementation("com.google.android.material:material:1.5.0")
Expand Down
4 changes: 2 additions & 2 deletions teamkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.team:teamkit:9.2.12-rc01")
api("com.netease.yunxin.kit.common:common-ui:1.1.10")
api("com.netease.yunxin.kit.team:teamkit:9.2.12-rc02")
api("com.netease.yunxin.kit.common:common-ui:1.1.12")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("androidx.appcompat:appcompat:1.4.2")
implementation("com.google.android.material:material:1.5.0")
Expand Down