feat(mobile-next): 导入官方 openim-flutter-demo 固定基线 3.8.3-patch.3 并完成双构建
- 上游: github.com/OpenIMSDK/openim-flutter-demo tag 3.8.3-patch.3 commit b3dfdb1e8aaeaaf6f0793e10cadd20d5c184a31f - 并行目录 mobile-next/ 原样导入(含 LICENSE),不覆盖现网 mobile/ - 锁定 Flutter 3.24.5 / Dart 3.5.4 / JDK 17 / Gradle 7.6.3 / AGP 7.3.1 - 实测 Android debug 与 release 构建均成功(见 docs/mobile-next-baseline-import.md) - 本提交可单独回退:git revert 1db1229(重写前) Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import 'group_requests_logic.dart';
|
||||
|
||||
class GroupRequestsBinding extends Bindings {
|
||||
@override
|
||||
void dependencies() {
|
||||
Get.lazyPut(() => GroupRequestsLogic());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim/routes/app_navigator.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
|
||||
import '../../../core/controller/im_controller.dart';
|
||||
import '../../home/home_logic.dart';
|
||||
|
||||
class GroupRequestsLogic extends GetxController {
|
||||
final imLogic = Get.find<IMController>();
|
||||
final homeLogic = Get.find<HomeLogic>();
|
||||
final list = <GroupApplicationInfo>[].obs;
|
||||
final groupList = <String, GroupInfo>{}.obs;
|
||||
final memberList = <GroupMembersInfo>[].obs;
|
||||
final userInfoList = <UserInfo>[].obs;
|
||||
|
||||
@override
|
||||
void onReady() {
|
||||
getApplicationList();
|
||||
getJoinedGroup();
|
||||
super.onReady();
|
||||
}
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
imLogic.groupApplicationChangedSubject.listen((info) {
|
||||
getApplicationList();
|
||||
});
|
||||
super.onInit();
|
||||
}
|
||||
|
||||
@override
|
||||
void onClose() {
|
||||
homeLogic.getUnhandledGroupApplicationCount();
|
||||
super.onClose();
|
||||
}
|
||||
|
||||
bool isInvite(GroupApplicationInfo info) {
|
||||
if (info.joinSource == 2) {
|
||||
return info.inviterUserID != null && info.inviterUserID!.isNotEmpty;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
getApplicationList() async {
|
||||
final list = await LoadingView.singleton.wrap(asyncFunction: () async {
|
||||
final list = await Future.wait([
|
||||
OpenIM.iMManager.groupManager.getGroupApplicationListAsRecipient(),
|
||||
OpenIM.iMManager.groupManager.getGroupApplicationListAsApplicant(),
|
||||
]);
|
||||
|
||||
final allList = <GroupApplicationInfo>[];
|
||||
allList
|
||||
..addAll(list[0])
|
||||
..addAll(list[1]);
|
||||
|
||||
allList.sort((a, b) {
|
||||
if (a.reqTime! > b.reqTime!) {
|
||||
return -1;
|
||||
} else if (a.reqTime! < b.reqTime!) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
|
||||
var map = <String, List<String>>{};
|
||||
var inviterList = <String>[];
|
||||
|
||||
var haveReadList = DataSp.getHaveReadUnHandleGroupApplication();
|
||||
haveReadList ??= <String>[];
|
||||
for (var a in list[0]) {
|
||||
var id = IMUtils.buildGroupApplicationID(a);
|
||||
if (!haveReadList.contains(id)) {
|
||||
haveReadList.add(id);
|
||||
}
|
||||
}
|
||||
DataSp.putHaveReadUnHandleGroupApplication(haveReadList);
|
||||
|
||||
var groupIDList = <String>[];
|
||||
|
||||
for (var a in allList) {
|
||||
if (isInvite(a)) {
|
||||
if (!map.containsKey(a.groupID)) {
|
||||
map[a.groupID!] = [a.inviterUserID!];
|
||||
} else {
|
||||
if (!map[a.groupID!]!.contains(a.inviterUserID!)) {
|
||||
map[a.groupID!]!.add(a.inviterUserID!);
|
||||
}
|
||||
}
|
||||
if (!inviterList.contains(a.inviterUserID!)) {
|
||||
inviterList.add(a.inviterUserID!);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (map.isNotEmpty) {
|
||||
await Future.wait(map.entries.map((e) => OpenIM.iMManager.groupManager
|
||||
.getGroupMembersInfo(groupID: e.key, userIDList: e.value)
|
||||
.then((list) => memberList.assignAll(list))));
|
||||
}
|
||||
|
||||
if (inviterList.isNotEmpty) {
|
||||
await OpenIM.iMManager.userManager
|
||||
.getUsersInfo(userIDList: inviterList)
|
||||
.then((list) => userInfoList.assignAll(list.map((e) => e.simpleUserInfo).toList()));
|
||||
}
|
||||
|
||||
return allList;
|
||||
});
|
||||
|
||||
this.list.assignAll(list);
|
||||
}
|
||||
|
||||
void getJoinedGroup() {
|
||||
OpenIM.iMManager.groupManager.getJoinedGroupList().then((list) {
|
||||
var map = <String, GroupInfo>{};
|
||||
for (var e in list) {
|
||||
map[e.groupID] = e;
|
||||
}
|
||||
groupList.addAll(map);
|
||||
});
|
||||
}
|
||||
|
||||
String getGroupName(GroupApplicationInfo info) => info.groupName ?? groupList[info.groupID]?.groupName ?? '';
|
||||
|
||||
String getInviterNickname(GroupApplicationInfo info) =>
|
||||
(getMemberInfo(info.inviterUserID!)?.nickname) ?? (getUserInfo(info.inviterUserID!)?.nickname) ?? '-';
|
||||
|
||||
GroupMembersInfo? getMemberInfo(inviterUserID) => memberList.firstWhereOrNull((e) => e.userID == inviterUserID);
|
||||
|
||||
UserInfo? getUserInfo(inviterUserID) => userInfoList.firstWhereOrNull((e) => e.userID == inviterUserID);
|
||||
|
||||
void handle(GroupApplicationInfo info) async {
|
||||
var result = await AppNavigator.startProcessGroupRequests(applicationInfo: info);
|
||||
if (result is int) {
|
||||
info.handleResult = result;
|
||||
list.refresh();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
import 'package:sprintf/sprintf.dart';
|
||||
|
||||
import 'group_requests_logic.dart';
|
||||
|
||||
class GroupRequestsPage extends StatelessWidget {
|
||||
final logic = Get.find<GroupRequestsLogic>();
|
||||
|
||||
GroupRequestsPage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: TitleBar.back(title: StrRes.newGroupRequest),
|
||||
backgroundColor: Styles.c_F8F9FA,
|
||||
body: Obx(() => ListView.builder(
|
||||
padding: EdgeInsets.only(top: 10.h),
|
||||
itemCount: logic.list.length,
|
||||
itemBuilder: (_, index) => _buildItemView(logic.list[index]),
|
||||
)),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildItemView(GroupApplicationInfo info) {
|
||||
final isISendRequest = info.userID == OpenIM.iMManager.userID;
|
||||
return Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 10.h),
|
||||
decoration: BoxDecoration(
|
||||
color: Styles.c_FFFFFF,
|
||||
border: BorderDirectional(
|
||||
bottom: BorderSide(color: Styles.c_F8F9FA, width: 1.h),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
AvatarView(
|
||||
url: info.userFaceURL,
|
||||
text: info.nickname,
|
||||
),
|
||||
10.horizontalSpace,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
(info.nickname ?? '').toText
|
||||
..style = Styles.ts_0C1C33_17sp
|
||||
..maxLines = 1
|
||||
..overflow = TextOverflow.ellipsis,
|
||||
4.verticalSpace,
|
||||
if (!logic.isInvite(info))
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
text: StrRes.applyJoin,
|
||||
style: Styles.ts_8E9AB0_14sp,
|
||||
children: [
|
||||
WidgetSpan(child: 2.horizontalSpace),
|
||||
TextSpan(
|
||||
text: logic.getGroupName(info),
|
||||
style: Styles.ts_0089FF_14sp,
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
else
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
text: logic.getInviterNickname(info),
|
||||
style: Styles.ts_0089FF_14sp,
|
||||
children: [
|
||||
WidgetSpan(child: 2.horizontalSpace),
|
||||
TextSpan(
|
||||
text: StrRes.invite,
|
||||
style: Styles.ts_8E9AB0_14sp,
|
||||
),
|
||||
WidgetSpan(child: 2.horizontalSpace),
|
||||
TextSpan(
|
||||
text: info.nickname,
|
||||
style: Styles.ts_0089FF_14sp,
|
||||
),
|
||||
WidgetSpan(child: 2.horizontalSpace),
|
||||
TextSpan(
|
||||
text: StrRes.joinIn,
|
||||
style: Styles.ts_8E9AB0_14sp,
|
||||
),
|
||||
WidgetSpan(child: 2.horizontalSpace),
|
||||
TextSpan(
|
||||
text: logic.getGroupName(info),
|
||||
style: Styles.ts_0089FF_14sp,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (null != IMUtils.emptyStrToNull(info.reqMsg))
|
||||
Padding(
|
||||
padding: EdgeInsets.only(top: 4.h),
|
||||
child: sprintf(StrRes.applyReason, [info.reqMsg!]).toText
|
||||
..style = Styles.ts_8E9AB0_14sp
|
||||
..maxLines = 1
|
||||
..overflow = TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
if (/*info.handleResult == 0 && */ isISendRequest)
|
||||
ImageRes.sendRequests.toImage
|
||||
..width = 20.w
|
||||
..height = 20.h,
|
||||
if (info.handleResult == 0 && !isISendRequest)
|
||||
Button(
|
||||
text: StrRes.lookOver,
|
||||
textStyle: Styles.ts_FFFFFF_14sp,
|
||||
height: 28.h,
|
||||
padding: EdgeInsets.symmetric(horizontal: 13.w),
|
||||
onTap: () => logic.handle(info),
|
||||
),
|
||||
if (info.handleResult == 0 && isISendRequest)
|
||||
StrRes.waitingForVerification.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
if (info.handleResult == -1) StrRes.rejected.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
if (info.handleResult == 1) StrRes.approved.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import 'process_group_requests_logic.dart';
|
||||
|
||||
class ProcessGroupRequestsBinding extends Bindings {
|
||||
@override
|
||||
void dependencies() {
|
||||
Get.lazyPut(() => ProcessGroupRequestsLogic());
|
||||
}
|
||||
}
|
||||
+71
@@ -0,0 +1,71 @@
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
|
||||
import '../group_requests_logic.dart';
|
||||
|
||||
class ProcessGroupRequestsLogic extends GetxController {
|
||||
final groupRequestsLogic = Get.find<GroupRequestsLogic>();
|
||||
late GroupApplicationInfo applicationInfo;
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
applicationInfo = Get.arguments['applicationInfo'];
|
||||
super.onInit();
|
||||
}
|
||||
|
||||
bool get isInvite => groupRequestsLogic.isInvite(applicationInfo);
|
||||
|
||||
String get groupName => groupRequestsLogic.getGroupName(applicationInfo);
|
||||
|
||||
String get inviterNickname => groupRequestsLogic.getInviterNickname(applicationInfo);
|
||||
|
||||
GroupMembersInfo? getMemberInfo(inviterUserID) => groupRequestsLogic.getMemberInfo(inviterUserID);
|
||||
|
||||
UserInfo? getUserInfo(inviterUserID) => groupRequestsLogic.getUserInfo(inviterUserID);
|
||||
|
||||
String get sourceFrom {
|
||||
if (applicationInfo.joinSource == 2) {
|
||||
return '$inviterNickname${StrRes.byMemberInvite}';
|
||||
} else if (applicationInfo.joinSource == 4) {
|
||||
return StrRes.byScanQrcode;
|
||||
}
|
||||
return StrRes.bySearch;
|
||||
}
|
||||
|
||||
void approve() {
|
||||
LoadingView.singleton
|
||||
.wrap(
|
||||
asyncFunction: () => OpenIM.iMManager.groupManager.acceptGroupApplication(
|
||||
groupID: applicationInfo.groupID!,
|
||||
userID: applicationInfo.userID!,
|
||||
handleMsg: "reason",
|
||||
))
|
||||
.then((value) => Get.back(result: 1))
|
||||
.catchError(_parse);
|
||||
}
|
||||
|
||||
void reject() {
|
||||
LoadingView.singleton
|
||||
.wrap(
|
||||
asyncFunction: () => OpenIM.iMManager.groupManager.refuseGroupApplication(
|
||||
groupID: applicationInfo.groupID!,
|
||||
userID: applicationInfo.userID!,
|
||||
handleMsg: "reason",
|
||||
))
|
||||
.then((value) => Get.back(result: -1))
|
||||
.catchError(_parse)
|
||||
.catchError((_) => IMViews.showToast(StrRes.rejectFailed));
|
||||
}
|
||||
|
||||
_parse(e) {
|
||||
if (e is PlatformException) {
|
||||
if (e.code == '${SDKErrorCode.groupApplicationHasBeenProcessed}') {
|
||||
IMViews.showToast(StrRes.groupRequestHandled);
|
||||
return;
|
||||
}
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
+127
@@ -0,0 +1,127 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
import 'package:sprintf/sprintf.dart';
|
||||
|
||||
import 'process_group_requests_logic.dart';
|
||||
|
||||
class ProcessGroupRequestsPage extends StatelessWidget {
|
||||
final logic = Get.find<ProcessGroupRequestsLogic>();
|
||||
|
||||
ProcessGroupRequestsPage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: TitleBar.back(title: StrRes.newGroup),
|
||||
backgroundColor: Styles.c_F8F9FA,
|
||||
body: Container(
|
||||
color: Styles.c_FFFFFF,
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 16.w,
|
||||
vertical: 16.h,
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
AvatarView(
|
||||
width: 48.w,
|
||||
height: 48.h,
|
||||
url: logic.applicationInfo.userFaceURL,
|
||||
text: logic.applicationInfo.nickname,
|
||||
),
|
||||
10.horizontalSpace,
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
(logic.applicationInfo.nickname ?? '').toText..style = Styles.ts_0C1C33_17sp,
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
text: StrRes.applyJoin,
|
||||
style: Styles.ts_8E9AB0_14sp,
|
||||
children: [
|
||||
WidgetSpan(child: 2.horizontalSpace),
|
||||
TextSpan(
|
||||
text: logic.groupName,
|
||||
style: Styles.ts_0089FF_14sp,
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
12.verticalSpace,
|
||||
if (IMUtils.isNotNullEmptyStr(logic.applicationInfo.reqMsg))
|
||||
Container(
|
||||
height: 80.h,
|
||||
width: 343.w,
|
||||
margin: EdgeInsets.only(bottom: 12.h),
|
||||
decoration: BoxDecoration(
|
||||
color: Styles.c_E8EAEF_opacity50,
|
||||
borderRadius: BorderRadius.circular(6.r),
|
||||
),
|
||||
child: SingleChildScrollView(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 16.w,
|
||||
vertical: 8.h,
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
(logic.applicationInfo.reqMsg ?? '').toText..style = Styles.ts_0C1C33_17sp,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
sprintf(StrRes.sourceFrom, [logic.sourceFrom]).toText..style = Styles.ts_8E9AB0_14sp
|
||||
],
|
||||
),
|
||||
12.verticalSpace,
|
||||
Row(
|
||||
children: [
|
||||
Flexible(child: _buildRejectButton()),
|
||||
12.horizontalSpace,
|
||||
Flexible(
|
||||
child: Button(
|
||||
onTap: logic.approve,
|
||||
text: StrRes.accept,
|
||||
textStyle: Styles.ts_FFFFFF_17sp,
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildRejectButton() => Material(
|
||||
child: Ink(
|
||||
height: 44.h,
|
||||
decoration: BoxDecoration(
|
||||
color: Styles.c_FFFFFF,
|
||||
border: Border.all(
|
||||
color: Styles.c_E8EAEF,
|
||||
width: 1,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(6.r),
|
||||
),
|
||||
child: InkWell(
|
||||
onTap: logic.reject,
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
child: StrRes.reject.toText..style = Styles.ts_0C1C33_17sp,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user