Merge commit 'ab20e0182b1eb7d36a3c5f8fb1bf49fc739776ee'

* commit 'ab20e0182b1eb7d36a3c5f8fb1bf49fc739776ee':
  移除二维码,修改应用名称
  添加隐私政策和服务协议
  版本更新
  添加搜索页面
  no message

# Conflicts:
#	android/app/build.gradle
#	lib/ui/tool_pages/scan_page.dart
#	pubspec.lock
#	pubspec.yaml
hmxc
小赖 4 years ago
commit 29aa3c6d73

@ -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:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区管家端" android:icon="@mipmap/ic_launcher">
<application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区" android:icon="@mipmap/ic_launcher">
<meta-data android:name="com.amap.api.v2.apikey" android:value="872b909f2ebc8150b809d692c4349f22"/>
<activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as

@ -4,4 +4,7 @@
<FileRef
location = "group:Runner.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>

@ -1,5 +1,6 @@
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class AgreementPage extends StatelessWidget {
const AgreementPage({Key key}) : super(key: key);
@ -8,6 +9,221 @@ class AgreementPage extends StatelessWidget {
Widget build(BuildContext context) {
return AkuScaffold(
title: '服务协议',
body: SingleChildScrollView(
padding: EdgeInsets.all(16.w),
child: Column(
children: [
Text(
'《服务协议》',
style: TextStyle(fontWeight: FontWeight.w600, fontSize: 35.w),
),
Text(
'''
使APP
使APP使
使使
//()
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
20201021
''',
style: TextStyle(
fontSize: 30.w,
),
),
],
),
),
);
}
}

@ -1,5 +1,6 @@
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class PrivacyPage extends StatelessWidget {
const PrivacyPage({Key key}) : super(key: key);
@ -8,6 +9,123 @@ class PrivacyPage extends StatelessWidget {
Widget build(BuildContext context) {
return AkuScaffold(
title: '隐私协议',
body: SingleChildScrollView(
padding: EdgeInsets.all(16.sp),
child: Column(
children: [Text(
'小蜜蜂智慧社区管家端隐私政策',
style: TextStyle(
fontWeight: FontWeight.w600, fontSize: 35.w),
),
Text(
'''
APPAPP便使使
1.
2.使
3.
4.
5.
6.
7.
8.
1.
1.1
APP使APP便访
1.2
APPAPP使APP使
APP使使APPAPP使APP
使使
使
/ 使使
使使
使使使
访 使访访访访访访访访访访
使使使
使
使使使
/ 使
使
使
/ 使
使
使
使
使使
使
使使
/ 使使使
使,
使,
使,
访使
访使
使访
使访
使访
使访
使访
使访
使访
使访
使访
使访
使访
访
访
访
访
访
(iOS) 访
/ 使访
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.
johnson.yang@akuhome.com
20201020
''',
style: TextStyle(
fontSize: 30.w,
),
),
],
),
),
);
}
}

@ -77,33 +77,39 @@ class _ApplicationPageState extends State<ApplicationPage>
width: 89.w,
child: AkuBackButton(),
),
titleSpacing: 0,
title: Container(
margin: EdgeInsets.only(right: 37.w),
padding: EdgeInsets.symmetric(horizontal: 32.w),
height: 72.w,
child: Row(
children: [
Image.asset(
R.ASSETS_HOME_IC_SEARCH_PNG,
height: 40.w,
width: 40.w,
),
AkuBox.w(16),
Text(
'搜索应用',
style: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 28.sp,
),
),
],
),
decoration: BoxDecoration(
color: Color(0xFFF9F9F9),
borderRadius: BorderRadius.circular(8.w),
),
// titleSpacing: 0,
// title: Container(
// margin: EdgeInsets.only(right: 37.w),
// padding: EdgeInsets.symmetric(horizontal: 32.w),
// height: 72.w,
// child: Row(
// children: [
// Image.asset(
// R.ASSETS_HOME_IC_SEARCH_PNG,
// height: 40.w,
// width: 40.w,
// ),
// AkuBox.w(16),
// Text(
// '搜索应用',
// style: TextStyle(
// color: AppStyle.minorTextColor,
// fontSize: 28.sp,
// ),
// ),
// ],
// ),
// decoration: BoxDecoration(
// color: Color(0xFFF9F9F9),
// borderRadius: BorderRadius.circular(8.w),
// ),
// ),
// ),
title: Text(
'全部应用',
style: AppStyle().barTitleStyle,
),
centerTitle: true,
),
body: Column(
children: [
@ -274,11 +280,17 @@ class _ApplicationPageState extends State<ApplicationPage>
children: [
Image.asset(
application.assetPath,
height: 72.w,
width: 72.w,
height: 60.w,
width: 60.w,
),
AkuBox.h(8),
Text(application.name),
Text(
application.name,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
),
],
),
);

@ -13,6 +13,7 @@ import 'package:aku_community_manager/ui/home/business/business_page.dart';
import 'package:aku_community_manager/ui/home/messages/message.dart';
import 'package:aku_community_manager/ui/home/application/applications_page.dart';
import 'package:aku_community_manager/ui/home/personal_draw.dart';
import 'package:aku_community_manager/ui/home/search_workorder_page.dart';
import 'package:aku_community_manager/ui/login/login_page.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.dart';
@ -59,8 +60,8 @@ class _HomePageState extends State<HomePage> {
children: [
Image.asset(
assetPath,
height: 75.w,
width: 75.w,
height: 60.w,
width: 60.w,
),
SizedBox(height: 8.w),
Text(
@ -206,7 +207,9 @@ class _HomePageState extends State<HomePage> {
child: AkuButton(
//
color: Color(0xFFFFFFFF),
onPressed: () {},
onPressed: () {
Get.to(SearchWorkOrderPage());
},
radius: 8.w,
child: Row(children: [
AkuBox.w(21.w),
@ -398,48 +401,47 @@ class _HomePageState extends State<HomePage> {
width: double.infinity,
height: 172.w,
child: Stack(children: [
CarouselSlider(
items: _anouncementProvider.anouncementCardModels
.map((e) => AllAnouncementState.anounceCard(e))
.toList(),
options: CarouselOptions(
viewportFraction: 1.0,
aspectRatio: 686 / 172,
autoPlay: true,
onPageChanged: (index, _) {
setState(() {
_currentIndicator = index;
});
},
),
),
Positioned(
top: 144.w,
left: 0,
bottom: 16.w,
right: 0,
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children:
_anouncementProvider.anouncementCardModels.map((e) {
int index = _anouncementProvider.anouncementCardModels
.indexOf(e);
return Container(
width: 12.w,
height: 12.w,
margin: EdgeInsets.symmetric(
horizontal: 12.w),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: _currentIndicator == index
? Color(0xFFFFC40C)
: Color(0xFFE8E8E8),
),
);
}).toList(),
),
),
CarouselSlider(
items: _anouncementProvider.anouncementCardModels
.map((e) => AllAnouncementState.anounceCard(e))
.toList(),
options: CarouselOptions(
viewportFraction: 1.0,
aspectRatio: 686 / 172,
autoPlay: true,
onPageChanged: (index, _) {
setState(() {
_currentIndicator = index;
});
},
),
),
Positioned(
top: 144.w,
left: 0,
bottom: 16.w,
right: 0,
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children:
_anouncementProvider.anouncementCardModels.map((e) {
int index =
_anouncementProvider.anouncementCardModels.indexOf(e);
return Container(
width: 12.w,
height: 12.w,
margin: EdgeInsets.symmetric(horizontal: 12.w),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: _currentIndicator == index
? Color(0xFFFFC40C)
: Color(0xFFE8E8E8),
),
);
}).toList(),
),
),
]),
),
SizedBox(height: 16.w),
@ -511,7 +513,6 @@ class _HomePageState extends State<HomePage> {
},
itemCount: AllModel(context).waitThings.length,
),
//TODO listview
),
SizedBox(height: 24.w),
//

@ -0,0 +1,93 @@
import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:aku_community_manager/const/resource.dart';
class SearchWorkOrderPage extends StatefulWidget {
SearchWorkOrderPage({Key key}) : super(key: key);
@override
_SearchWorkOrderpageState createState() => _SearchWorkOrderpageState();
}
class _SearchWorkOrderpageState extends State<SearchWorkOrderPage> {
TextEditingController _textController;
@override
void initState() {
super.initState();
_textController = TextEditingController();
}
@override
void dispose() {
_textController?.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return AkuScaffold(
appBar: AppBar(
brightness: Brightness.light,
elevation: 0,
backgroundColor: Colors.white,
leading: SizedBox(
width: 89.w,
child: AkuBackButton(),
),
titleSpacing: 0,
title: Container(
margin: EdgeInsets.only(right: 37.w),
padding: EdgeInsets.symmetric(horizontal: 32.w),
height: 72.w,
child: Row(
children: [
Image.asset(
R.ASSETS_HOME_IC_SEARCH_PNG,
height: 40.w,
width: 40.w,
),
AkuBox.w(16),
Expanded(
child: TextFormField(
controller: _textController,
decoration: InputDecoration(
hintText: '搜索工单、手机号',
hintStyle: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 28.sp,
),
border: InputBorder.none,
),
style: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 28.sp,
),
onChanged: (text) {
setState(() {});
},
),
),
],
),
decoration: BoxDecoration(
color: Color(0xFFF9F9F9),
borderRadius: BorderRadius.circular(8.w),
),
),
),
body: Center(
child: _textController.text.isEmpty
? SizedBox()
: Text(
'无结果',
style: TextStyle(
color: AppStyle.primaryTextColor, fontSize: 36.sp),
),
),
);
}
}

@ -1,6 +1,8 @@
import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/agreements/agreement_page.dart';
import 'package:aku_community_manager/ui/agreements/privacy_page.dart';
import 'package:aku_community_manager/ui/home/home_page.dart';
import 'package:aku_community_manager/ui/settings/setting_feedback_page.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
@ -61,6 +63,18 @@ class _SettingsPageState extends State<SettingsPage> {
arrow: true,
onTap: () => BotToast.showText(text: '缓存清理完成'),
),
Divider(height: 1.w),
AkuTile(
title: Text('隐私政策'),
arrow: true,
onTap: () => Get.to(PrivacyPage()),
),
Divider(height: 1.w),
AkuTile(
title: Text('用户协议'),
arrow: true,
onTap: () => Get.to(AgreementPage()),
),
AkuBox.h(320),
userProvider.isSigned
? Padding(

@ -5,6 +5,7 @@ import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
// import 'package:qr_code_scanner/qr_code_scanner.dart';
class ScanPage extends StatefulWidget {
ScanPage({Key key}) : super(key: key);
@ -33,7 +34,7 @@ class _ScanPageState extends State<ScanPage> {
@override
void dispose() {
_qrViewController?.dispose();
// _qrViewController?.dispose();
_timer?.cancel();
super.dispose();
}

@ -331,6 +331,7 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.3.2+2"
<<<<<<< HEAD
qr_code_scanner:
dependency: "direct main"
description:
@ -338,6 +339,8 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.3.4"
=======
>>>>>>> ab20e0182b1eb7d36a3c5f8fb1bf49fc739776ee
rational:
dependency: transitive
description:

@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.1+2
version: 1.0.3+4
environment:
sdk: ">=2.7.0 <3.0.0"
@ -40,7 +40,7 @@ dependencies:
#划动组件
carousel_slider: ^2.3.1
#qrcode san
qr_code_scanner:
qr_code_scanner: ^0.3.4
#toast
bot_toast: ^3.0.4

Loading…
Cancel
Save