diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png index 7243b7b..f373f45 100644 Binary files a/android/app/src/main/res/drawable-v21/background.png and b/android/app/src/main/res/drawable-v21/background.png differ diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png index 7243b7b..f373f45 100644 Binary files a/android/app/src/main/res/drawable/background.png and b/android/app/src/main/res/drawable/background.png differ diff --git a/assets/.DS_Store b/assets/.DS_Store index 243119c..b8461b8 100644 Binary files a/assets/.DS_Store and b/assets/.DS_Store differ diff --git a/assets/images/.DS_Store b/assets/images/.DS_Store new file mode 100644 index 0000000..6c33c37 Binary files /dev/null and b/assets/images/.DS_Store differ diff --git a/assets/images/splash.png b/assets/images/splash.png index 7243b7b..f373f45 100644 Binary files a/assets/images/splash.png and b/assets/images/splash.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 28c9cff..993cf88 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/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 = "趣恋恋"; diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png index 7243b7b..f373f45 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 52a50bc..23fd56b 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -1,74 +1,74 @@ - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - 星球奇遇记 - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - PlanetAdventure - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleURLTypes - - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSApplicationQueriesSchemes - - weixin - weixinULAPI - weixinURLParamsAPI - - LSRequiresIPhoneOS - - NSAppTransportSecurity - NSAllowsArbitraryLoads + CADisableMinimumFrameDurationOnPhone - NSAllowsArbitraryLoadsInWebContent + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + 趣恋恋 + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + PlanetAdventure + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleURLTypes + + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSApplicationQueriesSchemes + + weixin + weixinULAPI + weixinURLParamsAPI + + LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsArbitraryLoadsInWebContent + + + NSCameraUsageDescription + 用于拍摄照片/视频并上传到社区（如发布动态、上传头像或创建相册/图片集）。 + NSMicrophoneUsageDescription + 用于录制视频时采集声音，或发布语音内容（例如录一段语音分享到动态/评论）。 + NSPhotoLibraryUsageDescription + 用于从相册选择照片/视频上传到社区（如发布动态、设置头像或上传到个人相册/图片集）。 + NSPhotoLibraryAddUsageDescription + 用于将应用内图片/视频保存到系统相册（例如保存你发布或浏览到的图片）。 + NSLocationWhenInUseUsageDescription + 用于展示同城内容与附近活动（例如根据你所在城市推荐本地话题和线下活动）。 + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + - NSCameraUsageDescription - 用于拍摄照片/视频并上传到社区（如发布动态、上传头像或创建相册/图片集）。 - NSMicrophoneUsageDescription - 用于录制视频时采集声音，或发布语音内容（例如录一段语音分享到动态/评论）。 - NSPhotoLibraryUsageDescription - 用于从相册选择照片/视频上传到社区（如发布动态、设置头像或上传到个人相册/图片集）。 - NSPhotoLibraryAddUsageDescription - 用于将应用内图片/视频保存到系统相册（例如保存你发布或浏览到的图片）。 - NSLocationWhenInUseUsageDescription - 用于展示同城内容与附近活动（例如根据你所在城市推荐本地话题和线下活动）。 - UIApplicationSupportsIndirectInputEvents - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - - diff --git a/lib/pages/home/real_home_page.dart b/lib/pages/home/real_home_page.dart index c71e5d5..71df4ac 100644 --- a/lib/pages/home/real_home_page.dart +++ b/lib/pages/home/real_home_page.dart @@ -35,7 +35,7 @@ class _RealHomePageState extends State 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), diff --git a/lib/pages/home/recommend_tab.dart b/lib/pages/home/recommend_tab.dart index b8ca852..8015e56 100644 --- a/lib/pages/home/recommend_tab.dart +++ b/lib/pages/home/recommend_tab.dart @@ -116,186 +116,6 @@ class _RecommendTabState extends State 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：禁用自身滚动 diff --git a/lib/pages/main/main_page.dart b/lib/pages/main/main_page.dart index e1c778e..559aa89 100644 --- a/lib/pages/main/main_page.dart +++ b/lib/pages/main/main_page.dart @@ -36,7 +36,7 @@ class _MainPageState extends State { 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 { super.initState(); // 初始化页面实例 - homePage = RealHomePage(); + homePage = HomePage(); // discoverPage = DiscoverPage(); timelinePage = TimelinePage(goMessage: goMessage,); messagePage = MessagePage(); diff --git a/lib/pages/mine/open_webview.dart b/lib/pages/mine/open_webview.dart index 3c70766..841531b 100644 --- a/lib/pages/mine/open_webview.dart +++ b/lib/pages/mine/open_webview.dart @@ -25,7 +25,7 @@ class _OpenWebViewState extends State { ..setNavigationDelegate( NavigationDelegate( onPageFinished: (url) async { - await controller.runJavaScript(_replaceTextJs()); + }, ), ) diff --git a/lib/pages/mine/real_login_page.dart b/lib/pages/mine/real_login_page.dart index beb4da4..65b8a2c 100644 --- a/lib/pages/mine/real_login_page.dart +++ b/lib/pages/mine/real_login_page.dart @@ -52,7 +52,7 @@ class _RealLoginPageState extends State { ), SizedBox(height: 12.w,), Text( - "星球奇遇记", + "趣恋恋", style: TextStyle( fontSize: 24.w ), diff --git a/lib/pages/setting/deactivate_page.dart b/lib/pages/setting/deactivate_page.dart index 76fe573..4358b58 100644 --- a/lib/pages/setting/deactivate_page.dart +++ b/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, diff --git a/pubspec.yaml b/pubspec.yaml index 9f1b329..202c244 100644 --- a/pubspec.yaml +++ b/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