Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

# Conflicts:
#	lib/settlement/settlement_view/coupon.dart

android/app/build.gradle

@@ -90,7 +90,7 @@ def mfph = [
 ]
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

lib/community/community_view/course_banner.dart

@@ -37,6 +37,9 @@ class _CourseBanner extends State<CourseBanner> {
         child: Swiper(
             viewportFraction: 0.88,
             scale: 0.93,
+            autoplay: true,
+            duration: 1500,
+            autoplayDelay: 2500,
             pagination: SwiperPagination(
               alignment: Alignment.bottomCenter,
               builder: DotSwiperPaginationBuilder(

lib/home/home_view/home_banner.dart

@@ -36,6 +36,9 @@ class _HomeBanner extends State<HomeBanner> {
               color: Colors.white.withAlpha(76),
             ),
           ),
+          autoplay: true,
+          duration: 1500,
+          autoplayDelay: 2500,
           controller: widget.controller,
           physics: BouncingScrollPhysics(),
           itemBuilder: (context, position) {

lib/main_page.dart

@@ -73,7 +73,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
         break;
       case AppLifecycleState.resumed: //从后台切换前台，界面可见
         pushRoute();
-        if(DateTime.now().millisecondsSinceEpoch - lastTime > 300000)
+        if(DateTime.now().millisecondsSinceEpoch - lastTime > 420000)
           Navigator.of(context).popAndPushNamed('/router/main_page');
         break;
       case AppLifecycleState.paused: // 界面不可见，后台

lib/mine/mine_page.dart

@@ -137,7 +137,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
     // EasyLoading.dismiss();
   }
 
-  queryCoupon()async{
+  queryCoupon() async {
     SharedPreferences value = await SharedPreferences.getInstance();
     apiService = ApiService(
       Dio(),
@@ -260,20 +260,16 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
                             setState(() {
                               totalMsg = 0;
                             });
-                          }, totalMsg,
+                          }, totalMsg, infoNumber, ranks),
-                            infoNumber,
-                            ranks
-                          ),
 
                           ///订单/钱包/会员码/设置
-                          MineNavbar(
+                          MineNavbar(couponNum, userInfo, infoNumber, () {
-                            couponNum,
+                            toIntegralPage();
-                            userInfo,
+                          }, () {
-                            infoNumber,
+                            setState((){
-                            () {
+                              queryCoupon();
-                              toIntegralPage();
+                            });
-                            },
+                          }),
-                          ),
 
                           ///我的 VIP等级信息
                           // MineVipEntry(

lib/mine/mine_view/mine_navbar.dart

@@ -13,8 +13,9 @@ class MineNavbar extends StatefulWidget {
   final UserInfo userInfo;
   final SocialInfo infoNumber;
   final GestureTapCallback toIntegralPage;
+  final Function queryCoupon;
 
-  MineNavbar(this.couponNum,this.userInfo,this.infoNumber,this.toIntegralPage);
+  MineNavbar(this.couponNum,this.userInfo,this.infoNumber,this.toIntegralPage,this.queryCoupon);
 
   @override
   State<StatefulWidget> createState() {
@@ -161,6 +162,7 @@ class _MineNavbar extends State<MineNavbar> {
                         return;
                       }
                       Navigator.of(context).pushNamed('/router/coupon_page');
+                      widget.queryCoupon();
                     });
                   },
                   child: mineBottomItem(

lib/store/store_order.dart

@@ -515,12 +515,12 @@ class _StoreOrderPage extends State<StoreOrderPage>
                             Spacer(),
                             GestureDetector(
                               onTap: () {
-                                if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now()))
+                                // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now()))
-                                    &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){
+                                //     &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){
                                 toDownOrder();
-                                }
+                                // }
-                                else
+                                // else
-                                SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center);
+                                // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center);
                               },
                               child: RoundButton(
                                 width: 103.w,
@@ -676,6 +676,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
             color: Colors.white.withAlpha(76),
           ),
         ),
+        autoplay: true,
+        duration: 1500,
+        autoplayDelay: 2500,
         itemBuilder: (context, position) {
           return Container(
             child: MImage(

lib/utils/flutter_utils.dart

@@ -58,6 +58,7 @@ class AppUtils {
     return resString;
   }
 
+  ///坐标系转换
   static Future<BMFCoordinate> coordConvert(BMFCoordinate latLng) async {
     return BMFCalculateUtils.coordConvert(
         coordinate: latLng,

lib/view_widget/new_coupon_widget.dart

@@ -43,7 +43,7 @@ class NewCouponWidget extends StatelessWidget {
     // }
 
     return Container(
-      height: (coupon != null && coupon.isEx) ? 160.h : 140.h,
+      height: (coupon != null && coupon.isEx) ? 163.h : 143.h,
       width: double.infinity,
       margin: EdgeInsets.fromLTRB(14.w, 6.h, 14.w, 6.h),
       padding: EdgeInsets.only(right: 5),

pubspec.yaml

@@ -3,7 +3,7 @@ description: 一心回乡.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 3.2.4+48
+version: 3.2.10+55
 
 environment:
   sdk: ">=2.7.0 <3.0.0"