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 'friend_requests_logic.dart';
|
||||
|
||||
class FriendRequestsBinding extends Bindings {
|
||||
@override
|
||||
void dependencies() {
|
||||
Get.lazyPut(() => FriendRequestsLogic());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
import 'dart:async';
|
||||
|
||||
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 FriendRequestsLogic extends GetxController {
|
||||
final imLogic = Get.find<IMController>();
|
||||
final homeLogic = Get.find<HomeLogic>();
|
||||
final applicationList = <FriendApplicationInfo>[].obs;
|
||||
late StreamSubscription faSub;
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
faSub = imLogic.friendApplicationChangedSubject.listen((value) {
|
||||
_getFriendRequestsList();
|
||||
});
|
||||
super.onInit();
|
||||
}
|
||||
|
||||
@override
|
||||
void onReady() {
|
||||
_getFriendRequestsList();
|
||||
super.onReady();
|
||||
}
|
||||
|
||||
@override
|
||||
void onClose() {
|
||||
faSub.cancel();
|
||||
homeLogic.getUnhandledFriendApplicationCount();
|
||||
super.onClose();
|
||||
}
|
||||
|
||||
void _getFriendRequestsList() async {
|
||||
final list = await Future.wait([
|
||||
OpenIM.iMManager.friendshipManager.getFriendApplicationListAsRecipient(),
|
||||
OpenIM.iMManager.friendshipManager.getFriendApplicationListAsApplicant(),
|
||||
]);
|
||||
|
||||
final allList = <FriendApplicationInfo>[];
|
||||
allList
|
||||
..addAll(list[0])
|
||||
..addAll(list[1]);
|
||||
|
||||
allList.sort((a, b) {
|
||||
if (a.createTime! > b.createTime!) {
|
||||
return -1;
|
||||
} else if (a.createTime! < b.createTime!) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
|
||||
var haveReadList = DataSp.getHaveReadUnHandleFriendApplication();
|
||||
haveReadList ??= <String>[];
|
||||
for (var e in list[0]) {
|
||||
var id = IMUtils.buildFriendApplicationID(e);
|
||||
if (!haveReadList.contains(id)) {
|
||||
haveReadList.add(id);
|
||||
}
|
||||
}
|
||||
DataSp.putHaveReadUnHandleFriendApplication(haveReadList);
|
||||
applicationList.assignAll(allList);
|
||||
}
|
||||
|
||||
bool isISendRequest(FriendApplicationInfo info) => info.fromUserID == OpenIM.iMManager.userID;
|
||||
|
||||
void acceptFriendApplication(FriendApplicationInfo info) => AppNavigator.startProcessFriendRequests(
|
||||
applicationInfo: info,
|
||||
);
|
||||
|
||||
void refuseFriendApplication(FriendApplicationInfo info) async {}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
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 'friend_requests_logic.dart';
|
||||
|
||||
class FriendRequestsPage extends StatelessWidget {
|
||||
final logic = Get.find<FriendRequestsLogic>();
|
||||
|
||||
FriendRequestsPage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: TitleBar.back(title: StrRes.newFriend),
|
||||
backgroundColor: Styles.c_F8F9FA,
|
||||
body: Obx(() => ListView.builder(
|
||||
padding: EdgeInsets.only(top: 10.h),
|
||||
itemCount: logic.applicationList.length,
|
||||
itemBuilder: (_, index) =>
|
||||
_buildItemView(logic.applicationList[index]),
|
||||
)),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildItemView(FriendApplicationInfo info) {
|
||||
final isISendRequest = info.fromUserID == OpenIM.iMManager.userID;
|
||||
String? name = isISendRequest ? info.toNickname : info.fromNickname;
|
||||
String? faceURL = isISendRequest ? info.toFaceURL : info.fromFaceURL;
|
||||
String? reason = info.reqMsg;
|
||||
|
||||
return Container(
|
||||
height: 68.h,
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.w),
|
||||
decoration: BoxDecoration(
|
||||
color: Styles.c_FFFFFF,
|
||||
border: BorderDirectional(
|
||||
bottom: BorderSide(
|
||||
color: Styles.c_F8F9FA,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
AvatarView(url: faceURL, text: name),
|
||||
10.horizontalSpace,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
(name ?? '').toText
|
||||
..style = Styles.ts_0C1C33_17sp
|
||||
..maxLines = 1
|
||||
..overflow = TextOverflow.ellipsis,
|
||||
4.verticalSpace,
|
||||
if (IMUtils.isNotNullEmptyStr(reason))
|
||||
(reason ?? '').toText
|
||||
..style = Styles.ts_8E9AB0_14sp
|
||||
..maxLines = 1
|
||||
..overflow = TextOverflow.ellipsis,
|
||||
],
|
||||
),
|
||||
),
|
||||
if (/*info.isWaitingHandle && */ isISendRequest)
|
||||
ImageRes.sendRequests.toImage
|
||||
..width = 20.w
|
||||
..height = 20.h,
|
||||
if (info.isWaitingHandle && !isISendRequest)
|
||||
Button(
|
||||
text: StrRes.lookOver,
|
||||
textStyle: Styles.ts_FFFFFF_14sp,
|
||||
onTap: () => logic.acceptFriendApplication(info),
|
||||
height: 28.h,
|
||||
padding: EdgeInsets.symmetric(horizontal: 13.w),
|
||||
),
|
||||
if (info.isWaitingHandle && isISendRequest)
|
||||
StrRes.waitingForVerification.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
if (info.isRejected)
|
||||
StrRes.rejected.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
if (info.isAgreed)
|
||||
StrRes.approved.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import 'process_friend_requests_logic.dart';
|
||||
|
||||
class ProcessFriendRequestsBinding extends Bindings {
|
||||
@override
|
||||
void dependencies() {
|
||||
Get.lazyPut(() => ProcessFriendRequestsLogic());
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
|
||||
class ProcessFriendRequestsLogic extends GetxController {
|
||||
late FriendApplicationInfo applicationInfo;
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
applicationInfo = Get.arguments['applicationInfo'];
|
||||
super.onInit();
|
||||
}
|
||||
|
||||
void acceptFriendApplication() async {
|
||||
LoadingView.singleton
|
||||
.wrap(
|
||||
asyncFunction: () =>
|
||||
OpenIM.iMManager.friendshipManager.acceptFriendApplication(userID: applicationInfo.fromUserID!))
|
||||
.then(_addSuccessfully)
|
||||
.catchError((_) => IMViews.showToast(StrRes.addFailed));
|
||||
}
|
||||
|
||||
void refuseFriendApplication() async {
|
||||
LoadingView.singleton
|
||||
.wrap(
|
||||
asyncFunction: () =>
|
||||
OpenIM.iMManager.friendshipManager.refuseFriendApplication(userID: applicationInfo.fromUserID!))
|
||||
.then(_rejectSuccessfully)
|
||||
.catchError((_) => IMViews.showToast(StrRes.rejectFailed));
|
||||
}
|
||||
|
||||
_addSuccessfully(_) {
|
||||
IMViews.showToast(StrRes.addSuccessfully);
|
||||
Get.back(result: 1);
|
||||
return _;
|
||||
}
|
||||
|
||||
_rejectSuccessfully(_) {
|
||||
IMViews.showToast(StrRes.rejectSuccessfully);
|
||||
Get.back(result: -1);
|
||||
return _;
|
||||
}
|
||||
}
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
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 'process_friend_requests_logic.dart';
|
||||
|
||||
class ProcessFriendRequestsPage extends StatelessWidget {
|
||||
final logic = Get.find<ProcessFriendRequestsLogic>();
|
||||
|
||||
ProcessFriendRequestsPage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: TitleBar.back(title: StrRes.newFriend),
|
||||
backgroundColor: Styles.c_F8F9FA,
|
||||
body: Container(
|
||||
color: Styles.c_FFFFFF,
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 8.h),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
AvatarView(
|
||||
width: 48.w,
|
||||
height: 48.h,
|
||||
url: logic.applicationInfo.fromFaceURL,
|
||||
text: logic.applicationInfo.fromNickname,
|
||||
),
|
||||
10.horizontalSpace,
|
||||
(logic.applicationInfo.fromNickname ?? '').toText
|
||||
..style = Styles.ts_0C1C33_17sp,
|
||||
],
|
||||
),
|
||||
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: 16.h,
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
(logic.applicationInfo.reqMsg ?? '').toText
|
||||
..style = Styles.ts_0C1C33_17sp,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Flexible(child: _buildRejectButton()),
|
||||
12.horizontalSpace,
|
||||
Flexible(
|
||||
child: Button(
|
||||
text: StrRes.accept,
|
||||
textStyle: Styles.ts_FFFFFF_17sp,
|
||||
onTap: logic.acceptFriendApplication,
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
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.refuseFriendApplication,
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
child: StrRes.reject.toText..style = Styles.ts_0C1C33_17sp,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user