戴余标 3 years ago
commit 1c56e8be7f

@ -1,4 +1,4 @@
{
"flutterSdkVersion": "2.8.1",
"flutterSdkVersion": "2.8.0",
"flavors": {}
}

@ -15,4 +15,12 @@
## AMap Location
-keep class com.amap.api.location.**{*;}
-keep class com.amap.api.fence.**{*;}
-keep class com.loc.**{*;}
-keep class com.autonavi.aps.amapapi.model.**{*;}
##搜索
-keep class com.amap.api.services.**{*;}
##2D地图
-keep class com.amap.api.maps2d.**{*;}
-keep class com.amap.api.mapcore2d.**{*;}

@ -4,7 +4,7 @@
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application android:label="小蜜蜂管家"
<application android:label="小蜜蜂管家"
android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
<service android:name="com.amap.api.location.APSService"/>
<meta-data android:name="com.amap.api.v2.apikey" android:value="0c11d9ba47089d971dc4d889b66593ab"/>

@ -27,9 +27,9 @@ import 'package:provider/provider.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
JPush jpush = new JPush();
const isProduct =
const bool.fromEnvironment('ISPRODUCT', defaultValue: false);
DevUtil.setDev(!isProduct);
const isDev =
const String.fromEnvironment('ENV', defaultValue: 'dev')=='dev';
DevUtil.setDev(isDev);
WebSocketUtil().initWebSocket(
// heartDuration: Duration(seconds: 5),
onError: (e) {
@ -96,7 +96,15 @@ class MyApp extends StatelessWidget {
title: '小蜜蜂管家',
theme: AppTheme.theme,
home: SplashPage(),
builder: BotToastInit(),
builder: (context, widget) {
ScreenUtil.setContext(context);
return MediaQuery(
//Setting font does not change with system font size
data:
MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
child: BotToastInit().call(context, widget),
);
},
navigatorObservers: [
BotToastNavigatorObserver(),
],

@ -47,7 +47,11 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
@override
Widget build(BuildContext context) {
return AkuScaffold(
return WillPopScope(
onWillPop: () async {
return false;
},
child: AkuScaffold(
title: '',
backgroundColor: Colors.white,
body: Column(
@ -73,6 +77,7 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
BottomTip(),
],
),
),
);
}

@ -44,7 +44,11 @@ class _SetPsdPageState extends State<SetPsdPage> {
@override
Widget build(BuildContext context) {
return AkuScaffold(
return WillPopScope(
onWillPop: () async {
return false;
},
child: AkuScaffold(
title: '',
backgroundColor: Colors.white,
body: Column(
@ -78,7 +82,8 @@ class _SetPsdPageState extends State<SetPsdPage> {
144.w.heightBox,
PsdTextField(controller: _psdController, hintText: '请输入密码'),
24.w.heightBox,
PsdTextField(controller: _confirmPsdController, hintText: '请再次输入密码'),
PsdTextField(
controller: _confirmPsdController, hintText: '请再次输入密码'),
16.w.heightBox,
PsdVerify.checkString(psdCheck)
.text
@ -100,6 +105,7 @@ class _SetPsdPageState extends State<SetPsdPage> {
text: '确认'),
],
),
),
);
}
}

@ -71,7 +71,8 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
onRefresh: () async {
_models = [];
_page = 1;
var base = await NetUtil().getList(SAASAPI.householdAudit.list,params: {
var base = await NetUtil().getList(SAASAPI.householdAudit.list,
params: {
'pageNum': _page,
'size': _size,
'status': index == 0 ? null : index
@ -83,7 +84,8 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
},
onLoad: () async {
_page++;
var base = await NetUtil().getList(SAASAPI.householdAudit.list,params: {
var base = await NetUtil().getList(SAASAPI.householdAudit.list,
params: {
'pageNum': _page,
'size': _size,
'status': index == 0 ? null : index
@ -134,7 +136,7 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
])),
child: Row(
children: [
'2栋1单元502室'
'${model.houseName}'
.text
.size(32.sp)
.color(Colors.black.withOpacity(0.85))
@ -173,13 +175,12 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
children: [
SizedBox(
width: 160.w,
child: '申请身份'
child: '联系方式'
.text
.size(28.sp)
.color(Colors.black.withOpacity(0.45))
.make()),
_identity[model.identity]!
.text
model.tel.text
.size(28.sp)
.color(Colors.black.withOpacity(0.85))
.make(),

@ -43,14 +43,12 @@ class _NewHomePageState extends State<NewHomePage> {
}
Future _getToDoList() async {
//type
var base = await NetUtil().get(SAASAPI.home.todoList);
_todoModels =
(base.data as List).map((e) => HomeTodoListModel.fromJson(e)).toList();
}
Future _getStatusNum() async {
//type
var base = await NetUtil().get(SAASAPI.home.statusNum);
_homeNums = HomeStatusNumberModel.fromJson(base.data);
}
@ -348,7 +346,7 @@ class _NewHomePageState extends State<NewHomePage> {
children: _todoModels
.mapIndexed((currentValue, index) =>
_todoListCard(currentValue, index))
.toList(),
.toList().sepWidget(separate: 20.w.widthBox),
),
),
],

@ -16,9 +16,12 @@ class HouseholdAuditListModel extends Equatable {
final String idCard;
final int status;
final String estateTypeName;
factory HouseholdAuditListModel.fromJson(Map<String, dynamic> json) =>
_$HouseholdAuditListModelFromJson(json);
String get houseName => buildingName + '' + unitName + '单元' + estateName;
const HouseholdAuditListModel({
required this.estateReviewId,
required this.name,
@ -32,6 +35,7 @@ class HouseholdAuditListModel extends Equatable {
required this.status,
required this.estateTypeName,
});
@override
List<Object?> get props => [
estateReviewId,

@ -16,218 +16,153 @@ class AgreementPage extends StatelessWidget {
padding: EdgeInsets.all(16.w),
child: Text(
'''
20220325
使
使 线
 使 便
 使        使           
              
  使 CookiesSDK 
  
 访  
14 使
kaidalai@163.com
线
20220325
20220327
kaidalai@163.com7
1
2使
3
4
5
6
7
8
9
便使使线
使
使
1
使
AndroidV8.0.0iOSV7.4.0访->
使使使
使
2
便使  
3
使使
4
apppdf使使
5
Android 使
1   使
2 SDK MACAPPlist
3   
 Android使 Android访
  crash  
使WLANWLANWLANWLAN WiFi 使WLANWLANWLANWLAN
退 / 使 / 退
  
使      
  iOS
使PCTVweb   使 
v8.5.3 使  使
toast使  
便    APP--
IDID 使IFAAiOS使ID  IDIDiOS IDID   使IFAAiOS使ID APP
WLANWLAN访   Wi-Fi SSID 使   WLAN WLAN WLAN WLANWLANWLAN   访 使
使  使使 使  便
使  使 Android6.0
使 使 使 使 Bonjour Apple TV
iOS 使 AndroidiOS 
SDK使
使APP使使SDK 使SDKSDKSDK SDK使SDKSDKSDK
使Cookie
1Cookie
访CookieCookie访访Cookie访访
Cookie Cookie AboutCookies.orgCookieCookie 访
2
Cookie 使使访访HTTPSSSL
3
访便HTTPS
4Do Not Track
Do Not Track Do Not Track Do Not Track
使/
1
2
3
4
5
6
7
8//
9
10
11
使
1访
2
1
2线线
3
4
5
6
7
8
9
3使使APP
1
2
3
访
使
APISDK
1使
2
3
4使使
5使
6
1
2
3
使 访使访访 SSL https 使使访访
使
访
使
访
访使访访
->-APPAPP访kaidalai@163.com7
访
kaidalai@163.com7
kaidalai@163.com
1/iOS->->
2/iOS->->->
使
使Android->->iOS->APP->->->使
 
1
2
3
4
5
6
使
14
1使
2
3
4使
5
6
kaidalai@163.com
kaidalai@163.com
40-11
1.1
使使
2.1
APP线
2.2
2.2.1 使
2.2.2 iOSandroid
2.3
2.3.1 使使
2.3.2 使使
3.1
3.2 使
4.1
4.2
4.3
4.4 使
5.1
5.2
5.3 使
6.1
6.2 使使使
6.3
6.4 访使
6.5
7.1 使
7.1.1 使使
7.1.2 使使使使
7.1.3 怀使
7.2
7.2.1 使
7.2.2
7.2.2.1
7.2.2.2
7.2.2.3 使
7.2.3 使
7.2.3.1
7.2.3.2
7.2.3.3 使访
7.2.3.4
7.2.3.5 线线
7.2.4 14
7.2.5 ;
7.3
7.3.1 使
8.1
8.1.1
8.1.1.1
8.1.1.2
8.1.1.3
8.1.1.4 广
8.1.1.5
8.2 使
使
8.2.1
8.2.2
8.2.3 使
8.2.4 使/
8.2.5
8.2.6 使
8.2.7
8.2.8
8.3
使
8.3.1
8.3.2
8.3.3
8.3.4
8.3.5 广广
8.3.6
8.3.7
8.3.8
8.4
使
8.5
8.5.1 使
8.5.2
8.5.3
9.1
9.2
10.1 访使
10.2 使
10.3 使
10.4
10.5
11.1 使使使
11.2 使使
11.3 使
12.1 APP---APP 1APP 2/ 使访使
12.20574-87760023
''',
style: Theme.of(context).textTheme.subtitle1,
),

@ -18,219 +18,125 @@ class PrivacyPage extends StatelessWidget {
children: [
Text(
'''
20220325
使
使 线
 使 便
 使        使           
              
  使 CookiesSDK 
  
 访  
14 使
kaidalai@163.com
线
20220325
20220327
kaidalai@163.com7
1
2使
3
4
5
6
7
8
9
便使使线
使
使
1
使
AndroidV8.0.0iOSV7.4.0访->
使使使
使
2
便使  
3
使使
4
apppdf使使
5
Android 使
1   使
2 SDK MACAPPlist
3   
 Android使 Android访
  crash  
使WLANWLANWLANWLAN WiFi 使WLANWLANWLANWLAN
退 / 使 / 退
  
使      
  iOS
使PCTVweb   使 
v8.5.3 使  使
toast使  
便    APP--
IDID 使IFAAiOS使ID  IDIDiOS IDID   使IFAAiOS使ID APP
WLANWLAN访   Wi-Fi SSID 使   WLAN WLAN WLAN WLANWLANWLAN   访 使
使  使使 使  便
使  使 Android6.0
使 使 使 使 Bonjour Apple TV
iOS 使 AndroidiOS 
SDK使
使APP使使SDK 使SDKSDKSDK SDK使SDKSDKSDK
使Cookie
1Cookie
访CookieCookie访访Cookie访访
Cookie Cookie AboutCookies.orgCookieCookie 访
2
Cookie 使使访访HTTPSSSL
3
访便HTTPS
4Do Not Track
Do Not Track Do Not Track Do Not Track
使/
1
2
3
4
5
6
7
8//
9
10
11
使
1访
2
1
2线线
3
4
5
6
7
8
9
3使使APP
1
2
3
访
使
APISDK
1使
2
3
4使使
5使
6
1
2
3
使 访使访访 SSL https 使使访访
使
访
使
访
访使访访
->-APPAPP访kaidalai@163.com7
访
kaidalai@163.com7
kaidalai@163.com
1/iOS->->
2/iOS->->->
使
使Android->->iOS->APP->->->使
 
1
2
3
4
5
6
使
14
1使
2
3
4使
5
6
kaidalai@163.com
kaidalai@163.com
40-11
''',
便使使
1. 2.使 3. 4. 5. 6. 7. 8.
1.
1.1
APP使APP便访
1.2
APPAPP使APP使 APP使使APPAPP使APP 使使
使
/使使
使使
使使使
访使访访访访访访访访访访
使使使
使使使
/使
使
使使使
使
/使
使
使
使
ETC使ETC
使使
使使
使
使,
访使
访使使访
使访
使访
使访
使访
使访
使访
访
访
访访访
访
1.3
APPAPP 使访
1.4
1.5
便使APPID访
2.使
2.1
2.2 APP使使使APPAPP使
3.
3.1
3.2
4.
便
app
5.
访使APP APP
使
线APP
6.
6.1 APP访
6.2
7.
APP18使APPAPP使8
8.
kaidalai@163.com ''',
style: Theme.of(context).textTheme.subtitle1,
),
],

@ -2,6 +2,7 @@
// Project imports:
import 'package:aku_new_community_manager/models/announce/announcement_detail_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -47,7 +48,7 @@ class AnouncementDetails extends StatelessWidget {
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text('${S.of(context)!.tempPlotName}物业管理处',
Text('${UserTool.userProvider.userInfoModel!.communityName}物业管理处',
style: AppStyle().primaryStyle),
SizedBox(
height: 4.w,

@ -29,6 +29,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
@Deprecated('废弃,酌情删除')
class AppApplication {
String name;
String assetPath;

@ -2,6 +2,7 @@
// Project imports:
import 'package:aku_new_community_manager/models/todo_bussiness/todo_outdoor_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart';
import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart';
import 'package:flutter/material.dart';
@ -104,7 +105,7 @@ class _ToDoOutDoorCardState extends State<ToDoOutDoorCard> {
),
Spacer(),
Text(
'${S.of(context)!.tempPlotName}',
'${UserTool.userProvider.userInfoModel!.communityName}',
style: AppStyle().primaryStyle,
),
],

@ -107,7 +107,7 @@ class _PersonalDrawState extends State<PersonalDraw> {
children: [
Icon(Icons.location_on_outlined, size: 33.w),
Text(
'${S.of(context)!.tempPlotName}',
'${UserTool.userProvider.userInfoModel!.communityName}',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 24.sp),

@ -2,6 +2,7 @@ import 'dart:io';
import 'package:aku_new_community_manager/const/api.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/ui/manage_pages/engineer_repair/engineer_repair_func.dart';
import 'package:aku_new_community_manager/ui/widgets/app_widgets/bee_pick_image_widget.dart';
import 'package:aku_new_community_manager/ui/widgets/app_widgets/aku_single_check_button.dart';
@ -48,7 +49,7 @@ class _AddEngineerRepairPageState extends State<AddEngineerRepairPage> {
height: 60.w,
),
36.w.widthBox,
'${S.of(context)!.tempPlotName}'.text.size(28.sp).make(),
'${UserTool.userProvider.userInfoModel!.communityName}'.text.size(28.sp).make(),
],
),
24.w.heightBox,

@ -1,6 +1,7 @@
import 'package:aku_new_community_manager/const/api.dart';
import 'package:aku_new_community_manager/json_models/manager/engineer_repair/engineer_repair_new_acceptance_record_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -44,7 +45,7 @@ class _EngineerRepairAcceptanceRecordListPageState
children: [
Row(
children: [
'${S.of(context)!.tempPlotName}'
'${UserTool.userProvider.userInfoModel!.communityName}'
.text
.size(32.sp)
.color(kTextPrimaryColor)

@ -4,6 +4,7 @@ import 'package:aku_new_community_manager/const/api.dart';
import 'package:aku_new_community_manager/const/resource.dart';
import 'package:aku_new_community_manager/json_models/manager/engineer_repair/engineer_repair_detail_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/tools/widget_tool.dart';
import 'package:aku_new_community_manager/ui/manage_pages/engineer_repair/engineer_repair_func.dart';
import 'package:aku_new_community_manager/ui/manage_pages/engineer_repair/engineer_repair_map.dart';
@ -152,7 +153,7 @@ class _EngineerRepairCompletePageState
widget.detailModel.createTel,
),
_buildTile(R.ASSETS_MESSAGE_IC_AREA_PNG, '报修区域',
'${S.of(context)!.tempPlotName}'),
'${UserTool.userProvider.userInfoModel!.communityName}'),
AkuBox.h(8),
Text(
widget.detailModel.reportDetail,

@ -362,7 +362,7 @@ class _EngineerRepairDetailPageState extends State<EngineerRepairDetailPage> {
_model!.createTel,
),
_buildTile(R.ASSETS_MESSAGE_IC_AREA_PNG, '报修区域',
'${S.of(context)!.tempPlotName} ${_model!.repairArea}'),
'${UserTool.userProvider.userInfoModel!.communityName} ${_model!.repairArea}'),
AkuBox.h(8),
Text(
_model!.reportDetail,

@ -506,6 +506,8 @@ class _InspectionManageDetailsPageState
height: 343.w,
child: AMapWidget(
apiKey: AMapApiKey(androidKey: '0c11d9ba47089d971dc4d889b66593ab'),
privacyStatement: AMapPrivacyStatement(
hasContains: true, hasShow: true, hasAgree: true),
rotateGesturesEnabled: false,
scaleEnabled: false,
scrollGesturesEnabled: false,

@ -3,6 +3,7 @@
import 'package:aku_new_community_manager/const/api.dart';
import 'package:aku_new_community_manager/models/manager/rules_manage/rules_manage_list_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/ui/manage_pages/rules_manage/rules_manage_detail_page.dart';
import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:aku_new_community_manager/ui/widgets/common/bee_list_view.dart';
@ -93,7 +94,7 @@ class _RulesManagePageState extends State<RulesManagePage> {
32.w.heightBox,
Row(
children: [
'${S.of(context)!.tempPlotName}'
'${UserTool.userProvider.userInfoModel!.communityName}'
.text
.size(20.sp)
.color(kTextSubColor)

@ -3,6 +3,7 @@
import 'package:aku_new_community_manager/const/resource.dart';
import 'package:aku_new_community_manager/models/manager/goods_out/goods_out_item_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/tools/widget_tool.dart';
import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart';
import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart';
@ -99,7 +100,7 @@ class _ItemsOutdoorCardState extends State<ItemsOutdoorCard> {
),
Spacer(),
Text(
'${S.of(context)!.tempPlotName}',
'${UserTool.userProvider.userInfoModel!.communityName}',
style: AppStyle().primaryStyle,
),
],

@ -7,6 +7,7 @@ import 'package:aku_new_community_manager/provider/user_provider.dart';
import 'package:aku_new_community_manager/saas_models/net_model/base_model.dart';
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/extensions/list_extension_tool.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/tools/widget_tool.dart';
import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart';
import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/outdoor_pass_page.dart';
@ -107,7 +108,7 @@ class _ItemsOutdoorDetailsPageState extends State<ItemsOutdoorDetailsPage> {
AkuBox.h(16),
...<Widget>[
_buildTile(R.ASSETS_OUTDOOR_IC_HOME_PNG, '小区名称',
'${S.of(context)!.tempPlotName}'),
'${UserTool.userProvider.userInfoModel!.communityName}'),
_buildTile(
R.ASSETS_OUTDOOR_IC_ADDRESS_PNG,
'详细地址',

@ -3,6 +3,7 @@ import 'dart:async';
// Project imports:
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/tools/widget_tool.dart';
import 'package:aku_new_community_manager/ui/tool_pages/warning/warning_detail_page.dart';
import 'package:aku_new_community_manager/ui/tool_pages/warning/warning_success.dart';
@ -80,7 +81,7 @@ class _WarningSubPageState extends State<WarningSubPage> {
],
),
Text(
'${S.of(context)!.tempPlotName}',
'${UserTool.userProvider.userInfoModel!.communityName}',
style: TextStyle(
fontSize: 44.w,
color: AppStyle.primaryTextColor,

@ -3,6 +3,7 @@ import 'dart:async';
// Project imports:
import 'package:aku_new_community_manager/style/app_style.dart';
import 'package:aku_new_community_manager/tools/user_tool.dart';
import 'package:aku_new_community_manager/tools/widget_tool.dart';
import 'package:aku_new_community_manager/ui/tool_pages/warning/warning_detail_page.dart';
// Flutter imports:
@ -51,7 +52,7 @@ class _WarningSuccessState extends State<WarningSuccess> {
width: 420.w,
),
Text(
'${S.of(context)!.tempPlotName}',
'${UserTool.userProvider.userInfoModel!.communityName}',
style: TextStyle(
fontSize: 44.w,
color: AppStyle.primaryTextColor,

@ -16,7 +16,7 @@ dependencies:
intl: ^0.17.0
cupertino_icons: ^1.0.2
#屏幕适配
flutter_screenutil: ^5.0.0-nullsafety.11
flutter_screenutil: ^5.3.1
#状态管理
provider: ^5.0.0
#路由

@ -11,9 +11,9 @@ class Config {
///
static String get apkDevDir =>
'/users/zhangmeng/team/bee/app/aku_new_community_manager/dev';
'/users/zhangmeng/team/bee/aku_new_community_manager/dev';
///aku_new_community_manager
static String get apkDir =>
'/users/zhangmeng/team/bee/app/aku_new_community_manager/release';
'/users/zhangmeng/team/bee/aku_new_community_manager/release';
}

@ -33,7 +33,7 @@ buildApk() async {
'apk',
'--target-platform=android-arm64',
'--dart-define',
'ISPRODUCT=true'
'ENV=release'
]);
String date = DateUtil.formatDate(DateTime.now(), format: 'yy_MM_dd_HH_mm');
String version = await getVersion();
@ -53,7 +53,7 @@ buildApkDev() async {
'apk',
'--target-platform=android-arm64',
'--dart-define',
'ISPRODUCT=false'
'ENV=dev'
]);
String date = DateUtil.formatDate(DateTime.now(), format: 'yy_MM_dd_HH_mm');
String version = await getVersion();

Loading…
Cancel
Save