Showing
6 changed files
with
18 additions
and
12 deletions
| @@ -83,8 +83,8 @@ android { | @@ -83,8 +83,8 @@ android { | ||
| 83 | 83 | ||
| 84 | ndk { | 84 | ndk { |
| 85 | //选择要添加的对应 cpu 类型的 .so 库。 | 85 | //选择要添加的对应 cpu 类型的 .so 库。 |
| 86 | - abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位,不支持32位 | ||
| 87 | - // abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' | 86 | + // abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位,不支持32位 |
| 87 | + abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' | ||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | lintOptions { | 90 | lintOptions { |
| @@ -3253,8 +3253,11 @@ class Utils { | @@ -3253,8 +3253,11 @@ class Utils { | ||
| 3253 | textPainter.layout(); // 布局文本 | 3253 | textPainter.layout(); // 布局文本 |
| 3254 | final width = textPainter.size.width; // 获取宽度 | 3254 | final width = textPainter.size.width; // 获取宽度 |
| 3255 | 3255 | ||
| 3256 | - Rect rect = Rect.fromLTWH((images.width.toDouble() - width - 5*scaleX*2) / 2, | ||
| 3257 | - 56 * scaleY, width + 5*scaleX*2, 30 * scaleY); | 3256 | + Rect rect = Rect.fromLTWH( |
| 3257 | + (images.width.toDouble() - width - 5 * scaleX * 2) / 2, | ||
| 3258 | + 56 * scaleY, | ||
| 3259 | + width + 5 * scaleX * 2, | ||
| 3260 | + 30 * scaleY); | ||
| 3258 | paint.color = MyColours.color_66FFEFC5; | 3261 | paint.color = MyColours.color_66FFEFC5; |
| 3259 | RRect rRect = RRect.fromRectAndRadius(rect, Radius.circular(6)); | 3262 | RRect rRect = RRect.fromRectAndRadius(rect, Radius.circular(6)); |
| 3260 | canvas.drawRRect(rRect, paint); | 3263 | canvas.drawRRect(rRect, paint); |
| @@ -3273,11 +3276,13 @@ class Utils { | @@ -3273,11 +3276,13 @@ class Utils { | ||
| 3273 | pb.addText(room); | 3276 | pb.addText(room); |
| 3274 | 3277 | ||
| 3275 | // 设置文本的宽度约束 | 3278 | // 设置文本的宽度约束 |
| 3276 | - ParagraphConstraints pc = | ||
| 3277 | - ui.ParagraphConstraints(width: width); | 3279 | + ParagraphConstraints pc = ui.ParagraphConstraints(width: width); |
| 3278 | ui.Paragraph paragraph = pb.build()..layout(pc); | 3280 | ui.Paragraph paragraph = pb.build()..layout(pc); |
| 3279 | - canvas.drawParagraph(paragraph, | ||
| 3280 | - Offset((images.width.toDouble() - width - 5*scaleX*2) / 2+5*scaleX , 64 * scaleY)); | 3281 | + canvas.drawParagraph( |
| 3282 | + paragraph, | ||
| 3283 | + Offset( | ||
| 3284 | + (images.width.toDouble() - width - 5 * scaleX * 2) / 2 + 5 * scaleX, | ||
| 3285 | + 64 * scaleY)); | ||
| 3281 | 3286 | ||
| 3282 | // 绘制文字 | 3287 | // 绘制文字 |
| 3283 | ui.ParagraphBuilder pb3 = ui.ParagraphBuilder(ui.ParagraphStyle( | 3288 | ui.ParagraphBuilder pb3 = ui.ParagraphBuilder(ui.ParagraphStyle( |
| @@ -3644,7 +3649,7 @@ class Utils { | @@ -3644,7 +3649,7 @@ class Utils { | ||
| 3644 | mname = '晚上'; | 3649 | mname = '晚上'; |
| 3645 | } | 3650 | } |
| 3646 | dsoltStr = mname; | 3651 | dsoltStr = mname; |
| 3647 | - } else if (liteStyle == '3') { | 3652 | + } else if (liteStyle == '3' || liteStyle == '4') { |
| 3648 | dsoltStr = mname; | 3653 | dsoltStr = mname; |
| 3649 | } | 3654 | } |
| 3650 | return dsoltStr; | 3655 | return dsoltStr; |
| @@ -3696,9 +3701,10 @@ class Utils { | @@ -3696,9 +3701,10 @@ class Utils { | ||
| 3696 | weekAndDsolt); | 3701 | weekAndDsolt); |
| 3697 | } else if (liteStyle == '4') { | 3702 | } else if (liteStyle == '4') { |
| 3698 | String month = | 3703 | String month = |
| 3699 | - '${Utils.addZeroNumber(DateTime.now().month)}月${Utils.addZeroNumber(DateTime.now().day)}日'; | ||
| 3700 | - String week = returnWeek(DateTime.now(), context); | ||
| 3701 | - String section = '午餐'; | 3704 | + '${Utils.addZeroNumber(dateTime.month)}月${Utils.addZeroNumber(dateTime.day)}日'; |
| 3705 | + String week = returnWeek(dateTime, context); | ||
| 3706 | + String section = | ||
| 3707 | + _getDsoltStrShowOld(ddateHm, liteStyle, ddateSolt, mname); | ||
| 3702 | String time = week + section; | 3708 | String time = week + section; |
| 3703 | 3709 | ||
| 3704 | _thumbnailUint8List = await canva4( | 3710 | _thumbnailUint8List = await canva4( |
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
-
Please register or login to post a comment