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 'chat_setup_logic.dart';
|
||||
|
||||
class ChatSetupBinding extends Bindings {
|
||||
@override
|
||||
void dependencies() {
|
||||
Get.lazyPut(() => ChatSetupLogic());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
|
||||
import '../../../core/controller/app_controller.dart';
|
||||
import '../../../core/controller/im_controller.dart';
|
||||
import '../../../routes/app_navigator.dart';
|
||||
import '../chat_logic.dart';
|
||||
|
||||
class ChatSetupLogic extends GetxController {
|
||||
final chatLogic = Get.find<ChatLogic>(tag: GetTags.chat);
|
||||
final appLogic = Get.find<AppController>();
|
||||
final imLogic = Get.find<IMController>();
|
||||
late Rx<ConversationInfo> conversationInfo;
|
||||
late StreamSubscription ccSub;
|
||||
late StreamSubscription fcSub;
|
||||
|
||||
String get conversationID => conversationInfo.value.conversationID;
|
||||
|
||||
bool get isPinned => conversationInfo.value.isPinned == true;
|
||||
|
||||
@override
|
||||
void onClose() {
|
||||
ccSub.cancel();
|
||||
fcSub.cancel();
|
||||
super.onClose();
|
||||
}
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
conversationInfo = Rx(Get.arguments['conversationInfo']);
|
||||
final sourceID = conversationInfo.value.conversationType == ConversationType.single
|
||||
? conversationInfo.value.userID
|
||||
: conversationInfo.value.groupID;
|
||||
OpenIM.iMManager.conversationManager
|
||||
.getOneConversation(sourceID: sourceID!, sessionType: conversationInfo.value.conversationType!)
|
||||
.then((value) {
|
||||
conversationInfo.value = value;
|
||||
});
|
||||
|
||||
ccSub = imLogic.conversationChangedSubject.listen((newList) {
|
||||
for (var newValue in newList) {
|
||||
if (newValue.conversationID == conversationID) {
|
||||
conversationInfo.update((val) {
|
||||
val?.burnDuration = newValue.burnDuration ?? 30;
|
||||
val?.isPrivateChat = newValue.isPrivateChat;
|
||||
val?.isPinned = newValue.isPinned;
|
||||
|
||||
val?.recvMsgOpt = newValue.recvMsgOpt;
|
||||
val?.isMsgDestruct = newValue.isMsgDestruct;
|
||||
val?.msgDestructTime = newValue.msgDestructTime;
|
||||
val?.showName = newValue.showName;
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
fcSub = imLogic.friendInfoChangedSubject.listen((value) {
|
||||
if (conversationInfo.value.userID == value.userID) {
|
||||
conversationInfo.update((val) {
|
||||
val?.showName = value.getShowName();
|
||||
val?.faceURL = value.faceURL;
|
||||
});
|
||||
}
|
||||
});
|
||||
super.onInit();
|
||||
}
|
||||
|
||||
void toggleTopContacts() async {
|
||||
await LoadingView.singleton.wrap(
|
||||
asyncFunction: () => OpenIM.iMManager.conversationManager.pinConversation(
|
||||
conversationID: conversationID,
|
||||
isPinned: !isPinned,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void clearChatHistory() async {
|
||||
var confirm = await Get.dialog(CustomDialog(
|
||||
title: StrRes.confirmClearChatHistory,
|
||||
rightText: StrRes.clearAll,
|
||||
));
|
||||
if (confirm == true) {
|
||||
await LoadingView.singleton.wrap(
|
||||
asyncFunction: () => OpenIM.iMManager.conversationManager.clearConversationAndDeleteAllMsg(
|
||||
conversationID: conversationID,
|
||||
),
|
||||
);
|
||||
chatLogic.clearAllMessage();
|
||||
IMViews.showToast(StrRes.clearSuccessfully);
|
||||
}
|
||||
}
|
||||
|
||||
void createGroup() => AppNavigator.startCreateGroup(defaultCheckedList: [
|
||||
UserInfo(
|
||||
userID: conversationInfo.value.userID,
|
||||
faceURL: conversationInfo.value.faceURL,
|
||||
nickname: conversationInfo.value.showName,
|
||||
),
|
||||
OpenIM.iMManager.userInfo,
|
||||
]);
|
||||
|
||||
void viewUserInfo() => AppNavigator.startUserProfilePane(
|
||||
userID: conversationInfo.value.userID!,
|
||||
nickname: conversationInfo.value.showName,
|
||||
faceURL: conversationInfo.value.faceURL,
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,154 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
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 'chat_setup_logic.dart';
|
||||
|
||||
class ChatSetupPage extends StatelessWidget {
|
||||
final logic = Get.find<ChatSetupLogic>();
|
||||
|
||||
ChatSetupPage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: TitleBar.back(),
|
||||
backgroundColor: Styles.c_F8F9FA,
|
||||
body: SingleChildScrollView(
|
||||
child: Obx(() => Column(
|
||||
children: [
|
||||
_buildBaseInfoView(),
|
||||
17.verticalSpace,
|
||||
_buildItemView(
|
||||
text: StrRes.topContacts,
|
||||
switchOn: logic.isPinned,
|
||||
onChanged: (_) => logic.toggleTopContacts(),
|
||||
showSwitchButton: true,
|
||||
isTopRadius: true,
|
||||
),
|
||||
10.verticalSpace,
|
||||
_buildItemView(
|
||||
text: StrRes.clearChatHistory,
|
||||
textStyle: Styles.ts_FF381F_17sp,
|
||||
onTap: logic.clearChatHistory,
|
||||
showRightArrow: true,
|
||||
isTopRadius: true,
|
||||
isBottomRadius: true,
|
||||
),
|
||||
],
|
||||
)),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildBaseInfoView() => Container(
|
||||
margin: EdgeInsets.symmetric(horizontal: 10.w, vertical: 10.h),
|
||||
padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 10.h),
|
||||
decoration: BoxDecoration(
|
||||
color: Styles.c_FFFFFF,
|
||||
borderRadius: BorderRadius.circular(6.r),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: logic.viewUserInfo,
|
||||
child: SizedBox(
|
||||
width: 60.w,
|
||||
child: Column(
|
||||
children: [
|
||||
AvatarView(
|
||||
width: 44.w,
|
||||
height: 44.h,
|
||||
text: logic.conversationInfo.value.showName,
|
||||
url: logic.conversationInfo.value.faceURL,
|
||||
),
|
||||
8.verticalSpace,
|
||||
(logic.conversationInfo.value.showName ?? '').toText
|
||||
..style = Styles.ts_8E9AB0_14sp
|
||||
..maxLines = 1
|
||||
..overflow = TextOverflow.ellipsis,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 60.w,
|
||||
child: Column(
|
||||
children: [
|
||||
ImageRes.addFriendTobeGroup.toImage
|
||||
..width = 44.w
|
||||
..height = 44.h
|
||||
..onTap = logic.createGroup,
|
||||
8.verticalSpace,
|
||||
''.toText
|
||||
..style = Styles.ts_8E9AB0_14sp
|
||||
..maxLines = 1
|
||||
..overflow = TextOverflow.ellipsis,
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
Widget _buildItemView({
|
||||
required String text,
|
||||
String? hintText,
|
||||
TextStyle? textStyle,
|
||||
String? value,
|
||||
bool switchOn = false,
|
||||
bool isTopRadius = false,
|
||||
bool isBottomRadius = false,
|
||||
bool showRightArrow = false,
|
||||
bool showSwitchButton = false,
|
||||
ValueChanged<bool>? onChanged,
|
||||
Function()? onTap,
|
||||
}) =>
|
||||
GestureDetector(
|
||||
onTap: onTap,
|
||||
behavior: HitTestBehavior.translucent,
|
||||
child: Container(
|
||||
height: hintText == null ? 46.h : 68.h,
|
||||
margin: EdgeInsets.symmetric(horizontal: 10.w),
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.w),
|
||||
decoration: BoxDecoration(
|
||||
color: Styles.c_FFFFFF,
|
||||
borderRadius: BorderRadius.only(
|
||||
topRight: Radius.circular(isTopRadius ? 6.r : 0),
|
||||
topLeft: Radius.circular(isTopRadius ? 6.r : 0),
|
||||
bottomLeft: Radius.circular(isBottomRadius ? 6.r : 0),
|
||||
bottomRight: Radius.circular(isBottomRadius ? 6.r : 0),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
null != hintText
|
||||
? Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
text.toText..style = textStyle ?? Styles.ts_0C1C33_17sp,
|
||||
hintText.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
],
|
||||
)
|
||||
: (text.toText..style = textStyle ?? Styles.ts_0C1C33_17sp),
|
||||
const Spacer(),
|
||||
if (null != value) value.toText..style = Styles.ts_8E9AB0_14sp,
|
||||
if (showSwitchButton)
|
||||
CupertinoSwitch(
|
||||
value: switchOn,
|
||||
activeColor: Styles.c_0089FF,
|
||||
onChanged: onChanged,
|
||||
),
|
||||
if (showRightArrow)
|
||||
ImageRes.rightArrow.toImage
|
||||
..width = 24.w
|
||||
..height = 24.h,
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import 'favorite_manage_logic.dart';
|
||||
|
||||
class FavoriteManageBinding extends Bindings {
|
||||
@override
|
||||
void dependencies() {
|
||||
Get.lazyPut(() => FavoriteManageLogic());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
import 'package:get/get.dart';
|
||||
import 'package:openim_common/openim_common.dart';
|
||||
import 'package:wechat_assets_picker/wechat_assets_picker.dart';
|
||||
|
||||
class FavoriteManageLogic extends GetxController {
|
||||
var cacheLogic = Get.find<CacheController>();
|
||||
var isMultiModel = false.obs;
|
||||
var selectedList = <String>[].obs;
|
||||
|
||||
void addFavorite() async {
|
||||
final List<AssetEntity>? assets = await AssetPicker.pickAssets(
|
||||
Get.context!,
|
||||
pickerConfig: const AssetPickerConfig(requestType: RequestType.image),
|
||||
);
|
||||
if (null != assets) {
|
||||
for (var asset in assets) {
|
||||
var path = (await asset.file)!.path;
|
||||
var width = asset.width;
|
||||
var height = asset.height;
|
||||
switch (asset.type) {
|
||||
case AssetType.image:
|
||||
cacheLogic.addFavoriteFromPath(path, width, height);
|
||||
IMViews.showToast(StrRes.addSuccessfully);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void updateSelectedStatus(String url) {
|
||||
if (selectedList.contains(url)) {
|
||||
selectedList.remove(url);
|
||||
} else {
|
||||
selectedList.add(url);
|
||||
}
|
||||
}
|
||||
|
||||
void manage() {
|
||||
isMultiModel.value = !isMultiModel.value;
|
||||
selectedList.clear();
|
||||
}
|
||||
|
||||
void delete() {
|
||||
if (selectedList.isNotEmpty) {
|
||||
cacheLogic.delFavoriteList(selectedList);
|
||||
selectedList.clear();
|
||||
}
|
||||
}
|
||||
|
||||
bool isChecked(String url) => selectedList.contains(url);
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
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 'favorite_manage_logic.dart';
|
||||
|
||||
class FavoriteManagePage extends StatelessWidget {
|
||||
final logic = Get.find<FavoriteManageLogic>();
|
||||
|
||||
FavoriteManagePage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Obx(() => Scaffold(
|
||||
appBar: TitleBar.back(
|
||||
title: StrRes.favoriteFace,
|
||||
right: StrRes.favoriteManage.toText
|
||||
..onTap = logic.manage
|
||||
..style = Styles.ts_0C1C33_17sp,
|
||||
),
|
||||
body: Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: GridView.builder(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 22.w,
|
||||
vertical: 10.h,
|
||||
),
|
||||
itemCount: logic.cacheLogic.urlList.length + 1,
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: 4,
|
||||
childAspectRatio: 1,
|
||||
mainAxisSpacing: 22.h,
|
||||
crossAxisSpacing: 22.w,
|
||||
),
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
if (index == 0) {
|
||||
return GestureDetector(
|
||||
onTap: logic.addFavorite,
|
||||
child: ImageRes.addFavorite.toImage
|
||||
..width = 66.w
|
||||
..height = 66.h,
|
||||
);
|
||||
}
|
||||
var url = logic.cacheLogic.urlList.elementAt(index - 1);
|
||||
return GestureDetector(
|
||||
onTap: logic.isMultiModel.value ? () => logic.updateSelectedStatus(url) : null,
|
||||
child: Stack(
|
||||
children: [
|
||||
ImageUtil.networkImage(
|
||||
url: url,
|
||||
width: 66.w,
|
||||
height: 66.h,
|
||||
cacheWidth: 66.w.toInt(),
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
if (logic.isMultiModel.value)
|
||||
Positioned(
|
||||
right: 4.w,
|
||||
bottom: 4.h,
|
||||
child: ChatRadio(checked: logic.isChecked(url)),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
_buildBottomBar(),
|
||||
],
|
||||
),
|
||||
));
|
||||
}
|
||||
|
||||
Widget _buildBottomBar() => Container(
|
||||
height: MediaQuery.of(Get.context!).viewPadding.bottom + 48.h,
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.w),
|
||||
decoration: BoxDecoration(
|
||||
border: BorderDirectional(
|
||||
top: BorderSide(color: Styles.c_E8EAEF, width: 1),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
sprintf(StrRes.favoriteCount, [logic.cacheLogic.favoriteList.length]).toText..style = Styles.ts_8E9AB0_16sp,
|
||||
const Spacer(),
|
||||
if (logic.isMultiModel.value)
|
||||
GestureDetector(
|
||||
onTap: logic.delete,
|
||||
behavior: HitTestBehavior.translucent,
|
||||
child: sprintf(StrRes.favoriteDel, [logic.selectedList.length]).toText..style = Styles.ts_0089FF_16sp,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user