Browse Source

开放内容

master
Jolie 3 months ago
parent
commit
6ebd717e1c
6 changed files with 53 additions and 52 deletions
  1. 6
      ios/Runner.xcodeproj/project.pbxproj
  2. 8
      ios/Runner/Info.plist
  3. 65
      lib/pages/home/user_information_page.dart
  4. 10
      lib/pages/main/main_page.dart
  5. 6
      lib/pages/message/chat_page.dart
  6. 10
      lib/widget/message/chat_input_bar.dart

6
ios/Runner.xcodeproj/project.pbxproj

@ -500,7 +500,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = P65XS8BRNU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -693,7 +693,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = P65XS8BRNU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -726,7 +726,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = P65XS8BRNU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;

8
ios/Runner/Info.plist

@ -42,13 +42,13 @@
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>需要访问相机以拍摄照片和视频</string>
<string>趣恋恋需要访问您的相机,以便您能够拍摄个人资料头像照片和与好友聊天时发送的照片。例如,当您上传个人头像时,可以直接拍摄照片进行上传;在与好友聊天时,可以拍摄照片进行分享。我们不会在未经您同意的情况下使用您的相机。</string>
<key>NSMicrophoneUsageDescription</key>
<string>需要访问麦克风以录制语音和视频</string>
<string>趣恋恋需要访问您的麦克风,以便您能够录制语音消息进行语音交流。例如,发送语音消息时进行录音。我们不会在未经您同意的情况下使用您的麦克风。</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>需要访问相册以选择和发送图片、视频</string>
<string>趣恋恋需要访问您的照片库,以便您能够选择个人资料照片和与好友聊天时分享的图片。例如,当您设置个人头像时,可以从相册中选择照片;在与好友聊天时,可以从相册中选择图片进行分享。我们只会访问您主动选择的照片,不会访问您的其他照片。</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>需要访问相册以保存图片和视频</string>
<string>趣恋恋需要访问您的照片库,以便您能够保存聊天中收到的图片和视频到相册。例如,当您收到好友发送的精美图片时,可以将其保存到相册以便随时查看。我们只会保存您主动选择保存的图片,不会修改或删除您的其他照片。</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>需要获取您的位置信息以提供同城匹配服务</string>
<key>UIApplicationSupportsIndirectInputEvents</key>

65
lib/pages/home/user_information_page.dart

@ -236,38 +236,39 @@ 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,),

10
lib/pages/main/main_page.dart

@ -41,7 +41,7 @@ class _MainPageState extends State<MainPage> {
//
homePage = HomePage();
discoverPage = DiscoverPage();
// discoverPage = DiscoverPage();
messagePage = MessagePage();
minePage = MinePage();
@ -80,7 +80,7 @@ class _MainPageState extends State<MainPage> {
controller: pageController,
children: [
homePage, // 使
discoverPage,
// discoverPage,
messagePage,
minePage,
],
@ -92,9 +92,9 @@ class _MainPageState extends State<MainPage> {
useVerticalDivider: false,
navigationTabs: [
tabItem('首页', Assets.imagesHomePre, Assets.imagesHomeNol, 0),
tabItem('找对象', Assets.imagesDiscoverPre, Assets.imagesDiscoverNol, 1),
tabItem('消息', Assets.imagesMessagePre, Assets.imagesMessageNol, 2),
tabItem('我的', Assets.imagesMinePre, Assets.imagesMineNol, 3),
// tabItem('找对象', Assets.imagesDiscoverPre, Assets.imagesDiscoverNol, 1),
tabItem('消息', Assets.imagesMessagePre, Assets.imagesMessageNol, 1),
tabItem('我的', Assets.imagesMinePre, Assets.imagesMineNol, 2),
]
)
),

6
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<ChatPage> {
//
_showGiftPopup();
},
//
//
// onVoiceCall: () async {
// //
// await CallManager.instance.initiateCall(
@ -298,7 +298,7 @@ class _ChatPageState extends State<ChatPage> {
// chatController: controller,
// );
// },
//
//
// onVideoCall: () async {
// //
// await CallManager.instance.initiateCall(

10
lib/widget/message/chat_input_bar.dart

@ -291,7 +291,7 @@ class _ChatInputBarState extends State<ChatInputBar> {
width: 24.w,
height: 24.w,
).onTap(_toggleVoiceOptions),
//
//
// Image.asset(
// Assets.imagesSendCall,
// width: 24.w,
@ -299,7 +299,7 @@ class _ChatInputBarState extends State<ChatInputBar> {
// ).onTap(() {
// widget.onVoiceCall?.call();
// }),
//
//
// Image.asset(
// Assets.imagesSendVideoCall,
// width: 24.w,
@ -308,9 +308,9 @@ class _ChatInputBarState extends State<ChatInputBar> {
// 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),
//

Loading…
Cancel
Save