leefer/tongxunruanjian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

feat(mobile-next): 工号登录与目录薄适配，并完成登录/会话/聊天/通讯录第一批界面

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
编码工程师
2026-08-20 02:30:10 +08:00
co-authored by Cursor multica-agent
parent d787c0a477
commit 60b6590409
17 changed files with 842 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile-next/lib/pages/chat/chat_view.dart
+3 -1
View File
@@ -3,6 +3,7 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
import 'package:get/get.dart';
import 'package:openim_common/openim_common.dart';
import '../../company/feature_flags.dart';
import '../../widgets/file_download_progress.dart';
import 'chat_logic.dart';
@@ -222,12 +223,13 @@ class ChatPage extends StatelessWidget {
onCloseMultiModel: logic.exit,
onClickMoreBtn: logic.chatSetup,
onClickCallBtn: logic.call,
showCallBtn: FeatureFlags.livekitCall,
),
body: SafeArea(
child: WaterMarkBgView(
text: '',
path: logic.background.value,
backgroundColor: Styles.c_FFFFFF,
backgroundColor: Styles.c_F0F2F6,
floatView: _groupCallHintView,
bottomView: ChatInputBox(
forceCloseToolboxSub: logic.forceCloseToolbox,
mobile-next/lib/pages/contacts/contacts_logic.dart
+1 -1
View File
@@ -46,7 +46,7 @@ class ContactsLogic extends GetxController
void searchContacts() => AppNavigator.startGlobalSearch();
void addContacts() => AppNavigator.startAddContactsMethod();
void addContacts() => AppNavigator.startAddColleague();
@override
Future<T?>? selectContacts<T>(
mobile-next/lib/pages/contacts/contacts_view.dart
+61 -66
View File
@@ -1,8 +1,8 @@
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 '../../company/brand/app_tokens.dart';
import 'contacts_logic.dart';
class ContactsPage extends StatelessWidget {
@@ -13,79 +13,74 @@ class ContactsPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: TitleBar.contacts(
onClickAddContacts: logic.addContacts,
backgroundColor: AppColors.pageBg,
appBar: AppBar(
title: const Text('通讯录'),
actions: [
IconButton(
onPressed: logic.addContacts,
icon: const Icon(Icons.person_add_alt, size: AppIconSize.md, color: AppColors.textPrimary),
),
],
),
backgroundColor: Styles.c_F8F9FA,
body: Obx(
() => SingleChildScrollView(
child: Column(
() => Column(
children: [
_entry(
icon: Icons.person_add_alt,
label: '新的同事',
count: logic.friendApplicationCount,
onTap: logic.newFriend,
),
_entry(
icon: Icons.group_outlined,
label: '我的群聊',
count: logic.groupApplicationCount,
onTap: logic.myGroup,
),
_entry(
icon: Icons.people_outline,
label: '同事',
onTap: logic.myFriend,
),
],
),
),
);
}
Widget _entry({
required IconData icon,
required String label,
int count = 0,
required VoidCallback onTap,
}) {
return InkWell(
onTap: onTap,
child: SizedBox(
height: 56,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: AppGap.x4),
child: Row(
children: [
_buildItemView(
assetsName: ImageRes.newFriend,
label: StrRes.newFriend,
count: logic.friendApplicationCount,
onTap: logic.newFriend,
),
_buildItemView(
assetsName: ImageRes.newGroup,
label: StrRes.newGroupRequest,
count: logic.groupApplicationCount,
onTap: logic.newGroup,
),
10.verticalSpace,
_buildItemView(
assetsName: ImageRes.myFriend,
label: StrRes.myFriend,
onTap: logic.myFriend,
),
_buildItemView(
assetsName: ImageRes.myGroup,
label: StrRes.myGroup,
onTap: logic.myGroup,
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: AppColors.primaryActive,
borderRadius: BorderRadius.circular(AppRadius.control),
),
alignment: Alignment.center,
child: Icon(icon, size: AppIconSize.sm, color: AppColors.primary),
),
const SizedBox(width: AppGap.x3),
Text(label, style: const TextStyle(fontSize: AppFont.body, color: AppColors.textPrimary)),
const Spacer(),
if (count > 0) UnreadCountView(count: count),
],
),
),
),
);
}
Widget _buildItemView({
String? assetsName,
required String label,
Widget? icon,
int count = 0,
bool showRightArrow = true,
double? height,
Function()? onTap,
}) =>
Ink(
color: Styles.c_FFFFFF,
child: InkWell(
onTap: onTap,
child: Container(
height: height ?? 60.h,
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
children: [
if (null != assetsName)
assetsName.toImage
..width = 42.w
..height = 42.h,
if (null != icon) icon,
12.horizontalSpace,
label.toText..style = Styles.ts_0C1C33_17sp,
const Spacer(),
if (count > 0) UnreadCountView(count: count),
4.horizontalSpace,
if (showRightArrow)
ImageRes.rightArrow.toImage
..width = 24.w
..height = 24.h,
],
),
),
),
);
}
mobile-next/lib/pages/contacts/friend_requests/friend_requests_logic.dart
+21 -4
View File
@@ -2,7 +2,6 @@ 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';
@@ -69,9 +68,27 @@ class FriendRequestsLogic extends GetxController {
bool isISendRequest(FriendApplicationInfo info) => info.fromUserID == OpenIM.iMManager.userID;
void acceptFriendApplication(FriendApplicationInfo info) => AppNavigator.startProcessFriendRequests(
applicationInfo: info,
void acceptFriendApplication(FriendApplicationInfo info) async {
try {
await LoadingView.singleton.wrap(
asyncFunction: () => OpenIM.iMManager.friendshipManager.acceptFriendApplication(userID: info.fromUserID!),
);
IMViews.showToast(StrRes.addSuccessfully);
_getFriendRequestsList();
} catch (_) {
IMViews.showToast(StrRes.addFailed);
}
}
void refuseFriendApplication(FriendApplicationInfo info) async {}
void refuseFriendApplication(FriendApplicationInfo info) async {
try {
await LoadingView.singleton.wrap(
asyncFunction: () => OpenIM.iMManager.friendshipManager.refuseFriendApplication(userID: info.fromUserID!),
);
IMViews.showToast(StrRes.rejectSuccessfully);
_getFriendRequestsList();
} catch (_) {
IMViews.showToast(StrRes.rejectFailed);
}
}
}
mobile-next/lib/pages/contacts/friend_requests/friend_requests_view.dart
+80 -51
View File
@@ -1,9 +1,10 @@
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 '../../../company/brand/app_tokens.dart';
import '../../../company/ui/state_views.dart';
import 'friend_requests_logic.dart';
class FriendRequestsPage extends StatelessWidget {
@@ -14,75 +15,103 @@ class FriendRequestsPage extends StatelessWidget {
@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]),
)),
appBar: AppBar(title: const Text('新的同事')),
backgroundColor: AppColors.pageBg,
body: Obx(() {
if (logic.applicationList.isEmpty) {
return const CompanyEmptyView(
icon: Icons.person_outline,
title: '暂无同事申请',
subtitle: '发出或收到的申请会显示在这里',
);
}
return ListView.builder(
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;
final name = isISendRequest ? info.toNickname : info.fromNickname;
final faceURL = isISendRequest ? info.toFaceURL : info.fromFaceURL;
final waiting = info.isWaitingHandle;
final rejected = info.isRejected;
final agreed = info.isAgreed;
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,
),
),
constraints: const BoxConstraints(minHeight: 72),
padding: const EdgeInsets.symmetric(horizontal: AppGap.x4, vertical: AppGap.x3),
decoration: const BoxDecoration(
color: AppColors.pageBg,
border: Border(bottom: BorderSide(color: AppColors.divider, width: 0.5)),
),
child: Row(
children: [
AvatarView(url: faceURL, text: name),
10.horizontalSpace,
AvatarView(url: faceURL, text: name, width: 48, height: 48),
const SizedBox(width: AppGap.x3),
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,
Text(
name ?? '',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontSize: AppFont.body, color: AppColors.textPrimary),
),
if (IMUtils.isNotNullEmptyStr(info.reqMsg))
Text(
info.reqMsg ?? '',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontSize: AppFont.sub, color: AppColors.textSecondary),
),
],
),
),
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),
const SizedBox(width: AppGap.x2),
if (waiting && isISendRequest)
const Text('等待对方通过', style: TextStyle(fontSize: AppFont.sub, color: AppColors.textSecondary)),
if (waiting && !isISendRequest)
SizedBox(
width: 132,
child: Row(
children: [
Expanded(
child: OutlinedButton(
onPressed: () => logic.refuseFriendApplication(info),
style: OutlinedButton.styleFrom(
minimumSize: const Size(0, 32),
padding: EdgeInsets.zero,
side: const BorderSide(color: AppColors.textSecondary, width: 0.5),
foregroundColor: AppColors.textPrimary,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(AppRadius.control)),
),
child: const Text('拒绝', style: TextStyle(fontSize: AppFont.sub)),
),
),
const SizedBox(width: AppGap.x2),
Expanded(
child: FilledButton(
onPressed: () => logic.acceptFriendApplication(info),
style: FilledButton.styleFrom(
minimumSize: const Size(0, 32),
padding: EdgeInsets.zero,
backgroundColor: AppColors.primary,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(AppRadius.control)),
),
child: const Text('接受', style: TextStyle(fontSize: AppFont.sub, color: Colors.white)),
),
),
],
),
),
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,
if (agreed) const Text('已添加', style: TextStyle(fontSize: AppFont.sub, color: AppColors.textSecondary)),
if (rejected) const Text('已拒绝', style: TextStyle(fontSize: AppFont.sub, color: AppColors.textSecondary)),
],
),
);
mobile-next/lib/pages/conversation/conversation_logic.dart
+1 -1
View File
@@ -436,7 +436,7 @@ class ConversationLogic extends GetxController {
scan() => AppNavigator.startScan();
addFriend() => AppNavigator.startAddContactsBySearch(searchType: SearchType.user);
addFriend() => AppNavigator.startAddColleague();
createGroup() => AppNavigator.startCreateGroup(defaultCheckedList: [OpenIM.iMManager.userInfo]);
mobile-next/lib/pages/conversation/conversation_view.dart
+40 -30
View File
@@ -3,24 +3,24 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart';
import 'package:openim/core/controller/im_controller.dart';
import 'package:openim_common/openim_common.dart';
import 'package:rotated_corner_decoration/rotated_corner_decoration.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:sprintf/sprintf.dart';
import '../../company/brand/app_tokens.dart';
import '../../company/ui/state_views.dart';
import 'conversation_logic.dart';
class ConversationPage extends StatelessWidget {
final logic = Get.find<ConversationLogic>();
final im = Get.find<IMController>();
ConversationPage({super.key});
@override
Widget build(BuildContext context) {
return Obx(() => Scaffold(
backgroundColor: Styles.c_F8F9FA,
backgroundColor: AppColors.pageBg,
appBar: TitleBar.conversation(
statusStr: logic.imSdkStatus,
isFailed: logic.isFailedSdkStatus,
@@ -31,37 +31,47 @@ class ConversationPage extends StatelessWidget {
onCreateGroup: logic.createGroup,
left: Expanded(
flex: 2,
child: Row(
mainAxisSize: MainAxisSize.max,
children: [
AvatarView(
width: 42.w,
height: 42.h,
text: im.userInfo.value.nickname,
url: im.userInfo.value.faceURL,
child: Align(
alignment: Alignment.centerLeft,
child: const Text(
'消息',
style: TextStyle(
fontSize: AppFont.title,
fontWeight: FontWeight.w700,
color: AppColors.textPrimary,
),
10.horizontalSpace,
if (null != im.userInfo.value.nickname)
Flexible(
child: im.userInfo.value.nickname!.toText
..style = Styles.ts_0C1C33_17sp
..maxLines = 1
..overflow = TextOverflow.ellipsis,
),
10.horizontalSpace,
if (null != logic.imSdkStatus && (!logic.reInstall || logic.isFailedSdkStatus))
Flexible(
child: SyncStatusView(
isFailed: logic.isFailedSdkStatus,
statusStr: logic.imSdkStatus!,
)),
],
),
),
)),
body: Column(
children: [
Padding(
padding: const EdgeInsets.fromLTRB(AppGap.x4, 0, AppGap.x4, AppGap.x2),
child: Container(
height: 36,
decoration: BoxDecoration(
color: AppColors.searchBg,
borderRadius: BorderRadius.circular(AppRadius.control),
),
padding: const EdgeInsets.symmetric(horizontal: AppGap.x3),
alignment: Alignment.centerLeft,
child: const Row(
children: [
Icon(Icons.search, size: AppIconSize.sm, color: AppColors.textSecondary),
SizedBox(width: AppGap.x2),
Text('搜索', style: TextStyle(fontSize: AppFont.sub, color: AppColors.textSecondary)),
],
),
),
),
Expanded(
child: SlidableAutoCloseBehavior(
child: logic.list.isEmpty
? const CompanyEmptyView(
icon: Icons.chat_bubble_outline,
title: '暂时没有会话',
subtitle: '去通讯录找个同事聊聊吧',
)
: SlidableAutoCloseBehavior(
child: ScrollablePositionedList.builder(
itemScrollController: logic.itemScrollController,
itemBuilder: (_, index) => _buildConversationItemView(
@@ -117,7 +127,7 @@ class ConversationPage extends StatelessWidget {
child: Stack(
children: [
Container(
height: 68,
height: 72,
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
children: [
@@ -191,7 +201,7 @@ class ConversationPage extends StatelessWidget {
),
if (logic.isPinned(info))
Container(
height: 68.h,
height: 72,
margin: EdgeInsets.only(right: 6.w),
foregroundDecoration: RotatedCornerDecoration.withColor(
color: Styles.c_0089FF,