Compare commits

...

3 Commits
master ... hmxc

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB

@ -2,7 +2,7 @@ part 'sars_api.dart';
class API { class API {
///HOST ///HOST
static const String host = 'http://shop.kaidalai.cn'; static const String host = 'http://hmxc.kaidalai.cn';
/// ///
static const String baseURL = '$host/api/app'; static const String baseURL = '$host/api/app';

@ -1039,6 +1039,10 @@ class $AssetsImagesGen {
AssetGenImage get drawings => AssetGenImage get drawings =>
const AssetGenImage('assets/images/drawings.png'); const AssetGenImage('assets/images/drawings.png');
/// File path: assets/images/equipment_empty.png
AssetGenImage get equipmentEmpty =>
const AssetGenImage('assets/images/equipment_empty.png');
/// File path: assets/images/house_attestation.png /// File path: assets/images/house_attestation.png
AssetGenImage get houseAttestation => AssetGenImage get houseAttestation =>
const AssetGenImage('assets/images/house_attestation.png'); const AssetGenImage('assets/images/house_attestation.png');

@ -1,9 +1,9 @@
{ {
"appName": "智慧小区", "appName": "华脉新村小区",
"@appName": { "@appName": {
"description": "应用名称" "description": "应用名称"
}, },
"tempPlotName": "人才公寓智慧小区", "tempPlotName": "华脉新村小区",
"@tempPlotName": { "@tempPlotName": {
"description": "临时使用的小区名称" "description": "临时使用的小区名称"
} }

@ -2,6 +2,7 @@ import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/const/resource.dart';
import 'package:aku_new_community/pages/renovation_manage/renovation_manage_detail_page.dart'; import 'package:aku_new_community/pages/renovation_manage/renovation_manage_detail_page.dart';
import 'package:aku_new_community/pages/renovation_manage/renovation_map.dart'; import 'package:aku_new_community/pages/renovation_manage/renovation_map.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -55,7 +56,8 @@ class _RenovationManageCardState extends State<RenovationManageCard> {
], ],
), ),
24.w.heightBox, 24.w.heightBox,
_buildTile(R.ASSETS_ICONS_ARTICLE_NAME_PNG, '小区名称', '人才公寓'), _buildTile(R.ASSETS_ICONS_ARTICLE_NAME_PNG, '小区名称',
'${S.of(context)!.tempPlotName}'),
12.w.heightBox, 12.w.heightBox,
_buildTile( _buildTile(
R.ASSETS_ICONS_APPOINTMENT_ADDRESS_PNG, R.ASSETS_ICONS_APPOINTMENT_ADDRESS_PNG,

@ -3,6 +3,7 @@ import 'dart:math';
import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/const/resource.dart';
import 'package:aku_new_community/pages/renovation_manage/renovation_map.dart'; import 'package:aku_new_community/pages/renovation_manage/renovation_map.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -197,7 +198,7 @@ class _RenovationManageDetailPageState
[ [
_buildInfoCard( _buildInfoCard(
tag: '', tag: '',
midTop: '人才公寓', midTop: '${S.of(context)!.tempPlotName}',
midBottom: '1幢-1单元-302', midBottom: '1幢-1单元-302',
name: '业主:' + '马泽鹏', name: '业主:' + '马泽鹏',
phone: '13720183183', phone: '13720183183',

@ -3,6 +3,7 @@ import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart'; import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@Deprecated('弃用')
class RenovationManagePage extends StatefulWidget { class RenovationManagePage extends StatefulWidget {
RenovationManagePage({Key? key}) : super(key: key); RenovationManagePage({Key? key}) : super(key: key);

@ -3,6 +3,7 @@ import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/models/service_browse/service_browse_list_mode.dart'; import 'package:aku_new_community/models/service_browse/service_browse_list_mode.dart';
import 'package:aku_new_community/pages/service_browse/service_browse_detail_page.dart'; import 'package:aku_new_community/pages/service_browse/service_browse_detail_page.dart';
import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -89,7 +90,11 @@ class _ServiceBrowsePageState extends State<ServiceBrowsePage> {
32.w.heightBox, 32.w.heightBox,
Row( Row(
children: [ children: [
'南宁人才公寓'.text.size(20.sp).color(ktextSubColor).make(), '${S.of(context)!.tempPlotName}'
.text
.size(20.sp)
.color(ktextSubColor)
.make(),
Spacer(), Spacer(),
'发布于 ${DateUtil.formatDateStr(model.createDate, format: 'MM-dd HH:mm')}' '发布于 ${DateUtil.formatDateStr(model.createDate, format: 'MM-dd HH:mm')}'
.text .text

@ -1,6 +1,7 @@
import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/models/bracelet/bracelet_model.dart'; import 'package:aku_new_community/models/bracelet/bracelet_model.dart';
import 'package:aku_new_community/pages/services/old_age/add_equipment_page.dart';
import 'package:aku_new_community/pages/services/old_age/equipment_list_page.dart'; import 'package:aku_new_community/pages/services/old_age/equipment_list_page.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_divider.dart';
@ -60,63 +61,68 @@ class _OldAgeSupportPageSimpleState extends State<OldAgeSupportPageSimple> {
.make(), .make(),
], ],
); );
return BeeScaffold( return _model == null
title: 'X5手环', ? _emptyScaffold()
extendBody: true, : BeeScaffold(
actions: [ title: 'X5手环',
IconButton( extendBody: true,
icon: Icon(CupertinoIcons.repeat), actions: [
iconSize: 30.w, IconButton(
color: Colors.black, icon: Icon(CupertinoIcons.repeat),
onPressed: () { iconSize: 30.w,
Get.to(() => EquipmentListPage()); color: Colors.black,
}, onPressed: () {
) Get.to(() => EquipmentListPage());
], },
body: Container( )
width: double.infinity, ],
height: double.infinity, body: Container(
decoration: BoxDecoration( width: double.infinity,
image: DecorationImage( height: double.infinity,
alignment: Alignment.topCenter, decoration: BoxDecoration(
image: AssetImage(Assets.static.braceletHeader.path)), image: DecorationImage(
gradient: LinearGradient( alignment: Alignment.topCenter,
begin: Alignment.topCenter, image: AssetImage(Assets.static.braceletHeader.path)),
end: Alignment.bottomCenter, gradient: LinearGradient(
colors: [Colors.white, Color(0xFFC0E5DC).withOpacity(0.355)]), begin: Alignment.topCenter,
), end: Alignment.bottomCenter,
child: _model == null colors: [
? Container() Colors.white,
: SafeArea( Color(0xFFC0E5DC).withOpacity(0.355)
child: ListView( ]),
padding: EdgeInsets.symmetric(horizontal: 32.w),
children: [
400.w.heightBox,
open,
16.w.heightBox,
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
'数据更新自 ${DateUtil.formatDate(_date!, format: DateFormats.full)}'
.text
.size(22.sp)
.color(Colors.black.withOpacity(0.25))
.make(),
40.w.heightBox,
],
),
40.w.heightBox,
overview(),
24.w.heightBox,
statusCard(),
40.w.heightBox,
bottomCard(),
40.w.heightBox,
],
),
), ),
), child: _model == null
); ? Container()
: SafeArea(
child: ListView(
padding: EdgeInsets.symmetric(horizontal: 32.w),
children: [
400.w.heightBox,
open,
16.w.heightBox,
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
'数据更新自 ${DateUtil.formatDate(_date!, format: DateFormats.full)}'
.text
.size(22.sp)
.color(Colors.black.withOpacity(0.25))
.make(),
40.w.heightBox,
],
),
40.w.heightBox,
overview(),
24.w.heightBox,
statusCard(),
40.w.heightBox,
bottomCard(),
40.w.heightBox,
],
),
),
),
);
} }
Future getData() async { Future getData() async {
@ -517,4 +523,39 @@ class _OldAgeSupportPageSimpleState extends State<OldAgeSupportPageSimple> {
), ),
); );
} }
Widget _emptyScaffold() {
return BeeScaffold(
title: '智慧养老',
body: SafeArea(
child: Center(
child: Column(
children: [
Assets.images.equipmentEmpty.image(width: 480.w, height: 480.w),
'当前没有绑定任何设备'
.text
.size(28.sp)
.color(Colors.black.withOpacity(0.25))
.make(),
],
),
),
),
bottomNavi: Padding(
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w),
child: MaterialButton(
onPressed: () {
Get.to(() => AddEquipmentPage());
},
color: Color(0xFF5096F1),
padding: EdgeInsets.symmetric(vertical: 24.w),
minWidth: 686.w,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8.w),
),
child: '添加设备'.text.size(28.sp).white.make(),
),
),
);
}
} }

@ -26,6 +26,7 @@ class _SurroundingEnterprisesPageState
EasyRefreshController _refreshController = EasyRefreshController(); EasyRefreshController _refreshController = EasyRefreshController();
int _page = 1; int _page = 1;
int _size = 10; int _size = 10;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -94,7 +95,11 @@ class _SurroundingEnterprisesPageState
Spacer(), Spacer(),
Row( Row(
children: [ children: [
'南宁人才公寓'.text.size(20.sp).color(ktextThirdColor).make(), '${S.of(context)!.tempPlotName}'
.text
.size(20.sp)
.color(ktextThirdColor)
.make(),
Spacer(), Spacer(),
'发布于:${model.getReleaseDate}' '发布于:${model.getReleaseDate}'
.text .text

@ -8,6 +8,7 @@ import 'package:aku_new_community/ui/market/order/my_order_detail_page.dart';
import 'package:aku_new_community/ui/market/order/my_order_evaluation_page.dart'; import 'package:aku_new_community/ui/market/order/my_order_evaluation_page.dart';
import 'package:aku_new_community/ui/market/order/my_order_func.dart'; import 'package:aku_new_community/ui/market/order/my_order_func.dart';
import 'package:aku_new_community/ui/market/order/my_order_refund_page.dart'; import 'package:aku_new_community/ui/market/order/my_order_refund_page.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -128,7 +129,7 @@ class _MyOrderCardState extends State<MyOrderCard> {
40.w.heightBox, 40.w.heightBox,
...[ ...[
_rowTile('下单时间', widget.model.arrivalDateString), _rowTile('下单时间', widget.model.arrivalDateString),
_rowTile('到达地点', '人才公寓小区北侧门口'), _rowTile('到达地点', '${S.of(context)!.tempPlotName}北侧门口'),
_rowTile('发货时间', widget.model.sendDateString), _rowTile('发货时间', widget.model.sendDateString),
].sepWidget(separate: 16.w.heightBox), ].sepWidget(separate: 16.w.heightBox),
..._bottomWidget(), ..._bottomWidget(),

@ -6,7 +6,7 @@ import 'package:power_logger/power_logger.dart';
import 'package:web_socket_channel/io.dart'; import 'package:web_socket_channel/io.dart';
import 'package:web_socket_channel/web_socket_channel.dart'; import 'package:web_socket_channel/web_socket_channel.dart';
const String baseUri = 'wss://shop.kaidalai.cn/websocket/app'; const String baseUri = 'wss://hmxc.kaidalai.cn/websocket/app';
enum SOCKETSTATUS { enum SOCKETSTATUS {
CONNECTED, // CONNECTED, //
BREAKOFF, // BREAKOFF, //

Loading…
Cancel
Save