Merge remote-tracking branch 'github/main' into dev_gem_s1
# Conflicts: # android/build.gradle # ios/flutter_openim_sdk.podspec
This commit is contained in:
@@ -12,3 +12,12 @@ class MessageStatus {
|
||||
/// Already deleted
|
||||
static const deleted = 4;
|
||||
}
|
||||
|
||||
enum GetHistoryViewType {
|
||||
history(0),
|
||||
search(1);
|
||||
|
||||
final int rawValue;
|
||||
|
||||
const GetHistoryViewType(this.rawValue);
|
||||
}
|
||||
|
||||
@@ -592,7 +592,7 @@ class MessageManager {
|
||||
Future<AdvancedMessage> getAdvancedHistoryMessageList({
|
||||
String? conversationID,
|
||||
Message? startMsg,
|
||||
int? lastMinSeq,
|
||||
GetHistoryViewType viewType = GetHistoryViewType.history,
|
||||
int? count,
|
||||
String? operationID,
|
||||
}) =>
|
||||
@@ -603,7 +603,7 @@ class MessageManager {
|
||||
'conversationID': conversationID ?? '',
|
||||
'startClientMsgID': startMsg?.clientMsgID ?? '',
|
||||
'count': count ?? 40,
|
||||
'lastMinSeq': lastMinSeq ?? 0,
|
||||
'viewType': viewType.rawValue,
|
||||
'operationID': Utils.checkOperationID(operationID),
|
||||
}))
|
||||
.then((value) =>
|
||||
@@ -616,7 +616,7 @@ class MessageManager {
|
||||
Future<AdvancedMessage> getAdvancedHistoryMessageListReverse({
|
||||
String? conversationID,
|
||||
Message? startMsg,
|
||||
int? lastMinSeq,
|
||||
GetHistoryViewType viewType = GetHistoryViewType.history,
|
||||
int? count,
|
||||
String? operationID,
|
||||
}) =>
|
||||
@@ -627,7 +627,7 @@ class MessageManager {
|
||||
'conversationID': conversationID ?? '',
|
||||
'startClientMsgID': startMsg?.clientMsgID ?? '',
|
||||
'count': count ?? 40,
|
||||
'lastMinSeq': lastMinSeq ?? 0,
|
||||
'viewType': viewType.rawValue,
|
||||
'operationID': Utils.checkOperationID(operationID),
|
||||
}))
|
||||
.then((value) =>
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
|
||||
class OpenIM {
|
||||
static const version = '3.8.2+1';
|
||||
static const version = '3.8.3+2';
|
||||
|
||||
static const _channel = MethodChannel('flutter_openim_sdk');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user