Brett 1 year ago
parent 7e1969d8ad
commit 0e1473ff0f
  1. 4
      .idea/libraries/Flutter_Plugins.xml
  2. 2
      android/build.gradle
  3. 4
      android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java
  4. 2
      android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java
  5. 1
      android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java
  6. 4
      android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java
  7. 29
      example/ios/Podfile.lock
  8. 2
      example/pubspec.lock
  9. 1
      ios/Classes/Module/ConversationManager.swift
  10. 4
      ios/Classes/Module/MessageManager.swift
  11. 7
      ios/Classes/Module/UserManager.swift
  12. 2
      ios/flutter_openim_sdk.podspec
  13. 1
      lib/src/manager/im_conversation_manager.dart
  14. 4
      lib/src/manager/im_user_manager.dart
  15. 2
      lib/src/openim.dart
  16. 2
      pubspec.yaml

@ -1,6 +1,8 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType"> <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES /> <CLASSES>
<root url="file://$PROJECT_DIR$" />
</CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>

@ -52,5 +52,5 @@ android {
dependencies { dependencies {
// aar复制到libs/io/openim/core-sdk/0.0.1/ core-sdk-0.0.1.aar // aar复制到libs/io/openim/core-sdk/0.0.1/ core-sdk-0.0.1.aar
// implementation 'io.openim:core-sdk:0.0.1@aar' // implementation 'io.openim:core-sdk:0.0.1@aar'
implementation 'io.openim:core-sdk:3.3.0@aar' implementation 'io.openim:core-sdk:3.4.0@aar'
} }

@ -141,10 +141,6 @@ public class ConversationManager extends BaseManager {
} }
public void deleteAllConversationFromLocal(MethodCall methodCall, MethodChannel.Result result) { public void deleteAllConversationFromLocal(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.deleteAllConversationFromLocal(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID")
);
} }
public void resetConversationGroupAtType(MethodCall methodCall, MethodChannel.Result result) { public void resetConversationGroupAtType(MethodCall methodCall, MethodChannel.Result result) {

@ -58,7 +58,7 @@ public class IMManager extends BaseManager {
new OnBaseListener(result, methodCall), new OnBaseListener(result, methodCall),
value(methodCall, "operationID"), value(methodCall, "operationID"),
value(methodCall, "fcmToken"), value(methodCall, "fcmToken"),
value(methodCall, "expireTime") int2long(methodCall, "expireTime")
); );
} }

@ -346,6 +346,7 @@ public class MessageManager extends BaseManager {
CommonUtil.runMainThreadReturn(result, CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createImageMessageByURL( Open_im_sdk.createImageMessageByURL(
value(methodCall, "operationID"), value(methodCall, "operationID"),
value(methodCall, "sourcePath"),
jsonValue(methodCall, "sourcePicture"), jsonValue(methodCall, "sourcePicture"),
jsonValue(methodCall, "bigPicture"), jsonValue(methodCall, "bigPicture"),
jsonValue(methodCall, "snapshotPicture"))); jsonValue(methodCall, "snapshotPicture")));

@ -62,8 +62,8 @@ public class UserManager extends BaseManager {
jsonValue(methodCall, "userIDs")); jsonValue(methodCall, "userIDs"));
} }
public void getUsersInfoStranger(MethodCall methodCall, MethodChannel.Result result) { public void getUsersInfoWithCache(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getUsersInfoStranger( Open_im_sdk.getUsersInfoWithCache(
new OnBaseListener(result, methodCall), new OnBaseListener(result, methodCall),
value(methodCall, "operationID"), value(methodCall, "operationID"),
jsonValue(methodCall, "userIDs"), jsonValue(methodCall, "userIDs"),

@ -1,29 +0,0 @@
PODS:
- Flutter (1.0.0)
- flutter_openim_sdk (0.0.1):
- Flutter
- OpenIMSDKCore (= 3.0.0)
- "OpenIMSDKCore (3.0.0+1)"
DEPENDENCIES:
- Flutter (from `Flutter`)
- flutter_openim_sdk (from `.symlinks/plugins/flutter_openim_sdk/ios`)
SPEC REPOS:
trunk:
- OpenIMSDKCore
EXTERNAL SOURCES:
Flutter:
:path: Flutter
flutter_openim_sdk:
:path: ".symlinks/plugins/flutter_openim_sdk/ios"
SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_openim_sdk: 12daf3769f8bf40001970304445b6155c146b7eb
OpenIMSDKCore: 2e38a5b9be23e588b5049ebd378161cf277e41a0
PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
COCOAPODS: 1.11.2

@ -68,7 +68,7 @@ packages:
path: ".." path: ".."
relative: true relative: true
source: path source: path
version: "3.0.0" version: "3.4.0"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter

@ -96,7 +96,6 @@ public class ConversationManager: BaseServiceManager {
} }
func deleteAllConversationFromLocal(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func deleteAllConversationFromLocal(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkDeleteAllConversationFromLocal(BaseCallback(result: result), methodCall[string: "operationID"])
} }
func resetConversationGroupAtType(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func resetConversationGroupAtType(methodCall: FlutterMethodCall, result: @escaping FlutterResult){

@ -222,7 +222,7 @@ public class MessageManager: BaseServiceManager {
} }
func setAppBadge(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func setAppBadge(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkSetAppBadge(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int64: "count"]) Open_im_sdkSetAppBadge(BaseCallback(result: result), methodCall[string: "operationID"], Int32(methodCall[int64: "count"]))
} }
func sendMessageNotOss(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func sendMessageNotOss(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@ -232,7 +232,7 @@ public class MessageManager: BaseServiceManager {
} }
func createImageMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func createImageMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
callBack(result, Open_im_sdkCreateImageMessageByURL(methodCall[string: "operationID"], methodCall[jsonString: "sourcePicture"], methodCall[jsonString: "bigPicture"], methodCall[jsonString: "snapshotPicture"])) callBack(result, Open_im_sdkCreateImageMessageByURL(methodCall[string: "operationID"], methodCall[string: "sourcePath"], methodCall[jsonString: "sourcePicture"], methodCall[jsonString: "bigPicture"], methodCall[jsonString: "snapshotPicture"]))
} }
func createSoundMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func createSoundMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){

@ -13,7 +13,7 @@ public class UserManager: BaseServiceManager {
self["unsubscribeUsersStatus"] = unsubscribeUsersStatus self["unsubscribeUsersStatus"] = unsubscribeUsersStatus
self["getSubscribeUsersStatus"] = getSubscribeUsersStatus self["getSubscribeUsersStatus"] = getSubscribeUsersStatus
self["getUserStatus"] = getUserStatus self["getUserStatus"] = getUserStatus
self["getUsersInfoStranger"] = getUsersInfoStranger self["getUsersInfoWithCache"] = getUsersInfoWithCache
} }
func setUserListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func setUserListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@ -49,8 +49,9 @@ public class UserManager: BaseServiceManager {
Open_im_sdkGetUserStatus(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"]) Open_im_sdkGetUserStatus(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"])
} }
func getUsersInfoStranger(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ func getUsersInfoWithCache(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkGetUsersInfoStranger(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"], methodCall[string: "groupID"]) Open_im_sdkGetUsersInfoWithCache(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"],
methodCall[string: "groupID"])
} }
} }

@ -17,7 +17,7 @@ A new Flutter project.
s.dependency 'Flutter' s.dependency 'Flutter'
s.platform = :ios, '11.0' s.platform = :ios, '11.0'
s.dependency 'OpenIMSDKCore','3.3.0' s.dependency 'OpenIMSDKCore','3.4.0'
s.static_framework = true s.static_framework = true
# s.vendored_frameworks = 'Framework/*.framework' # s.vendored_frameworks = 'Framework/*.framework'
# Flutter.framework does not contain a i386 slice. # Flutter.framework does not contain a i386 slice.

@ -233,6 +233,7 @@ class ConversationManager {
})); }));
/// Delete All Local Conversations /// Delete All Local Conversations
@Deprecated('use hideAllConversations instead')
Future<dynamic> deleteAllConversationFromLocal({ Future<dynamic> deleteAllConversationFromLocal({
String? operationID, String? operationID,
}) => }) =>

@ -115,14 +115,14 @@ class UserManager {
.then((value) => Utils.toList(value, (map) => UserStatusInfo.fromJson(map))); .then((value) => Utils.toList(value, (map) => UserStatusInfo.fromJson(map)));
} }
Future<List<UserInfo>> getUsersInfoStranger( Future<List<UserInfo>> getUsersInfoWithCache(
List<String> userIDs, { List<String> userIDs, {
String? groupID, String? groupID,
String? operationID, String? operationID,
}) { }) {
return _channel return _channel
.invokeMethod( .invokeMethod(
'getUsersInfoStranger', 'getUsersInfoWithCache',
_buildParam({ _buildParam({
'userIDs': userIDs, 'userIDs': userIDs,
'groupID': groupID, 'groupID': groupID,

@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
class OpenIM { class OpenIM {
static const version = '3.3.0'; static const version = '3.4.0';
static const _channel = const MethodChannel('flutter_openim_sdk'); static const _channel = const MethodChannel('flutter_openim_sdk');

@ -1,6 +1,6 @@
name: flutter_openim_sdk name: flutter_openim_sdk
description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source. description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source.
version: 3.3.0 version: 3.4.0
homepage: https://www.rentsoft.cn homepage: https://www.rentsoft.cn
repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter

Loading…
Cancel
Save