diff --git a/assets/area_code/area_code_full.json b/assets/map_style/area_code_full.json similarity index 100% rename from assets/area_code/area_code_full.json rename to assets/map_style/area_code_full.json diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 19faaafa..4fb9367b 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/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 = 26; + 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.26; + 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 = 26; + 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.26; + 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 = 26; + 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.26; + MARKETING_VERSION = 2.0.27; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/community/community_view/class_details_video.dart b/lib/community/community_view/class_details_video.dart index 62611fde..dcf28316 100644 --- a/lib/community/community_view/class_details_video.dart +++ b/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; @@ -78,8 +79,10 @@ class ClassDetailsVideoState extends State { //自动播放 looping: false, //循环播放 - allowFullScreen: false, - // 允许的屏幕睡眠 + allowFullScreen: true, + //允许全屏 + allowedScreenSleep: true, + // 允许屏幕睡眠 materialProgressColors: chewie.ChewieProgressColors( playedColor: Colors.white, handleColor: Colors.white, @@ -97,6 +100,8 @@ class ClassDetailsVideoState extends State { @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, diff --git a/lib/login/phone_address_page.dart b/lib/login/phone_address_page.dart index b7529de7..cd7e50ad 100644 --- a/lib/login/phone_address_page.dart +++ b/lib/login/phone_address_page.dart @@ -27,7 +27,7 @@ class _PhoneAddressPage extends State { void areaCode() async { var value = - await rootBundle.loadString('assets/area_code/area_code_full.json'); + await rootBundle.loadString('assets/map_style/area_code_full.json'); areaMap = jsonDecode(value); areaMap.forEach((key, value) { areaList.add(key); diff --git a/lib/setting/platform_code_page.dart b/lib/setting/platform_code_page.dart index 101e9887..5611a7be 100644 --- a/lib/setting/platform_code_page.dart +++ b/lib/setting/platform_code_page.dart @@ -253,9 +253,8 @@ class _PlatformCodePage extends State { 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) { diff --git a/lib/setting/platform_pay_code.dart b/lib/setting/platform_pay_code.dart index ab3ce56b..6774e731 100644 --- a/lib/setting/platform_pay_code.dart +++ b/lib/setting/platform_pay_code.dart @@ -97,8 +97,7 @@ class _PlatformPayCode extends State { ), ), 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){ diff --git a/lib/setting/platform_pay_code_success.dart b/lib/setting/platform_pay_code_success.dart index df75d7f4..8ea2f13b 100644 --- a/lib/setting/platform_pay_code_success.dart +++ b/lib/setting/platform_pay_code_success.dart @@ -127,8 +127,7 @@ class _PlatformPayCodeSuccess extends State { ), ), 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){ diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index 0f7a4f8c..158d90ac 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -207,17 +207,7 @@ class _StoreOrderPage extends State @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 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 ), ), ], - ))); + )); } ///领取优惠券 diff --git a/pubspec.yaml b/pubspec.yaml index b6225673..e29f45e9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -111,7 +111,6 @@ flutter: - assets/image/2x/ - assets/image/3x/ - assets/map_style/ - - asstes/area_code/ - assets/riv/ - assets/svg/ # - assets/fonts/