diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle index def45c7..73d5bce 100644 --- a/circle_app/android/app/build.gradle +++ b/circle_app/android/app/build.gradle @@ -71,8 +71,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 21 targetSdkVersion flutter.targetSdkVersion - versionCode 14 - versionName "1.2.2" + versionCode 21 + versionName "1.2.7" manifestPlaceholders = [ vivo_APPID: "105669716", vivo_APPKEY:"84f750207787376b310ca5b0d5969122", diff --git a/circle_app/ios/Runner.xcodeproj/project.pbxproj b/circle_app/ios/Runner.xcodeproj/project.pbxproj index 52312c1..0fe606b 100644 --- a/circle_app/ios/Runner.xcodeproj/project.pbxproj +++ b/circle_app/ios/Runner.xcodeproj/project.pbxproj @@ -381,8 +381,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.2; - PRODUCT_BUNDLE_IDENTIFIER = com.exampe.circleApp; + MARKETING_VERSION = 1.2.5; + PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -530,8 +530,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.2; - PRODUCT_BUNDLE_IDENTIFIER = com.exampe.circleApp; + MARKETING_VERSION = 1.2.5; + PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -573,8 +573,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.2; - PRODUCT_BUNDLE_IDENTIFIER = com.exampe.circleApp; + MARKETING_VERSION = 1.2.5; + PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; diff --git a/circle_app/lib/app/circle/view.dart b/circle_app/lib/app/circle/view.dart index b1a1da7..526ed33 100644 --- a/circle_app/lib/app/circle/view.dart +++ b/circle_app/lib/app/circle/view.dart @@ -35,15 +35,19 @@ class _CirclePageState extends State late TabController _tabController; late PageController _pageController; + int currentIndex = 0; + @override bool get wantKeepAlive => true; + + @override void initState() { super.initState(); - int initIndex = Random().nextInt(3); - _pageController = PageController(initialPage: initIndex); - _tabController = TabController(length: 3, vsync: this, initialIndex: initIndex); + currentIndex = Random().nextInt(3); + _pageController = PageController(initialPage: currentIndex); + _tabController = TabController(length: 3, vsync: this, initialIndex: currentIndex); _tabController.addListener(_handleTabChange); } @@ -734,18 +738,24 @@ class _CirclePageState extends State ], ), onTap: (index) { + + if (currentIndex == index) { + if (index == 2) { + EventBusManager.fire(DiscovrScrollTap()); + } else if (index == 1) { + EventBusManager.fire(NearScrollTap()); + } else if (index == 0) { + EventBusManager.fire(ScrollToTop()); + } + return; + } + currentIndex = index; _pageController.animateToPage( index, // 目标页面索引 duration: const Duration(milliseconds: 300), // 动画时长 curve: Curves.ease, // 动画曲线 ); - if (index == 2) { - EventBusManager.fire(DiscovrScrollTap()); - } else if (index == 1) { - EventBusManager.fire(NearScrollTap()); - } else if (index == 0) { - EventBusManager.fire(ScrollToTop()); - } + }, ), ], diff --git a/circle_app/lib/app/dialog/UpdateDialog.dart b/circle_app/lib/app/dialog/UpdateDialog.dart index 721370e..ecd9b01 100644 --- a/circle_app/lib/app/dialog/UpdateDialog.dart +++ b/circle_app/lib/app/dialog/UpdateDialog.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - // import 'package:flutter_install_app/flutter_install_app.dart'; +import 'package:flutter_install_app/flutter_install_app.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -42,7 +42,7 @@ class _CustomDialogState extends State { child: Dialog( backgroundColor: Colors.transparent, child: Container( - height: 277.sp, + height: 317.sp, padding: const EdgeInsets.all(1.0), child: Stack( children: [ @@ -79,17 +79,17 @@ class _CustomDialogState extends State { style: TextStyle(color: Colors.white, fontSize: 16.sp), ), ), - Container( - margin: EdgeInsets.only(top: 14.sp), - alignment: Alignment.center, - child: Image( - image: AssetImage(getBaseImage("ic_launcher")), - width: 70.sp, - height: 70.sp, - ), - ), + // Container( + // margin: EdgeInsets.only(top: 14.sp), + // alignment: Alignment.center, + // child: Image( + // image: AssetImage(getBaseImage("ic_launcher")), + // width: 70.sp, + // height: 70.sp, + // ), + // ), SizedBox( - height: 65.sp, + height: 215.sp, child: ListView( children: [ Container( @@ -98,7 +98,7 @@ class _CustomDialogState extends State { alignment: Alignment.center, child: Text( widget.updateInfo.updateInfo, - textAlign: TextAlign.center, + textAlign: TextAlign.left, style: TextStyle( color: const Color(0xCCF7FAFA), fontSize: 16.sp), @@ -191,7 +191,7 @@ class _CustomDialogState extends State { }, child: Container( width: 200.sp, - margin: EdgeInsets.only(top: 24.sp), + margin: EdgeInsets.only(top: 10.sp), decoration: BoxDecoration( borderRadius: BorderRadius.circular(17), gradient: const LinearGradient( @@ -260,7 +260,7 @@ class _CustomDialogState extends State { // SmartDialog.dismiss(); print(error); }); - // await AppInstaller.installApk(filePath, actionRequired: false); + await AppInstaller.installApk(filePath, actionRequired: false); } } diff --git a/circle_app/lib/app/home/logic.dart b/circle_app/lib/app/home/logic.dart index a5a270f..513fa23 100644 --- a/circle_app/lib/app/home/logic.dart +++ b/circle_app/lib/app/home/logic.dart @@ -148,8 +148,6 @@ class HomeLogic extends GetxController { if (Platform.isAndroid) { setOfflinePushStatus(status: AppStatus.foreground); } - } else { - getUnreadSize(); } } catch (e) {} }