Skip to content

Commit 0dfa736

Browse files
committed
6.6beta1:升了最新AS和AGP版本支持
1 parent 98d2b82 commit 0dfa736

18 files changed

Lines changed: 95 additions & 18 deletions

File tree

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/.idea/misc.xml

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/.idea/runConfigurations.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/app/build.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ android {
2727
sourceCompatibility JavaVersion.VERSION_1_8
2828
targetCompatibility JavaVersion.VERSION_1_8
2929
}
30+
31+
// 以下配置解决Netty从4.1.50升级至4.1.107时gradle编译报的错"34 files found with path 'META-INF/INDEX.LIST' from inputs:"
32+
packagingOptions {
33+
exclude'META-INF/INDEX.LIST'
34+
exclude'META-INF/io.netty.versions.properties'
35+
}
36+
3037
namespace 'net.x52im.mobileimsdk.android.demo'
3138
}
3239

@@ -39,8 +46,8 @@ dependencies {
3946

4047
// MobileIMSDK的依赖库
4148
implementation 'com.google.code.gson:gson:2.9.0'
42-
// implementation files('libs/netty-all-4.1.50.Final.jar')
43-
implementation group: 'io.netty', name: 'netty-all', version: '4.1.50.Final'
49+
// implementation group: 'io.netty', name: 'netty-all', version: '4.1.50.Final'
50+
implementation 'io.netty:netty-all:4.1.107.Final'
4451

4552
// MobileIMSDK的SDK库
4653
implementation files('libs/MobileIMSDKServer_META.jar')

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/app/src/main/java/net/x52im/mobileimsdk/android/demo/LoginActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void doLogin() {
160160
String serverPort = editServerPort.getText().toString();
161161
if (!(serverIP.trim().length() <= 0) && !(serverPort.trim().length() <= 0)) {
162162
// 无条件重置socket,防止首次登陆时用了错误的ip或域名,下次登陆时sendData中仍然使用老的ip
163-
// 说明:本行代码建议仅用于Demo时,生产环境下是没有意义的,因为你的APP里不可能连IP都搞错了
163+
// 说明:本行代码建议仅用于Demo时,生产环境下是没有意义的,因为你的APP里不可能还允许让用户自已填写IP
164164
LocalSocketProvider.getInstance().closeLocalSocket();
165165

166166
ConfigEntity.serverIP = serverIP.trim();
@@ -197,8 +197,7 @@ private void doLoginImpl() {
197197
// 异步提交登陆id和token
198198
new LocalDataSender.SendLoginDataAsync(new PLoginInfo(loginName, loginToken)) {
199199
/**
200-
* 登陆信息发送完成后将调用本方法(注意:此处仅是登陆信息发送完成
201-
* ,真正的登陆结果要在异步回调中处理哦)。
200+
* 登陆信息发送完成后将调用本方法(注意:此处仅是登陆信息发送完成,真正的登陆结果要在异步回调中处理哦)。
202201
*
203202
* @param code 数据发送返回码,0 表示数据成功发出,否则是错误码
204203
*/

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
jcenter()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:8.1.1'
12+
classpath 'com.android.tools.build:gradle:8.7.2'
1313

1414

1515
// NOTE: Do not place your application dependencies here; they belong

demo_src/TCP_Client/MobileIMSDK4aDemo_tcp/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
6+
distributionUrl=https\://mirrors.aliyun.com/macports/distfiles/gradle//gradle-8.9-bin.zip

sdk_src/TCP_Client/MobileIMSDK4a_tcp_Open/.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)