1281228557
/
aku_new_community_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

屏幕适配库升级

Browse Source 
高德隐私合规设置
master
张萌 3 years ago
parent ee87661707
commit f18b94a8a6
7 changed files with 264 additions and 235 deletions
Show Stats Download Patch File Download Diff File

10
android/app/proguard-rules.pro vendored
Unescape View File

@ -15,4 +15,12 @@
## AMap Location
-keep class com.amap.api.location.**{*;}
-keep class com.amap.api.fence.**{*;}
-keep class com.autonavi.aps.amapapi.model.**{*;}
-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.**{*;}

10
lib/main.dart
Unescape View File

@ -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(),
],

53
lib/new_ui/auth/other_login_page.dart
Unescape View File

@ -47,31 +47,36 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
@override
Widget build(BuildContext context) {
return AkuScaffold(
title: '',
backgroundColor: Colors.white,
body: Column(
children: [
Row(
children: [
24.w.widthBox,
..._tabs
.mapIndexed((e, index) => _tab(e, index, onTap: (value) {
_currentIndex = value;
_controller.jumpToPage(_currentIndex);
setState(() {});
}))
.toList(),
],
),
Flexible(
child: PageView(
controller: _controller,
children: [_verificationView(), _accountView()],
return WillPopScope(
onWillPop: () async {
return false;
},
child: AkuScaffold(
title: '',
backgroundColor: Colors.white,
body: Column(
children: [
Row(
children: [
24.w.widthBox,
..._tabs
.mapIndexed((e, index) => _tab(e, index, onTap: (value) {
_currentIndex = value;
_controller.jumpToPage(_currentIndex);
setState(() {});
}))
.toList(),
],
),
Flexible(
child: PageView(
controller: _controller,
children: [_verificationView(), _accountView()],
),
),
),
BottomTip(),
],
BottomTip(),
],
),
),
);
}

114
lib/new_ui/auth/set_psd_page.dart
Unescape View File

@ -44,61 +44,67 @@ class _SetPsdPageState extends State<SetPsdPage> {
@override
Widget build(BuildContext context) {
return AkuScaffold(
title: '',
backgroundColor: Colors.white,
body: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
24.w.heightBox,
Row(
children: [
48.w.widthBox,
'首次登陆，请设置账号密码'
.text
.size(36.sp)
.bold
.color(Colors.black.withOpacity(0.65))
.make(),
Spacer(),
],
),
16.w.heightBox,
Row(
children: [
48.w.widthBox,
'密码需由6-20位数字、字母、或符号组成，至少两种'
.text
.size(28.sp)
.color(Colors.black.withOpacity(0.45))
.make(),
Spacer(),
],
),
144.w.heightBox,
PsdTextField(controller: _psdController, hintText: '请输入密码'),
24.w.heightBox,
PsdTextField(controller: _confirmPsdController, hintText: '请再次输入密码'),
16.w.heightBox,
PsdVerify.checkString(psdCheck)
.text
.size(28.sp)
.color(Color(0xFFCF1322).withOpacity(0.8))
.make(),
37.w.heightBox,
LoginButtonWidget(
onTap: psdCheck == PSDVERIFY.correct
? () async {
var result =
await SignFunc.settingPsd(_psdController.text);
if (result) {
await UserTool.userProvider.updateUserInfo();
await SignFunc.checkNameAndAccount();
return WillPopScope(
onWillPop: () async {
return false;
},
child: AkuScaffold(
title: '',
backgroundColor: Colors.white,
body: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
24.w.heightBox,
Row(
children: [
48.w.widthBox,
'首次登陆，请设置账号密码'
.text
.size(36.sp)
.bold
.color(Colors.black.withOpacity(0.65))
.make(),
Spacer(),
],
),
16.w.heightBox,
Row(
children: [
48.w.widthBox,
'密码需由6-20位数字、字母、或符号组成，至少两种'
.text
.size(28.sp)
.color(Colors.black.withOpacity(0.45))
.make(),
Spacer(),
],
),
144.w.heightBox,
PsdTextField(controller: _psdController, hintText: '请输入密码'),
24.w.heightBox,
PsdTextField(
controller: _confirmPsdController, hintText: '请再次输入密码'),
16.w.heightBox,
PsdVerify.checkString(psdCheck)
.text
.size(28.sp)
.color(Color(0xFFCF1322).withOpacity(0.8))
.make(),
37.w.heightBox,
LoginButtonWidget(
onTap: psdCheck == PSDVERIFY.correct
? () async {
var result =
await SignFunc.settingPsd(_psdController.text);
if (result) {
await UserTool.userProvider.updateUserInfo();
await SignFunc.checkNameAndAccount();
}
}
}
: null,
text: '确认'),
],
: null,
text: '确认'),
],
),
),
);
}

2
lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart
Unescape View File

@ -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,

308
pubspec.lock
View File

File diff suppressed because it is too large Load Diff

2
pubspec.yaml
Unescape View File

@ -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
#路由

Write Preview
Loading…
Cancel
Save