diff --git a/OpenIM-SDK/libs/v3.3.1-rc.8-e-v1.1.3.aar b/OpenIM-SDK/libs/v3.3.1-rc.8-e-v1.1.3.aar new file mode 100644 index 0000000..4fa17ad Binary files /dev/null and b/OpenIM-SDK/libs/v3.3.1-rc.8-e-v1.1.3.aar differ diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java index 4f04c4d..a9ebe4b 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java @@ -220,8 +220,8 @@ public void uploadFile(OnBase base, OnPutFileListener listener, * * @param fcmToken token */ - public void updateFcmToken(OnBase base, String fcmToken) { - Open_im_sdk.updateFcmToken(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), fcmToken); + public void updateFcmToken(OnBase base, String fcmToken,long expireTime) { + Open_im_sdk.updateFcmToken(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), fcmToken,expireTime); } public void setOnListenerForService(OnListenerForService listener) { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java index da87291..8643ec1 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java @@ -172,13 +172,6 @@ public void deleteConversationAndDeleteAllMsg(OnBase base, String conver Open_im_sdk.deleteConversationAndDeleteAllMsg(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), conversionID); } - /*** - * 从本地删除所有会话 - * */ - public void deleteAllConversationFromLocal(OnBase base) { - Open_im_sdk.deleteAllConversationFromLocal(BaseImpl.stringBase(base), ParamsUtil.buildOperationID()); - } - /** * 清除@消息标志位 * diff --git a/app/build.gradle b/app/build.gradle index 1381d15..d723adb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,12 @@ plugins { } android { - compileSdkVersion 32 + compileSdkVersion 33 defaultConfig { applicationId "io.openim.example" minSdkVersion 21 - targetSdkVersion 32 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -32,11 +32,10 @@ android { dependencies { // implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.navigation:navigation-fragment:2.3.5' implementation 'androidx.navigation:navigation-ui:2.3.5' + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' diff --git a/build.gradle b/build.gradle index 94791df..bdab0fc 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.2" + classpath "com.android.tools.build:gradle:7.0.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files