Merge remote-tracking branch 'Gitea/master' into iOS

# Conflicts:
#	pubspec.yaml

lib/components/commonFun.dart

@@ -23,6 +23,10 @@ import 'UserInfo.dart';
 import 'dioFun.dart';
 
 ////////////////////////////////////////////
+double g_radioImage = 10 / 16;  // 违章图片默认宽高比率
+
+
+
 AudioPlayer playerClick;
 AudioPlayer playerClacks;
 AudioPlayer playerVoiceRemind;
@@ -875,7 +879,7 @@ Widget getImageWidget() {
                   color: Color.fromRGBO(49, 216, 123, 1),
                   fontWeight: FontWeight.bold)),
         ),
-        SizedBox(height: ScreenUtil().setHeight(copyright_info.contains('\n') ? 40 : 90)),
+        SizedBox(height: ScreenUtil().setHeight(copyright_info.contains('\n') ? 25 : 90)),
         Container(
           alignment: Alignment.center,
           child: Text(copyright_info,