Merge branch 'master' into docs

@@ -97,7 +97,7 @@ class ScreenUtil {
   /// Adapted to the device width of the UI Design.
   /// Adapted to the device width of the UI Design.
   /// Height can also be adapted according to this to ensure no deformation ,
   /// Height can also be adapted according to this to ensure no deformation ,
   /// if you want a square
   /// if you want a square
-  num setWidth(num width) => width * scaleWidth;
+  double setWidth(num width) => width * scaleWidth;
 
 
   /// 根据UI设计的设备高度适配
   /// 根据UI设计的设备高度适配
   /// 当发现UI设计中的一屏显示的与当前样式效果不符合时,
   /// 当发现UI设计中的一屏显示的与当前样式效果不符合时,
@@ -107,14 +107,14 @@ class ScreenUtil {
   /// It is recommended to use this method to achieve a high degree of adaptation
   /// It is recommended to use this method to achieve a high degree of adaptation
   /// when it is found that one screen in the UI design
   /// when it is found that one screen in the UI design
   /// does not match the current style effect, or if there is a difference in shape.
   /// does not match the current style effect, or if there is a difference in shape.
-  num setHeight(num height) => height * scaleHeight;
+  double setHeight(num height) => height * scaleHeight;
 
 
   ///字体大小适配方法
   ///字体大小适配方法
   ///- [fontSize] UI设计上字体的大小,单位px.
   ///- [fontSize] UI设计上字体的大小,单位px.
   ///Font size adaptation method
   ///Font size adaptation method
   ///- [fontSize] The size of the font on the UI design, in px.
   ///- [fontSize] The size of the font on the UI design, in px.
   ///- [allowFontScaling]
   ///- [allowFontScaling]
-  num setSp(num fontSize, {bool allowFontScalingSelf}) =>
+  double setSp(num fontSize, {bool allowFontScalingSelf}) =>
       allowFontScalingSelf == null
       allowFontScalingSelf == null
           ? (allowFontScaling
           ? (allowFontScaling
               ? (fontSize * scaleText)
               ? (fontSize * scaleText)

@@ -2,25 +2,25 @@ import 'package:flutter_screenutil/screenutil.dart';
 
 
 extension SizeExtension on num {
 extension SizeExtension on num {
   ///[ScreenUtil.setWidth]
   ///[ScreenUtil.setWidth]
-  num get w => ScreenUtil().setWidth(this);
+  double get w => ScreenUtil().setWidth(this);
 
 
   ///[ScreenUtil.setHeight]
   ///[ScreenUtil.setHeight]
-  num get h => ScreenUtil().setHeight(this);
+  double get h => ScreenUtil().setHeight(this);
 
 
   ///[ScreenUtil.setSp]
   ///[ScreenUtil.setSp]
-  num get sp => ScreenUtil().setSp(this);
+  double get sp => ScreenUtil().setSp(this);
 
 
   ///[ScreenUtil.setSp]
   ///[ScreenUtil.setSp]
-  num get ssp => ScreenUtil().setSp(this, allowFontScalingSelf: true);
+  double get ssp => ScreenUtil().setSp(this, allowFontScalingSelf: true);
 
 
   ///[ScreenUtil.setSp]
   ///[ScreenUtil.setSp]
-  num get nsp => ScreenUtil().setSp(this, allowFontScalingSelf: false);
+  double get nsp => ScreenUtil().setSp(this, allowFontScalingSelf: false);
 
 
   ///屏幕宽度的倍数
   ///屏幕宽度的倍数
   ///Multiple of screen width
   ///Multiple of screen width
-  num get wp => ScreenUtil().screenWidth * this;
+  double get wp => ScreenUtil().screenWidth * this;
 
 
   ///屏幕高度的倍数
   ///屏幕高度的倍数
   ///Multiple of screen height
   ///Multiple of screen height
-  num get hp => ScreenUtil().screenHeight * this;
+  double get hp => ScreenUtil().screenHeight * this;
 }
 }