diff --git a/android/build.gradle b/android/build.gradle index 1683426..01eeda3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,35 +3,25 @@ version '1.0' buildscript { repositories { - maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } - maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' } - maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' } - maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' } maven { allowInsecureProtocol = true url 'http://47.112.160.66:8081/repository/maven-releases' } -// maven { url 'https://127.0.0.1:8081/repository/maven-releases' } google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.5.4' } } rootProject.allprojects { repositories { - maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } - maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' } - maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' } - maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' } maven { allowInsecureProtocol = true url 'http://47.112.160.66:8081/repository/maven-releases' } -// maven { url 'http://127.0.0.1:8081/repository/maven-releases' } google() mavenCentral() } diff --git a/lib/flutter_openim_sdk.dart b/lib/flutter_openim_sdk.dart index 88c381f..f11e81b 100644 --- a/lib/flutter_openim_sdk.dart +++ b/lib/flutter_openim_sdk.dart @@ -25,7 +25,6 @@ export 'src/manager/im_manager.dart'; export 'src/manager/im_message_manager.dart'; export 'src/manager/im_offline_push_manager.dart'; export 'src/manager/im_signaling_manager.dart'; -export 'src/manager/v2/im_message_manager_v2.dart'; export 'src/models/conversation_info.dart'; export 'src/models/group_info.dart'; export 'src/models/message.dart'; diff --git a/lib/src/manager/im_conversation_manager.dart b/lib/src/manager/im_conversation_manager.dart index f736742..4ddd1de 100644 --- a/lib/src/manager/im_conversation_manager.dart +++ b/lib/src/manager/im_conversation_manager.dart @@ -8,7 +8,6 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; class ConversationManager { MethodChannel _channel; late ConversationListener conversationListener; - var count = 0; ConversationManager(this._channel); diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index 80527ae..7a1a183 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -329,10 +329,10 @@ class IMManager { _channel.invokeMethod('getLoginStatus', _buildParam({})); /// Current user id - Future getLoginUid() => Future.value(uid); + Future getLoginUid() async => uid; /// Current user info - Future getLoginUserInfo() => Future.value(uInfo); + Future getLoginUserInfo() async => uInfo; /// Modify current user info Future setSelfInfo( diff --git a/lib/src/manager/v2/im_message_manager_v2.dart b/lib/src/manager/v2/im_message_manager_v2.dart deleted file mode 100644 index d40f6b5..0000000 --- a/lib/src/manager/v2/im_message_manager_v2.dart +++ /dev/null @@ -1,123 +0,0 @@ -import 'dart:convert'; -import 'dart:io'; - -import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; - -extension MessageManagerV2 on MessageManager { - Message createTextMessageV2({required String text}) { - return _createMessage(contentType: MessageType.text)..content = text; - } - - Message createTextAtMessageV2({ - required String text, - required List atUidList, - }) { - var atElem = AtElem( - text: text, - atUserList: atUidList, - isAtSelf: false, - ); - return _createMessage(contentType: MessageType.at_text) - ..forceList = atUidList - ..atElem = atElem - ..content = jsonEncode(atElem); - } - - Message createImageMessageV2({ - required String imagePath, - required String mineType, - required int size, - required int width, - required int height, - }) { - return _createMessage(contentType: MessageType.picture) - ..pictureElem = PictureElem( - sourcePath: imagePath, - sourcePicture: PictureInfo( - type: mineType, - size: size, - width: width, - height: height, - ), - ); - } - - Message createSoundMessageV2({ - required String soundPath, - required int duration, - required int dataSize, - }) { - return _createMessage(contentType: MessageType.voice) - ..soundElem = SoundElem( - soundPath: soundPath, - dataSize: dataSize, - duration: duration, - ); - } - - Message createVideoMessageV2({ - required String videoPath, - required String videoType, - required int videoSize, - required int duration, - required String snapshotPath, - required int snapshotSize, - required int snapshotWidth, - required int snapshotHeight, - }) { - return _createMessage(contentType: MessageType.video) - ..videoElem = VideoElem( - videoPath: videoPath, - videoSize: videoSize, - videoType: videoType, - duration: duration, - snapshotPath: snapshotPath, - snapshotSize: snapshotSize, - snapshotHeight: snapshotHeight, - snapshotWidth: snapshotWidth, - ); - } - - Message createFileMessageV2({ - required String filePath, - required String fileName, - required int fileSize, - }) { - return _createMessage(contentType: MessageType.file) - ..fileElem = FileElem( - fileName: fileName, - filePath: filePath, - fileSize: fileSize, - ); - } - -/* Message createMergerMessageV2({ - required List messageList, - required String title, - required List summaryList, - }) { - var message = _createMessage(contentType: MessageType.merger); - return message; - } - - Message createForwardMessageV2({required List messageList}) { - var message = _createMessage(); - return message; - }*/ - - static Message _createMessage({required contentType}) { - var now = DateTime.now(); - return Message( - clientMsgID: 'flutter_client_${now.microsecondsSinceEpoch}', - createTime: now.millisecond ~/ 1000, - sendTime: now.millisecond ~/ 1000, - // sessionType: 0,//请求为单人会话1,请求为群聊会话2 - msgFrom: 100, - contentType: contentType, - status: MessageStatus.sending, - platformID: Platform.isAndroid ? IMPlatform.android : IMPlatform.ios, - sendID: OpenIM.iMManager.uid, - senderNickName: OpenIM.iMManager.uInfo.name, - ); - } -}