xt / Flutter-ReserveApp · Commits

Go to a project

Commit ebeb6a5944bd6491a693639d56b48ccf201944cf

Authored by wdn127929
1 parent 9bd55fde
build: skipped

应用内更新弹框提示页面字体大小不跟随系统字体改变

Inline Side-by-side
Showing 8 changed files with 62 additions and 21 deletions
... ... @@ -18,19 +18,19 @@ if (flutterRoot == null) {
def flutterVersionCode = "520"
def flutterVersionCode = "519"
if (flutterVersionCode == null) {
flutterVersionCode = '520'
flutterVersionCode = '519'
}
def flutterVersionName = "5.2.0"
def flutterVersionName = "5.1.9"
if (flutterVersionName == null) {
flutterVersionName = '5.2.0'
flutterVersionName = '5.1.9'
}
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
class CommentsModel {
... ... @@ -210,6 +211,7 @@ class CommentsImageModel {
ImageAve imageAve;
String url;
String avinfo;
CommentsImageModel(
{this.key,
... ... @@ -220,9 +222,10 @@ class CommentsImageModel {
this.imageInfo,
this.imageAve,
this.url,
this.avinfo});
this.avinfo,
});
CommentsImageModel.fromJson(Map<String, dynamic> json) {
CommentsImageModel.fromJson(Map<String, dynamic> json) {
key = json['key'];
bucket = json['bucket'];
mimeType = json['mimeType'];
... ... @@ -237,6 +240,8 @@ class CommentsImageModel {
url = json['url'];
avinfo = json['avinfo'] == null ? null : jsonEncode(json['avinfo']);
print(avinfo);
}
Map<String, dynamic> toJson() {
... ...
... ... @@ -194,6 +194,8 @@ class _CommentManageHomePageState extends State<CommentManageHomePage> {
/// 九宫格
Widget _getGridImg(List<CommentsImageModel> imags) {
imags.removeWhere((element) => element.url == null || element.url == '');
return GridView.builder(
controller: controller,
padding: EdgeInsets.symmetric(vertical: w(7)),
... ... @@ -210,7 +212,7 @@ class _CommentManageHomePageState extends State<CommentManageHomePage> {
crossAxisSpacing: w(7),
//子组件宽高长度比例
childAspectRatio: 1.0),
itemBuilder: (BuildContext context, int index) {
itemBuilder: (BuildContext context, int index){
if (imags[index].avinfo != null &&
imags[index].avinfo != 'false' &&
imags[index].avinfo != '0') {
... ...
import 'package:flutter/material.dart';
import 'package:one_key/constant/state.dart';
import 'package:video_compress/video_compress.dart';
import '../constant/constant.dart';
import '../constant/error.dart';
... ... @@ -41,7 +42,6 @@ class CommentManageProvider extends ChangeNotifier {
return false;
});
if (baseResp.code == Constant.status_success) {
notifyListeners();
return true;
// } else {
... ...
... ... @@ -29,6 +29,7 @@ import '../app.dart';
import '../utils/dialog_util.dart';
import 'package:device_utils_my/device_utils_my.dart';
import '../widgets/fixed_text.dart';
typedef VeisonCallback = void Function(Version value);
... ... @@ -175,14 +176,18 @@ class UpdateModelMy {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
constraints: BoxConstraints(
maxHeight: ScreenUtil().screenHeight -
ScreenUtil().setWidth(350)),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(60)),
child: Column(
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Center(
child: Text(
child: FixedText(
"${version.name}版本更新啦",
style: TextStyle(
fontSize: ScreenUtil().setSp(36),
... ... @@ -190,14 +195,14 @@ class UpdateModelMy {
),
),
VEmptyView(20),
Text(
FixedText(
version.content,
style: TextStyle(
fontSize: ScreenUtil().setSp(28),
color: MyColours.color_353535),
)
],
),
)),
),
VEmptyView(40),
MyDivider(double.infinity, ScreenUtil().setWidth(1)),
... ... @@ -210,7 +215,7 @@ class UpdateModelMy {
onTap: () {
Navigator.of(context).pop();
},
child: Text(
child: FixedText(
"下次一定",
style: TextStyle(
fontSize: ScreenUtil().setSp(34),
... ... @@ -238,7 +243,7 @@ class UpdateModelMy {
"itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=1510697490");
}
},
child: Text(
child: FixedText(
"立即更新",
style: TextStyle(
fontSize: ScreenUtil().setSp(34),
... ...
import 'package:flutter/material.dart';
class FixedText extends Text {
const FixedText(
String data, {
Key key,
TextStyle style,
StrutStyle strutStyle,
TextAlign textAlign,
TextDirection textDirection,
Locale locale,
bool softWrap,
TextOverflow overflow,
double textScaleFactor = 1.0,
int maxLines,
String semanticsLabel,
}) : super(data,
key: key,
style: style,
strutStyle: strutStyle,
textAlign: textAlign,
textDirection: textDirection,
locale: locale,
softWrap: softWrap,
overflow: overflow,
textScaleFactor: textScaleFactor,
maxLines: maxLines,
semanticsLabel: semanticsLabel);
}
... ...
... ... @@ -1513,40 +1513,40 @@ packages:
source: hosted
version: "3.1.1"
video_player:
dependency: transitive
dependency: "direct main"
description:
name: video_player
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.7"
version: "2.7.0"
video_player_android:
dependency: transitive
description:
name: video_player_android
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.3.5"
version: "2.4.9"
video_player_avfoundation:
dependency: transitive
description:
name: video_player_avfoundation
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.3.4"
version: "2.4.9"
video_player_platform_interface:
dependency: transitive
description:
name: video_player_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.1.2"
version: "6.2.0"
video_player_web:
dependency: transitive
description:
name: video_player_web
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.10"
version: "2.0.16"
video_thumbnail:
dependency: "direct main"
description:
... ...
... ... @@ -153,7 +153,7 @@ dependencies:
sign_in_with_apple: ^4.3.0
video_thumbnail: ^0.5.3
# video_player: ^2.4.7
# video_player: ^2.7.0
video_player: ^2.7.0
# video_player: ^2.4.2
# video_player: ^2.2.12
# ^2.4.7
... ...