ChenNyan 3 days ago
parent
commit
1582efd0b9
15 changed files with 74 additions and 254 deletions
  1. BIN
      android/app/src/main/res/drawable-v21/background.png
  2. BIN
      android/app/src/main/res/drawable/background.png
  3. BIN
      assets/.DS_Store
  4. BIN
      assets/images/.DS_Store
  5. BIN
      assets/images/splash.png
  6. 2
      ios/Runner.xcodeproj/project.pbxproj
  7. BIN
      ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
  8. 132
      ios/Runner/Info.plist
  9. 2
      lib/pages/home/real_home_page.dart
  10. 180
      lib/pages/home/recommend_tab.dart
  11. 4
      lib/pages/main/main_page.dart
  12. 2
      lib/pages/mine/open_webview.dart
  13. 2
      lib/pages/mine/real_login_page.dart
  14. 2
      lib/pages/setting/deactivate_page.dart
  15. 2
      pubspec.yaml

BIN
android/app/src/main/res/drawable-v21/background.png

Before After
Width: 1500  |  Height: 3248  |  Size: 1.8 MiB Width: 1391  |  Height: 3013  |  Size: 3.2 MiB

BIN
android/app/src/main/res/drawable/background.png

Before After
Width: 1500  |  Height: 3248  |  Size: 1.8 MiB Width: 1391  |  Height: 3013  |  Size: 3.2 MiB

BIN
assets/.DS_Store

BIN
assets/images/.DS_Store

BIN
assets/images/splash.png

Before After
Width: 1500  |  Height: 3248  |  Size: 1.8 MiB Width: 1391  |  Height: 3013  |  Size: 3.2 MiB

2
ios/Runner.xcodeproj/project.pbxproj

@ -719,7 +719,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = P65XS8BRNU;
DEVELOPMENT_TEAM = 933D3N3L26;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "趣恋恋";

BIN
ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png

Before After
Width: 1500  |  Height: 3248  |  Size: 1.8 MiB Width: 1391  |  Height: 3013  |  Size: 3.2 MiB

132
ios/Runner/Info.plist

@ -1,74 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>星球奇遇记</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>PlanetAdventure</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array/>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixin</string>
<string>weixinULAPI</string>
<string>weixinURLParamsAPI</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>NSAllowsArbitraryLoadsInWebContent</key>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>趣恋恋</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>PlanetAdventure</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array/>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixin</string>
<string>weixinULAPI</string>
<string>weixinURLParamsAPI</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSAllowsArbitraryLoadsInWebContent</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>用于拍摄照片/视频并上传到社区(如发布动态、上传头像或创建相册/图片集)。</string>
<key>NSMicrophoneUsageDescription</key>
<string>用于录制视频时采集声音,或发布语音内容(例如录一段语音分享到动态/评论)。</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>用于从相册选择照片/视频上传到社区(如发布动态、设置头像或上传到个人相册/图片集)。</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>用于将应用内图片/视频保存到系统相册(例如保存你发布或浏览到的图片)。</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>用于展示同城内容与附近活动(例如根据你所在城市推荐本地话题和线下活动)。</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIStatusBarHidden</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
</dict>
<key>NSCameraUsageDescription</key>
<string>用于拍摄照片/视频并上传到社区(如发布动态、上传头像或创建相册/图片集)。</string>
<key>NSMicrophoneUsageDescription</key>
<string>用于录制视频时采集声音,或发布语音内容(例如录一段语音分享到动态/评论)。</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>用于从相册选择照片/视频上传到社区(如发布动态、设置头像或上传到个人相册/图片集)。</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>用于将应用内图片/视频保存到系统相册(例如保存你发布或浏览到的图片)。</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>用于展示同城内容与附近活动(例如根据你所在城市推荐本地话题和线下活动)。</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIStatusBarHidden</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
</dict>
</plist>

2
lib/pages/home/real_home_page.dart

@ -35,7 +35,7 @@ class _RealHomePageState extends State<RealHomePage> with AutomaticKeepAliveClie
),
Scaffold(
backgroundColor: Colors.transparent,
appBar: PageAppbar(title: "星球奇遇记", color: Colors.white, backgroundColor: Colors.transparent,),
appBar: PageAppbar(title: "趣恋恋", color: Colors.white, backgroundColor: Colors.transparent,),
body: Container(
width: 375.w,
padding: EdgeInsets.symmetric(horizontal: 15.w),

180
lib/pages/home/recommend_tab.dart

@ -116,186 +116,6 @@ class _RecommendTabState extends State<RecommendTab>
child: SingleChildScrollView(
child: Column(
children: [
Container(
padding: EdgeInsets.symmetric(horizontal: 12),
margin: EdgeInsets.only(bottom: 10.w),
height: 90.w,
child: Swiper(
autoplay: true,
itemCount: controller.bannerLint.length,
loop: true,
onTap: (int index){
print(index);
if(controller.bannerLint[index].jumpType == 2){
Get.to(() => OpenWebView(url: controller.bannerLint[index].jumpValue ?? ""));
} else if(controller.bannerLint[index].jumpType == 3){
TDImageViewer.showImageViewer(context: context, images: [controller.bannerLint[index].jumpValue ?? ""]);
}
},
itemBuilder: (BuildContext context, int index) {
return CachedNetworkImage(
imageUrl: controller.bannerLint[index].image ?? "",
height: 90.w,
fit: BoxFit.cover,
imageBuilder: (context, imageProvider) => Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
image: DecorationImage(
image: imageProvider,
fit: BoxFit.cover,
),
),
),
errorWidget: (context, url, error) => Image.asset(
Assets.imagesUserAvatar,
width: 165.w,
height: 165.w,
fit: BoxFit.cover,
),
);
},
),
),
Container(
padding: EdgeInsets.symmetric(horizontal: 12),
margin: EdgeInsets.only(bottom: 10.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
width: 174.w,
height: 126.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8.w)),
color: Colors.white
),
child: Column(
children: [
Stack(
children: [
ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(8.w)),
child: CachedNetworkImage(
imageUrl: "https://dating-agency-test.oss-accelerate.aliyuncs.com/1.png",
width: 174.w,
height: 84.w,
fit: BoxFit.cover,
),
),
Positioned(
child: Container(
width: 47.w,
height: 17.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8.w),
bottomRight: Radius.circular(8.w),
),
color: const Color.fromRGBO(234, 57, 49, 1)
),
child: Center(
child: Text(
"热门活动",
style: TextStyle(
fontSize: 9.w,
color: Colors.white,
fontWeight: FontWeight.w500
),
),
),
),
)
],
),
Container(
padding: EdgeInsets.all(5.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"星河 DEEP--轻奢浪漫之旅",
style: TextStyle(
fontSize: 13.w,
fontWeight: FontWeight.w500
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"0人已报名",
style: TextStyle(
fontSize: 9.w,
color: const Color.fromRGBO(144, 144, 144, 1),
fontWeight: FontWeight.w500
),
),
Text(
"查看详情",
style: TextStyle(
fontSize: 9.w,
color: const Color.fromRGBO(144, 144, 144, 1),
fontWeight: FontWeight.w500
),
),
],
)
],
),
)
],
),
).onTap((){
Get.to(() => EventList());
}),
Container(
width: 167.w,
height: 126.w,
padding: EdgeInsets.all(7.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8.w)),
color: Colors.white
),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"金牌红娘",
style: TextStyle(
fontSize: 13.w,
fontWeight: FontWeight.w700
),
),
Text(
"查看更多",
style: TextStyle(
fontSize: 9.w,
color: const Color.fromRGBO(144, 144, 144, 1),
fontWeight: FontWeight.w500
),
)
],
),
Wrap(
spacing: 14.w,
runSpacing: 8.w,
children: [
...controller.matchmakerList.take(6).toList().map((e){
return MatchmakerItem(item: e);
})
],
)
],
),
).onTap((){
Get.to(() => MatchmakerPage());
}),
],
),
),
ListView.separated(
shrinkWrap: true, // 1
physics: const NeverScrollableScrollPhysics(), // 2

4
lib/pages/main/main_page.dart

@ -36,7 +36,7 @@ class _MainPageState extends State<MainPage> {
int currentIndex = 0; // 使int替代RxInt
// build都重新创建
late RealHomePage homePage;
late HomePage homePage;
late DiscoverPage discoverPage;
late TimelinePage timelinePage;
late MessagePage messagePage;
@ -47,7 +47,7 @@ class _MainPageState extends State<MainPage> {
super.initState();
//
homePage = RealHomePage();
homePage = HomePage();
// discoverPage = DiscoverPage();
timelinePage = TimelinePage(goMessage: goMessage,);
messagePage = MessagePage();

2
lib/pages/mine/open_webview.dart

@ -25,7 +25,7 @@ class _OpenWebViewState extends State<OpenWebView> {
..setNavigationDelegate(
NavigationDelegate(
onPageFinished: (url) async {
await controller.runJavaScript(_replaceTextJs());
},
),
)

2
lib/pages/mine/real_login_page.dart

@ -52,7 +52,7 @@ class _RealLoginPageState extends State<RealLoginPage> {
),
SizedBox(height: 12.w,),
Text(
"星球奇遇记",
"趣恋恋",
style: TextStyle(
fontSize: 24.w
),

2
lib/pages/setting/deactivate_page.dart

@ -35,7 +35,7 @@ class DeactivatePage extends StatelessWidget {
),
SizedBox(height: 35.w,),
Text(
"申请注销星球奇遇记账号前,星球奇遇记将进行以下验证,以保证你的账号安全、财产安全。",
"申请注销趣恋恋账号前,趣恋恋将进行以下验证,以保证你的账号安全、财产安全。",
style: TextStyle(
fontSize: 13.w,
fontWeight: FontWeight.w500,

2
pubspec.yaml

@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.2.0+1
version: 1.3.0+1
environment:
sdk: ^3.9.0

Loading…
Cancel
Save