From 4e4ec9dedc3c8d1b094b241bcea7bd9c1b42b0db Mon Sep 17 00:00:00 2001 From: Jolie <> Date: Mon, 22 Dec 2025 11:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=B3=A8=E9=87=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/user_information_page.dart | 65 +++++++++++------------ lib/pages/main/main_page.dart | 10 ++-- lib/pages/message/chat_page.dart | 6 +-- lib/widget/message/chat_input_bar.dart | 10 ++-- 4 files changed, 45 insertions(+), 46 deletions(-) diff --git a/lib/pages/home/user_information_page.dart b/lib/pages/home/user_information_page.dart index 9217d54..9b192ca 100644 --- a/lib/pages/home/user_information_page.dart +++ b/lib/pages/home/user_information_page.dart @@ -236,39 +236,38 @@ class UserInformationPage extends StatelessWidget { ), ], ), - // 语音介绍功能暂时隐藏（为了通过苹果审核） - // Container( - // width: 63.w, - // height: 27.w, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.all(Radius.circular(27.w)), - // color: const Color.fromRGBO(117, 98, 249, .1) - // ), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.center, - // children: [ - // Image.asset( - // Assets.imagesPlayer, - // width: 15.w, - // height: 15.w, - // ), - // SizedBox(width: 4.w,), - // Image.asset( - // Assets.imagesVoice, - // width: 15.w, - // height: 13.w, - // ), - // SizedBox(width: 4.w,), - // Text( - // "6'", - // style: TextStyle( - // fontSize: 11.w, - // color: const Color.fromRGBO(117, 98, 249, 1) - // ), - // ) - // ], - // ), - // ) + Container( + width: 63.w, + height: 27.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(27.w)), + color: const Color.fromRGBO(117, 98, 249, .1) + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + Assets.imagesPlayer, + width: 15.w, + height: 15.w, + ), + SizedBox(width: 4.w,), + Image.asset( + Assets.imagesVoice, + width: 15.w, + height: 13.w, + ), + SizedBox(width: 4.w,), + Text( + "6'", + style: TextStyle( + fontSize: 11.w, + color: const Color.fromRGBO(117, 98, 249, 1) + ), + ) + ], + ), + ) ], ), SizedBox(height: 8.w,), diff --git a/lib/pages/main/main_page.dart b/lib/pages/main/main_page.dart index 957e777..1876b4c 100644 --- a/lib/pages/main/main_page.dart +++ b/lib/pages/main/main_page.dart @@ -41,7 +41,7 @@ class _MainPageState extends State { // 初始化页面实例 homePage = HomePage(); - // discoverPage = DiscoverPage(); + discoverPage = DiscoverPage(); messagePage = MessagePage(); minePage = MinePage(); @@ -80,7 +80,7 @@ class _MainPageState extends State { controller: pageController, children: [ homePage, // 使用成员变量引用 - // discoverPage, + discoverPage, messagePage, minePage, ], @@ -92,9 +92,9 @@ class _MainPageState extends State { useVerticalDivider: false, navigationTabs: [ tabItem('首页', Assets.imagesHomePre, Assets.imagesHomeNol, 0), - // tabItem('找对象', Assets.imagesDiscoverPre, Assets.imagesDiscoverNol, 1), - tabItem('消息', Assets.imagesMessagePre, Assets.imagesMessageNol, 1), - tabItem('我的', Assets.imagesMinePre, Assets.imagesMineNol, 2), + tabItem('找对象', Assets.imagesDiscoverPre, Assets.imagesDiscoverNol, 1), + tabItem('消息', Assets.imagesMessagePre, Assets.imagesMessageNol, 2), + tabItem('我的', Assets.imagesMinePre, Assets.imagesMineNol, 3), ] ) ), diff --git a/lib/pages/message/chat_page.dart b/lib/pages/message/chat_page.dart index 06986d0..3e8629d 100644 --- a/lib/pages/message/chat_page.dart +++ b/lib/pages/message/chat_page.dart @@ -6,7 +6,7 @@ import 'package:im_flutter_sdk/im_flutter_sdk.dart'; import '../../controller/message/chat_controller.dart'; import '../../controller/message/voice_player_manager.dart'; -// import '../../controller/message/call_manager.dart'; // 暂时注释 +// import '../../controller/message/call_manager.dart'; // 暂时隐藏 import '../../generated/assets.dart'; import '../../model/home/marriage_data.dart'; import '../../../widget/message/chat_input_bar.dart'; @@ -289,7 +289,7 @@ class _ChatPageState extends State { // 显示礼物弹窗 _showGiftPopup(); }, - // 语音通话回调（暂时注释） + // 语音通话回调（暂时隐藏） // onVoiceCall: () async { // // 发起语音通话 // await CallManager.instance.initiateCall( @@ -298,7 +298,7 @@ class _ChatPageState extends State { // chatController: controller, // ); // }, - // 视频通话回调（暂时注释） + // 视频通话回调（暂时隐藏） // onVideoCall: () async { // // 发起视频通话 // await CallManager.instance.initiateCall( diff --git a/lib/widget/message/chat_input_bar.dart b/lib/widget/message/chat_input_bar.dart index 6f073cb..d138328 100644 --- a/lib/widget/message/chat_input_bar.dart +++ b/lib/widget/message/chat_input_bar.dart @@ -291,7 +291,7 @@ class _ChatInputBarState extends State { width: 24.w, height: 24.w, ).onTap(_toggleVoiceOptions), - // 语音通话按钮（暂时注释） + // 语音通话按钮（暂时隐藏） // Image.asset( // Assets.imagesSendCall, // width: 24.w, @@ -299,7 +299,7 @@ class _ChatInputBarState extends State { // ).onTap(() { // widget.onVoiceCall?.call(); // }), - // 视频通话按钮（暂时注释） + // 视频通话按钮（暂时隐藏） // Image.asset( // Assets.imagesSendVideoCall, // width: 24.w, @@ -308,9 +308,9 @@ class _ChatInputBarState extends State { // widget.onVideoCall?.call(); // }), // 礼物按钮 - // Image.asset(Assets.imagesGift, width: 24.w, height: 24.w).onTap(() { - // widget.onGiftTap?.call(); - // }), + Image.asset(Assets.imagesGift, width: 24.w, height: 24.w).onTap(() { + widget.onGiftTap?.call(); + }), // 表情按钮 Image.asset(Assets.imagesEmoji, width: 24.w, height: 24.w).onTap(_toggleEmojiPanel), // 更多按钮