diff --git a/ios/Podfile b/ios/Podfile index 620e46e..0cbf306 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -27,10 +27,22 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup +platform :ios, '13.0' + +# 在 target 'Runner' do 之前添加 +install! 'cocoapods', :deterministic_uuids => false + target 'Runner' do use_frameworks! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + + + # 强制使用较新的 AgoraInfra_iOS 版本 + pod 'AgoraInfra_iOS', '1.2.13.1' + + + target 'RunnerTests' do inherit! :search_paths end @@ -39,5 +51,9 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end end end diff --git a/lib/pages/message/friend_tab.dart b/lib/pages/message/friend_tab.dart index 449d756..1c143ff 100644 --- a/lib/pages/message/friend_tab.dart +++ b/lib/pages/message/friend_tab.dart @@ -155,7 +155,10 @@ class _FriendTabState extends State with TickerProviderStateMixin { return Container( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, children: [ + const SizedBox(width: 13), _buildTabButton("我的关注", 0), const SizedBox(width: 16), _buildTabButton("好友", 1), @@ -169,15 +172,20 @@ class _FriendTabState extends State with TickerProviderStateMixin { // 构建标签按钮 Widget _buildTabButton(String title, int index) { final bool isSelected = _tabController.index == index; - return Expanded( - child: GestureDetector( - onTap: () { - if (_tabController.index != index) { - _tabController.animateTo(index); - } - }, + // 根据索引设置不同的宽高 + final double width = index == 0 ? 72 : 36; + final double height = index == 0 ? 42 : 21; + + return GestureDetector( + onTap: () { + if (_tabController.index != index) { + _tabController.animateTo(index); + } + }, + child: SizedBox( + width: width, + height: height, child: Container( - padding: const EdgeInsets.symmetric(vertical: 8), decoration: BoxDecoration( color: isSelected ? _primaryPurple : Colors.white, borderRadius: BorderRadius.circular(20), diff --git a/pubspec.lock b/pubspec.lock index 6c77096..0c34111 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -581,14 +581,6 @@ packages: description: flutter source: sdk version: "0.0.0" - fluwx: - dependency: "direct main" - description: - name: fluwx - sha256: "7e92d2000ee49c5262a88c51ea2d22b91a753d5b29df27cc264bb0a115d65373" - url: "https://pub.dev" - source: hosted - version: "5.7.5" frontend_server_client: dependency: transitive description: @@ -1498,14 +1490,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.6" - tobias: - dependency: "direct main" - description: - name: tobias - sha256: "2b5520e622c0d6f04cfb5c9619211f923c97a602e1a3a8954e113e3e0e685c41" - url: "https://pub.dev" - source: hosted - version: "5.3.1" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 178247a..ee98bfc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: dio: ^5.9.0 retrofit: ^4.9.0 flutter_native_splash: ^2.4.7 - im_flutter_sdk: ^4.15.1 + im_flutter_sdk: ^4.15.2 easy_localization: ^3.0.8 flutter_oss_aliyun: ^6.4.2 permission_handler: ^12.0.1 @@ -63,8 +63,8 @@ dependencies: chewie: ^1.8.5 # 视频播放器UI audioplayers: ^6.5.1 video_thumbnail: ^0.5.3 # 视频缩略图生成 - fluwx: ^5.7.5 - tobias: ^5.3.1 + # fluwx: ^5.7.5 + # tobias: ^5.3.1 agora_rtc_engine: ^6.5.3 pull_to_refresh: ^2.0.0