【需求】跟随设计稿方向

@@ -18,6 +18,7 @@ class ScreenUtil {
 
 
   static bool Function() _enableScaleWH = () => true;
   static bool Function() _enableScaleWH = () => true;
   static bool Function() _enableScaleText = () => true;
   static bool Function() _enableScaleText = () => true;
+  static bool Function() _useDesignOrientation = () => false;
 
 
 
 
   /// UI设计中手机尺寸 , dp
   /// UI设计中手机尺寸 , dp
@@ -27,6 +28,9 @@ class ScreenUtil {
   ///屏幕方向
   ///屏幕方向
   late Orientation _orientation;
   late Orientation _orientation;
 
 
+  ///设计稿方向
+  late Orientation _designOrientation;
+
   late bool _minTextAdapt;
   late bool _minTextAdapt;
   late MediaQueryData _data;
   late MediaQueryData _data;
   late bool _splitScreenMode;
   late bool _splitScreenMode;
@@ -41,9 +45,10 @@ class ScreenUtil {
   /// if the enableWH return false, the width and the height scale ratio will be 1
   /// if the enableWH return false, the width and the height scale ratio will be 1
   /// if the enableText return false, the text scale ratio will be 1
   /// if the enableText return false, the text scale ratio will be 1
   ///
   ///
-  static void enableScale({bool Function()? enableWH, bool Function()? enableText}) {
+  static void enableScale({bool Function()? enableWH, bool Function()? enableText,  bool Function()? useDesignOrientation}) {
     _enableScaleWH = enableWH ?? () => true;
     _enableScaleWH = enableWH ?? () => true;
     _enableScaleText = enableText ?? () => true;
     _enableScaleText = enableText ?? () => true;
+    _useDesignOrientation = useDesignOrientation?? () => false;
   }
   }
 
 
   /// Manually wait for window size to be initialized
   /// Manually wait for window size to be initialized
@@ -138,11 +143,16 @@ class ScreenUtil {
             ? Orientation.landscape
             ? Orientation.landscape
             : Orientation.portrait);
             : Orientation.portrait);
 
 
+    final designOrientation = designSize.width > designSize.height
+            ? Orientation.landscape
+            : Orientation.portrait;
+
     _instance
     _instance
       ..fontSizeResolver = fontSizeResolver ?? _instance.fontSizeResolver
       ..fontSizeResolver = fontSizeResolver ?? _instance.fontSizeResolver
       .._minTextAdapt = minTextAdapt ?? _instance._minTextAdapt
       .._minTextAdapt = minTextAdapt ?? _instance._minTextAdapt
       .._splitScreenMode = splitScreenMode ?? _instance._splitScreenMode
       .._splitScreenMode = splitScreenMode ?? _instance._splitScreenMode
-      .._orientation = orientation;
+      .._orientation = orientation
+      .._designOrientation = designOrientation;
 
 
     _instance._elementsToRebuild?.forEach((el) => el.markNeedsBuild());
     _instance._elementsToRebuild?.forEach((el) => el.markNeedsBuild());
   }
   }
@@ -213,12 +223,13 @@ class ScreenUtil {
 
 
   /// 实际尺寸与UI设计的比例
   /// 实际尺寸与UI设计的比例
   /// The ratio of actual width to UI design
   /// The ratio of actual width to UI design
-  double get scaleWidth => !_enableScaleWH() ? 1 : screenWidth / _uiSize.width;
+  double get scaleWidth => !_enableScaleWH() ? 1 : screenWidth /
+      ((_useDesignOrientation() && _designOrientation != _orientation)? _uiSize.height : _uiSize.width);
 
 
   /// The ratio of actual height to UI design
   /// The ratio of actual height to UI design
   double get scaleHeight =>
   double get scaleHeight =>
       !_enableScaleWH() ? 1 : (_splitScreenMode ? max(screenHeight, 700) : screenHeight) /
       !_enableScaleWH() ? 1 : (_splitScreenMode ? max(screenHeight, 700) : screenHeight) /
-      _uiSize.height;
+          ((_useDesignOrientation() && _designOrientation != _orientation)? _uiSize.width : _uiSize.height);
 
 
   double get scaleText =>
   double get scaleText =>
       !_enableScaleText() ? 1 : (_minTextAdapt ? min(scaleWidth, scaleHeight) : scaleWidth);
       !_enableScaleText() ? 1 : (_minTextAdapt ? min(scaleWidth, scaleHeight) : scaleWidth);

@@ -76,9 +76,10 @@ class ScreenUtilInit extends StatefulWidget {
     this.ensureScreenSize = false,
     this.ensureScreenSize = false,
     this.enableScaleWH,
     this.enableScaleWH,
     this.enableScaleText,
     this.enableScaleText,
+    this.useDesignOrientation,
     this.responsiveWidgets,
     this.responsiveWidgets,
     this.excludeWidgets,
     this.excludeWidgets,
-    this.fontSizeResolver = FontSizeResolvers.width,
+    this.fontSizeResolver = FontSizeResolvers.width
   }) : super(key: key);
   }) : super(key: key);
 
 
   final ScreenUtilInitBuilder? builder;
   final ScreenUtilInitBuilder? builder;
@@ -89,6 +90,7 @@ class ScreenUtilInit extends StatefulWidget {
   final bool ensureScreenSize;
   final bool ensureScreenSize;
   final bool Function()? enableScaleWH;
   final bool Function()? enableScaleWH;
   final bool Function()? enableScaleText;
   final bool Function()? enableScaleText;
+  final bool Function()? useDesignOrientation;
   final RebuildFactor rebuildFactor;
   final RebuildFactor rebuildFactor;
   final FontSizeResolver fontSizeResolver;
   final FontSizeResolver fontSizeResolver;
 
 
@@ -114,7 +116,7 @@ class _ScreenUtilInitState extends State<ScreenUtilInit> with WidgetsBindingObse
       _canMarkedToBuild.addAll(widget.responsiveWidgets!);
       _canMarkedToBuild.addAll(widget.responsiveWidgets!);
     }
     }
 
 
-    ScreenUtil.enableScale(enableWH: widget.enableScaleWH, enableText: widget.enableScaleText);
+    ScreenUtil.enableScale(enableWH: widget.enableScaleWH, enableText: widget.enableScaleText, useDesignOrientation: widget.useDesignOrientation);
 
 
     _validateSize().then(_screenSizeCompleter.complete);
     _validateSize().then(_screenSizeCompleter.complete);