更新
This commit is contained in:
@@ -18,7 +18,6 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
|
||||
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
|
||||
import 'package:vbvs_app/controller/device/body_device_controller.dart';
|
||||
import 'package:vbvs_app/controller/home/home_controller.dart';
|
||||
import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
|
||||
import 'package:vbvs_app/controller/person/person_controller.dart';
|
||||
import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
|
||||
import 'package:vbvs_app/controller/user_info_controller.dart';
|
||||
@@ -222,7 +221,7 @@ class _HomePageState extends State<HomePage> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
weatherModelController.getCurrentWeather();
|
||||
// weatherModelController.getCurrentWeather();
|
||||
return LayoutBuilder(
|
||||
builder: (context, bodySize) => GestureDetector(
|
||||
onTap: () {
|
||||
@@ -320,77 +319,86 @@ class _HomePageState extends State<HomePage> {
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.end,
|
||||
children: [
|
||||
Text(
|
||||
userInfoController.model.user!
|
||||
.nick_name ??
|
||||
'未命名'.tr,
|
||||
style: TextStyle(
|
||||
color: themeController
|
||||
.currentColor.sc3,
|
||||
fontSize: AppConstants()
|
||||
.normal_text_fontSize,
|
||||
Container(
|
||||
constraints: BoxConstraints(
|
||||
maxWidth:
|
||||
bodySize.maxWidth *
|
||||
0.6),
|
||||
child: Text(
|
||||
userInfoController.model.user!
|
||||
.nick_name ??
|
||||
'未命名'.tr,
|
||||
style: TextStyle(
|
||||
color: themeController
|
||||
.currentColor.sc3,
|
||||
fontSize: AppConstants()
|
||||
.normal_text_fontSize,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow:
|
||||
TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
Obx(() {
|
||||
return Row(
|
||||
children: [
|
||||
Text(
|
||||
"${weatherModelController.model.cityName ?? '未知数据'.tr}",
|
||||
style: TextStyle(
|
||||
color: themeController
|
||||
.currentColor.sc4,
|
||||
fontSize: AppConstants()
|
||||
.normal_text_fontSize,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
"${(weatherModelController.model.current_temperature != null && weatherModelController.model.current_temperature! > 0) ? weatherModelController.model.current_temperature : '未知数据'.tr}" +
|
||||
"°C",
|
||||
style: TextStyle(
|
||||
color: themeController
|
||||
.currentColor.sc4,
|
||||
fontSize: AppConstants()
|
||||
.normal_text_fontSize,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
"${(weatherModelController.model.weather_info?.isNotEmpty ?? false) ? weatherModelController.model.weather_info : '未知数据'.tr}",
|
||||
style: TextStyle(
|
||||
color: themeController
|
||||
.currentColor.sc4,
|
||||
fontSize: AppConstants()
|
||||
.normal_text_fontSize,
|
||||
),
|
||||
),
|
||||
if (weatherModelController
|
||||
.model
|
||||
.weatherIconurl !=
|
||||
null &&
|
||||
weatherModelController
|
||||
.model
|
||||
.weatherIconurl!
|
||||
.isNotEmpty)
|
||||
Container(
|
||||
width: 35.rpx,
|
||||
height: 26.rpx,
|
||||
clipBehavior:
|
||||
Clip.antiAlias,
|
||||
decoration:
|
||||
BoxDecoration(
|
||||
shape: BoxShape
|
||||
.circle),
|
||||
child: SvgPicture.asset(
|
||||
"assets/images/weather/${weatherModelController.model.weatherIconurl}-fill.svg",
|
||||
// fit: BoxFit.cover,
|
||||
color: themeController
|
||||
.currentColor.sc4,
|
||||
),
|
||||
),
|
||||
].divide(SizedBox(
|
||||
width: 20.rpx,
|
||||
)),
|
||||
);
|
||||
}),
|
||||
// Obx(() {
|
||||
// return Row(
|
||||
// children: [
|
||||
// Text(
|
||||
// "${weatherModelController.model.cityName ?? '未知数据'.tr}",
|
||||
// style: TextStyle(
|
||||
// color: themeController
|
||||
// .currentColor.sc4,
|
||||
// fontSize: AppConstants()
|
||||
// .normal_text_fontSize,
|
||||
// ),
|
||||
// ),
|
||||
// Text(
|
||||
// "${(weatherModelController.model.current_temperature != null && weatherModelController.model.current_temperature! > 0) ? weatherModelController.model.current_temperature : '未知数据'.tr}" +
|
||||
// "°C",
|
||||
// style: TextStyle(
|
||||
// color: themeController
|
||||
// .currentColor.sc4,
|
||||
// fontSize: AppConstants()
|
||||
// .normal_text_fontSize,
|
||||
// ),
|
||||
// ),
|
||||
// Text(
|
||||
// "${(weatherModelController.model.weather_info?.isNotEmpty ?? false) ? weatherModelController.model.weather_info : '未知数据'.tr}",
|
||||
// style: TextStyle(
|
||||
// color: themeController
|
||||
// .currentColor.sc4,
|
||||
// fontSize: AppConstants()
|
||||
// .normal_text_fontSize,
|
||||
// ),
|
||||
// ),
|
||||
// if (weatherModelController
|
||||
// .model
|
||||
// .weatherIconurl !=
|
||||
// null &&
|
||||
// weatherModelController
|
||||
// .model
|
||||
// .weatherIconurl!
|
||||
// .isNotEmpty)
|
||||
// Container(
|
||||
// width: 35.rpx,
|
||||
// height: 26.rpx,
|
||||
// clipBehavior:
|
||||
// Clip.antiAlias,
|
||||
// decoration:
|
||||
// BoxDecoration(
|
||||
// shape: BoxShape
|
||||
// .circle),
|
||||
// child: SvgPicture.asset(
|
||||
// "assets/images/weather/${weatherModelController.model.weatherIconurl}-fill.svg",
|
||||
// // fit: BoxFit.cover,
|
||||
// color: themeController
|
||||
// .currentColor.sc4,
|
||||
// ),
|
||||
// ),
|
||||
// ].divide(SizedBox(
|
||||
// width: 20.rpx,
|
||||
// )),
|
||||
// );
|
||||
// }),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -1066,6 +1074,7 @@ class _HomePageState extends State<HomePage> {
|
||||
})
|
||||
: [],
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
height:
|
||||
26.rpx), // 每个 widget 下方间距(包括最后一个)
|
||||
|
||||
Reference in New Issue
Block a user