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

# Conflicts:
#	lib/community/community_view/class_details_video.dart

ios/Runner.xcodeproj/project.pbxproj

@@ -616,7 +616,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -666,7 +666,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.25;
+				MARKETING_VERSION = 2.0.27;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -816,7 +816,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -866,7 +866,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.25;
+				MARKETING_VERSION = 2.0.27;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -907,7 +907,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -957,7 +957,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.25;
+				MARKETING_VERSION = 2.0.27;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

lib/community/community_view/class_details_video.dart

@@ -4,6 +4,7 @@ import 'package:chewie/src/chewie_progress_colors.dart' as chewie;
 import 'package:flutter/services.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:video_player/video_player.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class ClassDetailsVideo extends StatefulWidget {
   final Function(bool isShowImg) changeShowImg;
@@ -99,6 +100,8 @@ class ClassDetailsVideoState extends State<ClassDetailsVideo> {
   @override
   Widget build(BuildContext context) {
     return Container(
+    padding: EdgeInsets.only(top: (Theme.of(context).platform == TargetPlatform.android) ? 0 : 70.h),
+        color: Colors.black,
         key: globalKey,child:(videoPlayerController?.value?.isInitialized ?? false) ? videoWidget(
       MediaQuery.of(context).size.height,
       (MediaQuery.of(context).size.height/videoPlayerController.value.aspectRatio)-43,

lib/setting/platform_code_page.dart

@@ -253,9 +253,8 @@ class _PlatformCodePage extends State<PlatformCodePage> {
             height: 14.h,
           ),
           Container(
-            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 48.w,left: 48.w),
-            // padding: EdgeInsets.only(left: 48.w, right: 48.w),
-            height: 55.h,
+            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 55.w,left: 55.w),
+            height: 58.h,
             child: PinInputTextField(
               pinLength: 4,
               onChanged: (txt) {

lib/setting/platform_pay_code.dart

@@ -97,8 +97,7 @@ class _PlatformPayCode extends State<PlatformPayCode> {
             ),
           ),
           Container(
-            margin: EdgeInsets.only(top: 24.h, bottom: 31.h),
-            padding: EdgeInsets.only(left: 48.w, right: 48.w),
+            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 35.w,left: 35.w),
             height: 45.h,
             child: PinInputTextField(
               onChanged: (txtCode){

lib/setting/platform_pay_code_success.dart

@@ -127,8 +127,7 @@ class _PlatformPayCodeSuccess extends State<PlatformPayCodeSuccess> {
             ),
           ),
           Container(
-            margin: EdgeInsets.only(top: 24.h, bottom: 31.h),
-            padding: EdgeInsets.only(left: 48.w, right: 48.w),
+            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 35.w,left: 35.w),
             height: 45.h,
             child: PinInputTextField(
               onChanged: (txtCode){

lib/store/store_order.dart

@@ -207,17 +207,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-        onWillPop: () async {
-          if (dialogShowing) {
-            debugPrint("ssssasdadsasdadasd");
-            SmartDialog.dismiss();
-            return false;
-          } else {
-            return true;
-          }
-        },
-        child:Container(
+    return Container(
         color: Colors.white,
         child: Stack(
           children: [
@@ -373,36 +363,36 @@ class _StoreOrderPage extends State<StoreOrderPage>
                             EdgeInsets.symmetric(horizontal: 10.w),
                             width: MediaQuery.of(context).size.width,
                             child: Theme(
-                              data: ThemeData(
-                                splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
-                                highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
-                              ),
-                              child: TabBar(
-                              controller: tabcontroller,
-                              automaticIndicatorColorAdjustment: true,
-                              isScrollable: true,
-                              indicatorWeight: 3,
-                              indicatorColor: Color(0xFF32A060),
-                              labelPadding: EdgeInsets.only(
-                                left: 8.w,
-                                right: 8.w,
-                              ),
-                              indicatorSize: TabBarIndicatorSize.label,
-                              unselectedLabelStyle: TextStyle(
-                                fontSize: 15.sp,
-                                fontWeight: FontWeight.w400,
-                              ),
-                              labelStyle: TextStyle(
-                                color: Colors.black,
-                                fontSize: 18.sp,
-                                fontWeight: FontWeight.bold,
-                              ),
-                              labelColor: Colors.black,
-                              tabs: [
-                                MyTab(text: S.of(context).diandan),
-                                // MyTab(text: ""),
-                              ],
-                            )),
+                                data: ThemeData(
+                                  splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
+                                  highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
+                                ),
+                                child: TabBar(
+                                  controller: tabcontroller,
+                                  automaticIndicatorColorAdjustment: true,
+                                  isScrollable: true,
+                                  indicatorWeight: 3,
+                                  indicatorColor: Color(0xFF32A060),
+                                  labelPadding: EdgeInsets.only(
+                                    left: 8.w,
+                                    right: 8.w,
+                                  ),
+                                  indicatorSize: TabBarIndicatorSize.label,
+                                  unselectedLabelStyle: TextStyle(
+                                    fontSize: 15.sp,
+                                    fontWeight: FontWeight.w400,
+                                  ),
+                                  labelStyle: TextStyle(
+                                    color: Colors.black,
+                                    fontSize: 18.sp,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                  labelColor: Colors.black,
+                                  tabs: [
+                                    MyTab(text: S.of(context).diandan),
+                                    // MyTab(text: ""),
+                                  ],
+                                )),
                           ),
                         ),
                       ),
@@ -550,7 +540,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
               ),
             ),
           ],
-        )));
+        ));
   }
 
   ///领取优惠券