张萌 4 years ago
commit 5f5813724b

@ -87,6 +87,7 @@ android {
signingConfig signingConfigs.release
minifyEnabled true
useProguard true
multiDexEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@ -100,4 +101,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.amap.api:3dmap:latest.integration'
implementation 'com.amap.api:location:latest.integration'
implementation 'com.android.support:multidex:1.0.3'
}
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

@ -0,0 +1,39 @@
{
"project_info": {
"project_number": "767907767238",
"project_id": "akucommunity-46aa5",
"storage_bucket": "akucommunity-46aa5.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:767907767238:android:73ba965a47818e4d9cc8c7",
"android_client_info": {
"package_name": "com.akuCommunity.app"
}
},
"oauth_client": [
{
"client_id": "767907767238-gqote713f3ff3v8sqh29qtjr50sf7680.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCPwYm-8vZnPTLXrv6v68IxKM4jmsmZY5o"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "767907767238-gqote713f3ff3v8sqh29qtjr50sf7680.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}

@ -11,6 +11,8 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
}
}

@ -1,17 +1,14 @@
import 'package:akuCommunity/constants/config.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:fluwx/fluwx.dart';
import 'package:get/get.dart';
import 'package:jpush_flutter/jpush_flutter.dart';
import 'package:provider/provider.dart';
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:akuCommunity/main_initialize.dart';
import 'package:akuCommunity/pages/splash/splash_page.dart';
import 'package:akuCommunity/provider/app_provider.dart';
import 'package:akuCommunity/provider/sign_up_provider.dart';
@ -20,38 +17,15 @@ import 'package:akuCommunity/utils/developer_util.dart';
import 'package:akuCommunity/utils/headers.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
SystemChrome.setSystemUIOverlayStyle(
SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
systemNavigationBarColor: Colors.white,
),
);
JPush jpush = new JPush();
jpush.addEventHandler(
//
onReceiveNotification: (Map<String, dynamic> message) async {
print("flutter onReceiveNotification: $message");
},
//
onOpenNotification: (Map<String, dynamic> message) async {
print("flutter onOpenNotification: $message");
},
//
onReceiveMessage: (Map<String, dynamic> message) async {
print("flutter onReceiveMessage: $message");
},
);
jpush.setup(
appKey: "6a2c6507e3e8b3187ac1c9f9",
channel: "developer-default",
production: false,
debug: true, // debug
);
jpush.applyPushAuthority(
new NotificationSettingsIOS(sound: true, alert: true, badge: true));
DeveloperUtil.setDev(true);
registerWxApi(appId: AppConfig.wechatAppId);
WidgetsFlutterBinding.ensureInitialized();
///firebase crashlytics initalize
await MainInitialize.initFirebase();
MainInitialize.initTheme();
await MainInitialize.initJPush();
MainInitialize.initWechat();
runApp(MyApp());
}
@ -83,7 +57,6 @@ class _MyAppState extends State<MyApp> {
},
child: ScreenUtilInit(
designSize: Size(750, 1334),
allowFontScaling: true,
builder: () => GetMaterialApp(
onGenerateTitle: (context) => S.of(context).appName,
debugShowCheckedModeBanner: false,

@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:fluwx/fluwx.dart';
import 'package:jpush_flutter/jpush_flutter.dart';
import 'package:power_logger/power_logger.dart';
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:akuCommunity/constants/config.dart';
class MainInitialize {
///firebase
static Future initFirebase() async {
await Firebase.initializeApp();
FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
FlutterError.onError = (detail) {
FirebaseCrashlytics.instance.recordFlutterError(detail);
};
}
static initTheme() {
SystemChrome.setSystemUIOverlayStyle(SystemStyle.initial);
}
static Future initJPush() async {
JPush jpush = new JPush();
Function(Map<String, dynamic> message) jPushLogger(String type) {
return (Map<String, dynamic> message) async {
LoggerData.addData({
'type': type,
'message': message,
});
};
}
jpush.addEventHandler(
onReceiveNotification: jPushLogger('onReceiveNotification'),
onOpenNotification: jPushLogger('onOpenNotification'),
onReceiveMessage: jPushLogger('onReceiveMessage'),
);
jpush.setup(
appKey: "6a2c6507e3e8b3187ac1c9f9",
channel: "developer-default",
production: false,
debug: true,
);
String rID = await jpush.getRegistrationID();
LoggerData.addData('RegistrationID:$rID');
}
static initWechat() {
registerWxApi(appId: AppConfig.wechatAppId);
}
}

@ -1,73 +0,0 @@
class AkuShopClassModel {
int cid;
String mainName;
List<Data> data;
AkuShopClassModel({this.cid, this.mainName, this.data});
AkuShopClassModel.fromJson(Map<String, dynamic> json) {
cid = json['cid'];
mainName = json['main_name'];
if (json['data'] != null) {
data = [];
json['data'].forEach((v) {
data.add(new Data.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['cid'] = this.cid;
data['main_name'] = this.mainName;
if (this.data != null) {
data['data'] = this.data.map((v) => v.toJson()).toList();
}
return data;
}
}
class Data {
String nextName;
List<Info> info;
Data({this.nextName, this.info});
Data.fromJson(Map<String, dynamic> json) {
nextName = json['next_name'];
if (json['info'] != null) {
info = [];
json['info'].forEach((v) {
info.add(new Info.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['next_name'] = this.nextName;
if (this.info != null) {
data['info'] = this.info.map((v) => v.toJson()).toList();
}
return data;
}
}
class Info {
String sonName;
String imgurl;
Info({this.sonName, this.imgurl});
Info.fromJson(Map<String, dynamic> json) {
sonName = json['son_name'];
imgurl = json['imgurl'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['son_name'] = this.sonName;
data['imgurl'] = this.imgurl;
return data;
}
}

@ -1,264 +0,0 @@
class AkuShopModel {
String activityType;
String activityid;
String couponCondition;
String couponexplain;
String couponurl;
String deposit;
String depositDeduct;
String discount;
String generalIndex;
String guideArticle;
String isBrand;
String isExplosion;
String isLive;
String isShipping;
String isquality;
String itemdesc;
String itemendprice;
String itemid;
String itempic;
String itempicCopy;
String itemprice;
String itemsale;
String itemsale2;
String itemshorttitle;
String itemtitle;
String me;
String onlineUsers;
String originalArticle;
String originalImg;
String planlink;
String reportStatus;
String sellerId;
String sellerName;
String sellernick;
String shopid;
String shopname;
String shoptype;
String sonCategory;
String startTime;
String starttime;
String taobaoImage;
String tkmoney;
String tkrates;
String tktype;
String todaycouponreceive;
String todaysale;
String userid;
String videoid;
String xid;
String couponreceive;
String fqcat;
String endTime;
String downType;
String cuntao;
String couponsurplus;
String couponstarttime;
String couponreceive2;
String couponnum;
String couponmoney;
String couponendtime;
String productId;
int count;
bool isCheck;
AkuShopModel(
{this.activityType,
this.activityid,
this.couponCondition,
this.couponexplain,
this.couponurl,
this.deposit,
this.depositDeduct,
this.discount,
this.generalIndex,
this.guideArticle,
this.isBrand,
this.isExplosion,
this.isLive,
this.isShipping,
this.isquality,
this.itemdesc,
this.itemendprice,
this.itemid,
this.itempic,
this.itempicCopy,
this.itemprice,
this.itemsale,
this.itemsale2,
this.itemshorttitle,
this.itemtitle,
this.me,
this.onlineUsers,
this.originalArticle,
this.originalImg,
this.planlink,
this.reportStatus,
this.sellerId,
this.sellerName,
this.sellernick,
this.shopid,
this.shopname,
this.shoptype,
this.sonCategory,
this.startTime,
this.starttime,
this.taobaoImage,
this.tkmoney,
this.tkrates,
this.tktype,
this.todaycouponreceive,
this.todaysale,
this.userid,
this.videoid,
this.xid,
this.couponreceive,
this.fqcat,
this.endTime,
this.downType,
this.cuntao,
this.couponsurplus,
this.couponstarttime,
this.couponreceive2,
this.couponnum,
this.couponmoney,
this.couponendtime,
this.productId,
this.count,
this.isCheck});
AkuShopModel.fromJson(Map<String, dynamic> json) {
activityType = json['activity_type'];
activityid = json['activityid'];
couponCondition = json['coupon_condition'];
couponexplain = json['couponexplain'];
couponurl = json['couponurl'];
deposit = json['deposit'];
depositDeduct = json['deposit_deduct'];
discount = json['discount'];
generalIndex = json['general_index'];
guideArticle = json['guide_article'];
isBrand = json['is_brand'];
isExplosion = json['is_explosion'];
isLive = json['is_live'];
isShipping = json['is_shipping'];
isquality = json['isquality'];
itemdesc = json['itemdesc'];
itemendprice = json['itemendprice'];
itemid = json['itemid'];
itempic = json['itempic'];
itempicCopy = json['itempic_copy'];
itemprice = json['itemprice'];
itemsale = json['itemsale'];
itemsale2 = json['itemsale2'];
itemshorttitle = json['itemshorttitle'];
itemtitle = json['itemtitle'];
me = json['me'];
onlineUsers = json['online_users'];
originalArticle = json['original_article'];
originalImg = json['original_img'];
planlink = json['planlink'];
reportStatus = json['report_status'];
sellerId = json['seller_id'];
sellerName = json['seller_name'];
sellernick = json['sellernick'];
shopid = json['shopid'];
shopname = json['shopname'];
shoptype = json['shoptype'];
sonCategory = json['son_category'];
startTime = json['start_time'];
starttime = json['starttime'];
taobaoImage = json['taobao_image'];
tkmoney = json['tkmoney'];
tkrates = json['tkrates'];
tktype = json['tktype'];
todaycouponreceive = json['todaycouponreceive'];
todaysale = json['todaysale'];
userid = json['userid'];
videoid = json['videoid'];
xid = json['xid'];
couponreceive = json['couponreceive'];
fqcat = json['fqcat'];
endTime = json['end_time'];
downType = json['down_type'];
cuntao = json['cuntao'];
couponsurplus = json['couponsurplus'];
couponstarttime = json['couponstarttime'];
couponreceive2 = json['couponreceive2'];
couponnum = json['couponnum'];
couponmoney = json['couponmoney'];
couponendtime = json['couponendtime'];
productId = json['product_id'];
count = json['count'];
isCheck = json['isCheck'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['activity_type'] = this.activityType;
data['activityid'] = this.activityid;
data['coupon_condition'] = this.couponCondition;
data['couponexplain'] = this.couponexplain;
data['couponurl'] = this.couponurl;
data['deposit'] = this.deposit;
data['deposit_deduct'] = this.depositDeduct;
data['discount'] = this.discount;
data['general_index'] = this.generalIndex;
data['guide_article'] = this.guideArticle;
data['is_brand'] = this.isBrand;
data['is_explosion'] = this.isExplosion;
data['is_live'] = this.isLive;
data['is_shipping'] = this.isShipping;
data['isquality'] = this.isquality;
data['itemdesc'] = this.itemdesc;
data['itemendprice'] = this.itemendprice;
data['itemid'] = this.itemid;
data['itempic'] = this.itempic;
data['itempic_copy'] = this.itempicCopy;
data['itemprice'] = this.itemprice;
data['itemsale'] = this.itemsale;
data['itemsale2'] = this.itemsale2;
data['itemshorttitle'] = this.itemshorttitle;
data['itemtitle'] = this.itemtitle;
data['me'] = this.me;
data['online_users'] = this.onlineUsers;
data['original_article'] = this.originalArticle;
data['original_img'] = this.originalImg;
data['planlink'] = this.planlink;
data['report_status'] = this.reportStatus;
data['seller_id'] = this.sellerId;
data['seller_name'] = this.sellerName;
data['sellernick'] = this.sellernick;
data['shopid'] = this.shopid;
data['shopname'] = this.shopname;
data['shoptype'] = this.shoptype;
data['son_category'] = this.sonCategory;
data['start_time'] = this.startTime;
data['starttime'] = this.starttime;
data['taobao_image'] = this.taobaoImage;
data['tkmoney'] = this.tkmoney;
data['tkrates'] = this.tkrates;
data['tktype'] = this.tktype;
data['todaycouponreceive'] = this.todaycouponreceive;
data['todaysale'] = this.todaysale;
data['userid'] = this.userid;
data['videoid'] = this.videoid;
data['xid'] = this.xid;
data['couponreceive'] = this.couponreceive;
data['fqcat'] = this.fqcat;
data['end_time'] = this.endTime;
data['down_type'] = this.downType;
data['cuntao'] = this.cuntao;
data['couponsurplus'] = this.couponsurplus;
data['couponstarttime'] = this.couponstarttime;
data['couponreceive2'] = this.couponreceive2;
data['couponnum'] = this.couponnum;
data['couponmoney'] = this.couponmoney;
data['couponendtime'] = this.couponendtime;
data['product_id'] = this.productId;
data['count'] = this.count;
data['isCheck'] = this.isCheck;
return data;
}
}

@ -11,7 +11,6 @@ import 'package:provider/provider.dart';
import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/const/resource.dart';
import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:akuCommunity/model/community/activity_item_model.dart';
import 'package:akuCommunity/model/community/board_model.dart';
import 'package:akuCommunity/pages/home/widget/animate_app_bar.dart';
@ -43,7 +42,6 @@ class _HomePageState extends State<HomePage>
ScrollController _scrollController;
List<AkuShopModel> _shopList = [];
List<dynamic> data;
EasyRefreshController _refreshController = EasyRefreshController();

@ -1,6 +1,3 @@
import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart';
import 'package:akuCommunity/provider/app_provider.dart';
import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -12,9 +9,11 @@ import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/constants/api.dart';
import 'package:akuCommunity/model/manager/life_pay_model.dart';
import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart';
import 'package:akuCommunity/pages/life_pay/widget/life_pay_detail_page.dart';
import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart';
import 'package:akuCommunity/provider/user_provider.dart';
import 'package:akuCommunity/provider/app_provider.dart';
import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
import 'package:akuCommunity/utils/bee_parse.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/bee_divider.dart';
@ -54,7 +53,6 @@ class _LifePayPageState extends State<LifePayPage> {
}
Widget _buildHouseCard() {
UserProvider userProvider = Provider.of<UserProvider>(context);
AppProvider appProvider = Provider.of<AppProvider>(context);
return Material(
color: kForeGroundColor,
@ -224,7 +222,6 @@ class _LifePayPageState extends State<LifePayPage> {
@override
Widget build(BuildContext context) {
UserProvider userProvider = Provider.of<UserProvider>(context);
final appProvider = Provider.of<AppProvider>(context);
return BeeScaffold(
title: '生活缴费',

@ -7,7 +7,6 @@ import 'package:provider/provider.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/model/manager/life_pay_model.dart';
import 'package:akuCommunity/provider/app_provider.dart';
import 'package:akuCommunity/provider/user_provider.dart';
import 'package:akuCommunity/utils/bee_parse.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
@ -102,7 +101,6 @@ class _LifePayDetailPageState extends State<LifePayDetailPage> {
}
Widget _buildCard(DailyPaymentTypeVos model) {
UserProvider userProvider = Provider.of<UserProvider>(context);
final appProvider = Provider.of<AppProvider>(context);
return Container(
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 20.w),

@ -65,7 +65,6 @@ class _MyHousePageState extends State<MyHousePage> {
Widget _buildCard(int currentHouseId, String estateName, int index,
{bool paid = false}) {
UserProvider userProvider = Provider.of<UserProvider>(context);
AppProvider appProvider = Provider.of<AppProvider>(context);
return Container(
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 32.w),

@ -1,200 +0,0 @@
// import 'package:akuCommunity/pages/common/common_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
class ShopMessagePage extends StatefulWidget {
ShopMessagePage({Key key}) : super(key: key);
@override
_ShopMessagePageState createState() => _ShopMessagePageState();
}
class _ShopMessagePageState extends State<ShopMessagePage> {
List<Map<String, dynamic>> _listNotice = [
{
'status': '已读',
'type': '您的订单已签收',
'imagePath': 'assets/example/tz1.png',
'content': '您购买的 轻便自由,男士针织休闲西装 已签收',
'lookType': '查看快递'
},
{
'status': '已读',
'type': '您的订单已发货',
'imagePath': 'assets/example/tz2.png',
'content': '您购买的 亚瑟士/Asic Gel轻跑鞋黑武士 已发货 ',
'lookType': '查看快递'
},
{
'status': '已读',
'type': '交易退款成功',
'imagePath': 'assets/example/tz3.png',
'content': '您的订单已退款成功 来自退款编号6236402934702983',
'lookType': '查看详情'
},
];
@override
void initState() {
super.initState();
}
void _onRefresh() async {
await Future.delayed(Duration(milliseconds: 1500));
}
void _onLoading() async {
await Future.delayed(Duration(milliseconds: 1500));
if (mounted) setState(() {});
}
// void refundRouter() {
// CommonPage(
// bundle: Bundle()
// ..putMap('commentMap', {
// 'title': '退款详情',
// 'isActions': false,
// }),
// ).to;
// }
void expressRouter() {}
@override
void dispose() {
super.dispose();
}
InkWell _inkWellLook(String type, content, lookType) {
return InkWell(
onTap: () {
// lookType == '查看详情' ? refundRouter() : expressRouter();
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
lookType,
style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
),
Icon(AntDesign.right, size: 40.sp),
],
),
);
}
Container _containerCard(String status, type, imagePath, content, lookType) {
return Container(
margin: EdgeInsets.only(
top: 32.w,
left: 32.w,
right: 32.w,
),
padding:
EdgeInsets.only(top: 21.w, bottom: 14.w, left: 30.w, right: 20.w),
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius: BorderRadius.all(Radius.circular(4)),
boxShadow: <BoxShadow>[
BoxShadow(
color: Colors.grey.withOpacity(0.1),
offset: Offset(1, 1),
blurRadius: 10.0),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(left: 2.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'商城通知',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: 32.sp,
color: Color(0xff333333)),
),
Text(
status,
style:
TextStyle(fontSize: 32.sp, color: Color(0xff999999)),
),
],
),
SizedBox(height: 5.w),
Text(type,
style:
TextStyle(fontSize: 28.sp, color: Color(0xff333333))),
SizedBox(height: 8.w),
Row(
children: [
Image.asset(
imagePath,
height: 120.w,
width: 120.w,
),
SizedBox(width: 32.w),
Container(
width: 439.w,
child: Text(
content,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 28.sp, color: Color(0xff999999)),
),
),
],
),
],
),
),
SizedBox(height: 30.w),
Divider(),
_inkWellLook(type, content, lookType),
],
),
);
}
@override
Widget build(BuildContext context) {
return BeeScaffold(
title: '商城通知',
actions: [
InkWell(
onTap: () {},
child: Container(
padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
child: '清空'.text.black.size(28.sp).make(),
alignment: Alignment.center,
),
)
],
body: ListView.builder(
itemBuilder: (context, index) => _containerCard(
_listNotice[index]['status'],
_listNotice[index]['type'],
_listNotice[index]['imagePath'],
_listNotice[index]['content'],
_listNotice[index]['lookType'],
),
itemCount: _listNotice.length,
),
);
}
}

@ -156,7 +156,7 @@ class _AlarmPageState extends State<AlarmPage> {
spreadRadius: 1,
)
]),
child: FlatButton(
child: MaterialButton(
padding: EdgeInsets.zero,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(66.w)),
@ -181,7 +181,7 @@ class _AlarmPageState extends State<AlarmPage> {
decoration:
BoxDecoration(color: Color(0xFFFFFFFF).withOpacity(0.9)),
child: Stack(
overflow: Overflow.visible,
clipBehavior: Clip.none,
alignment: Alignment.topCenter,
children: [
Positioned(
@ -215,7 +215,7 @@ class _AlarmPageState extends State<AlarmPage> {
)
],
),
child: FlatButton(
child: MaterialButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(172.w)),
onPressed: () {

@ -32,7 +32,6 @@ class UserProfilePage extends StatefulWidget {
class _UserProfilePageState extends State<UserProfilePage> {
int _sex = 1;
DateTime _birthday = DateTime.now();
Widget _buildTile(String title, Widget suffix, {VoidCallback onPressed}) {
return MaterialButton(
color: Colors.white,

@ -272,30 +272,33 @@ class _SignInPageState extends State<SignInPage> {
),
SizedBox(height: 59.w),
_inkWellLogin(),
10.hb,
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FlatButton(
shape: StadiumBorder(),
padding: EdgeInsets.zero,
onPressed: () => Get.to(AgreementPage()),
child: Text(
'《小蜜蜂用户协议》',
style: TextStyle(
color: Colors.lightBlue,
),
)),
MaterialButton(
shape: StadiumBorder(),
padding: EdgeInsets.zero,
onPressed: () => Get.to(AgreementPage()),
child: Text(
'《小蜜蜂用户协议》',
style: TextStyle(
color: Colors.lightBlue,
),
),
),
SizedBox(width: 15.w),
FlatButton(
shape: StadiumBorder(),
padding: EdgeInsets.zero,
onPressed: () => Get.to(() => PrivacyPage()),
child: Text(
'《小蜜蜂隐私政策》',
style: TextStyle(
color: Colors.lightBlue,
),
))
MaterialButton(
shape: StadiumBorder(),
padding: EdgeInsets.zero,
onPressed: () => Get.to(() => PrivacyPage()),
child: Text(
'《小蜜蜂隐私政策》',
style: TextStyle(
color: Colors.lightBlue,
),
),
),
],
),
],

@ -1,4 +1,3 @@
import 'package:akuCommunity/widget/bee_scaffold.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -6,6 +5,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:akuCommunity/const/resource.dart';
import 'package:akuCommunity/ui/community/community_views/community_page.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
import 'home/home_page.dart';
import 'personal/personal_page.dart';
import 'property/property_index.dart';

@ -1,4 +1,3 @@
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -10,6 +9,7 @@ import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/constants/api.dart';
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:akuCommunity/extensions/num_ext.dart';
import 'package:akuCommunity/model/user/fixed_submit_model.dart';
import 'package:akuCommunity/pages/manager_func.dart';

@ -1,7 +1,5 @@
import 'dart:io';
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:akuCommunity/widget/picker/bee_house_picker.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -23,6 +21,7 @@ import 'package:akuCommunity/utils/network/net_util.dart';
import 'package:akuCommunity/widget/bee_divider.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
import 'package:akuCommunity/widget/buttons/bottom_button.dart';
import 'package:akuCommunity/widget/picker/bee_house_picker.dart';
import 'package:akuCommunity/widget/picker/grid_image_picker.dart';
class AddFixedSubmitPage extends StatefulWidget {

@ -1,4 +1,3 @@
import 'package:akuCommunity/constants/config.dart';
import 'package:flutter/material.dart';
import 'package:amap_flutter_location/amap_flutter_location.dart';
@ -8,6 +7,7 @@ import 'package:power_logger/power_logger.dart';
import 'package:akuCommunity/constants/api.dart';
import 'package:akuCommunity/constants/application_objects.dart';
import 'package:akuCommunity/constants/config.dart';
import 'package:akuCommunity/model/common/real_time_weather_model.dart';
import 'package:akuCommunity/model/community/hot_topic_model.dart';
import 'package:akuCommunity/model/message/message_center_model.dart';

@ -364,10 +364,7 @@ class _ChatCardState extends State<ChatCard> {
.color(Color(0xFF999999))
.make(),
_isMyself
? FlatButton(
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
height: 48.w,
? TextButton(
onPressed: () async {
bool result =
await Get.dialog(CupertinoAlertDialog(

@ -162,7 +162,7 @@ class _AdviceDetailPageState extends State<AdviceDetailPage> {
return BeeScaffold(
title: '查看详情',
actions: [
FlatButton(
TextButton(
onPressed: () =>
Get.to(() => AdviceEvaluatePage(id: widget.model.id)),
child: '评价'.text.make(),

@ -91,7 +91,7 @@ class _AdvicePageState extends State<AdvicePage> with TickerProviderStateMixin {
return BeeScaffold(
title: title,
actions: [
FlatButton(
TextButton(
onPressed: () => setState(() => _selectedMode = !_selectedMode),
child: (_selectedMode ? '完成' : '编辑').text.make(),
),

@ -1,9 +1,9 @@
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/constants/app_theme.dart';
import 'package:akuCommunity/widget/bee_back_button.dart';
class BeeScaffold extends StatelessWidget {
@ -25,7 +25,7 @@ class BeeScaffold extends StatelessWidget {
final SystemUiOverlayStyle systemStyle;
BeeScaffold({
Key key,
@required this.title,
this.title,
this.body,
this.actions,
this.leading,
@ -53,19 +53,21 @@ class BeeScaffold extends StatelessWidget {
@override
Widget build(BuildContext context) {
Widget appBar;
if (title != null)
appBar = AppBar(
backgroundColor: bgColor,
title: title.text.make(),
leading: leading ?? BeeBackButton(),
actions: actions,
bottom: appBarBottom,
);
return AnnotatedRegion<SystemUiOverlayStyle>(
value: systemStyle,
child: Scaffold(
backgroundColor: bodyColor,
appBar: title == null
? null
: AppBar(
backgroundColor: bgColor,
title: title.text.make(),
leading: leading ?? BeeBackButton(),
actions: actions,
bottom: appBarBottom,
),
appBar: appBar,
body: body,
bottomNavigationBar: bottomNavi,
floatingActionButton: fab,

@ -20,7 +20,7 @@ class _BeeCheckButtonState extends State<BeeCheckButton> {
bool get isSelect => widget.groupValue == widget.value;
@override
Widget build(BuildContext context) {
return FlatButton(
return MaterialButton(
onPressed: () {
widget.onChange(widget.value);
},

@ -1,10 +1,12 @@
import 'package:akuCommunity/provider/app_provider.dart';
import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/provider/app_provider.dart';
import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
import 'package:akuCommunity/utils/headers.dart';
class BeeHousePicker extends StatelessWidget {

@ -142,7 +142,7 @@ packages:
name: crypto
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.0"
version: "3.0.1"
cupertino_icons:
dependency: "direct main"
description:
@ -156,7 +156,7 @@ packages:
name: decimal
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.0"
version: "1.0.0+1"
device_info:
dependency: transitive
description:
@ -170,7 +170,7 @@ packages:
name: device_info_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.0.1"
dio:
dependency: "direct main"
description:
@ -199,6 +199,41 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.1.0"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.3"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.0.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.2"
firebase_crashlytics:
dependency: "direct main"
description:
name: firebase_crashlytics
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
firebase_crashlytics_platform_interface:
dependency: transitive
description:
name: firebase_crashlytics_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.0"
flustars:
dependency: "direct main"
description:
@ -243,7 +278,7 @@ packages:
name: flutter_plugin_android_lifecycle
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.0.1"
flutter_rating_bar:
dependency: "direct main"
description:
@ -257,14 +292,14 @@ packages:
name: flutter_screenutil
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.0.0-nullsafety.11"
version: "5.0.0"
flutter_slidable:
dependency: "direct main"
description:
name: flutter_slidable
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.0-nullsafety.0"
version: "0.6.0"
flutter_test:
dependency: "direct dev"
description: flutter
@ -281,14 +316,14 @@ packages:
name: fluwx
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.3.0"
version: "3.4.1"
get:
dependency: "direct main"
description:
name: get
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.0.0-nullsafety.2"
version: "4.1.4"
glob:
dependency: transitive
description:
@ -316,7 +351,7 @@ packages:
name: hive
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.0.2"
hive_flutter:
dependency: "direct main"
description:
@ -344,7 +379,7 @@ packages:
name: image_picker
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.7.3"
version: "0.7.4"
image_picker_for_web:
dependency: transitive
description:
@ -358,14 +393,14 @@ packages:
name: image_picker_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.0.1"
import_sorter:
dependency: "direct dev"
description:
name: import_sorter
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.4.2"
version: "4.4.3"
intl:
dependency: "direct main"
description:
@ -463,7 +498,7 @@ packages:
name: path_provider_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.0.1"
path_provider_windows:
dependency: transitive
description:
@ -491,7 +526,7 @@ packages:
name: permission_handler_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.1"
version: "3.1.2"
platform:
dependency: transitive
description:
@ -519,7 +554,7 @@ packages:
name: process
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.1.1"
version: "4.2.1"
provider:
dependency: "direct main"
description:
@ -605,7 +640,7 @@ packages:
name: shimmer
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0-nullsafety.0"
version: "2.0.0"
sky_engine:
dependency: transitive
description: flutter
@ -701,7 +736,7 @@ packages:
name: url_launcher
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.0.2"
version: "6.0.3"
url_launcher_linux:
dependency: transitive
description:
@ -750,7 +785,7 @@ packages:
name: velocity_x
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.6.0"
version: "2.6.1"
vxstate:
dependency: transitive
description:
@ -764,7 +799,7 @@ packages:
name: win32
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.4"
version: "2.0.5"
xdg_directories:
dependency: transitive
description:

@ -62,6 +62,8 @@ dependencies:
amap_flutter_location: ^1.0.1
amap_flutter_base: ^1.0.2
animated_text_kit: ^4.1.1
firebase_core: ^1.0.3
firebase_crashlytics: ^2.0.0
dev_dependencies:

Loading…
Cancel
Save