xt / Flutter-ReserveApp · Commits

Go to a project

Commit 85e2d0faa6ee6e5e89a9445090132a5af961a5d0

Authored by wdn127929
1 parent fd42dd74
build: skipped

3.7.2

Inline Side-by-side
Showing 9 changed files with 110 additions and 57 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "370"
def flutterVersionCode = "372"
if (flutterVersionCode == null) {
flutterVersionCode = '370'
flutterVersionCode = '372'
}
def flutterVersionName = "3.7.0"
def flutterVersionName = "3.7.2"
if (flutterVersionName == null) {
flutterVersionName = '3.7.0'
flutterVersionName = '3.7.2'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -295,4 +295,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
COCOAPODS: 1.10.1
COCOAPODS: 1.11.3
... ...
... ... @@ -487,7 +487,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 370;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -502,7 +502,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.4.3;
MARKETING_VERSION = 3.7.2;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -632,10 +632,10 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 370;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
FLUTTER_BUILD_MODE = release;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -647,7 +647,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.4.3;
MARKETING_VERSION = 3.7.2;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -667,7 +667,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 370;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -682,7 +682,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.4.3;
MARKETING_VERSION = 3.7.2;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -423,8 +423,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
showMsg: "加载中，请稍后...",
);
} else {
return Expanded(
child: DefaultTextStyle(
return DefaultTextStyle(
style: TextStyle(decoration: TextDecoration.none),
child: Container(
color: MyColours.color_ffffff,
... ... @@ -674,8 +673,8 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
),
)
],
))),
);
)))
;
}
}),
onWillPop: () async {
... ...
... ... @@ -415,6 +415,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
},
xgPushClickAction: (Map<String, dynamic> msg) async {
print(msg);
_clearBadge(() {});
if (Platform.isIOS && msg != null && msg['custom'] != null) {
Map custom = json.decode(msg['custom'].toString());
... ... @@ -470,6 +471,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
await messageDialogModel.setMessageStatus(context, params);
break;
case "15":
//店内消息
NavigatorUtil.goHomePage(context,
initialIndex: 1,
... ... @@ -478,6 +480,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
dateTime: DateTime.parse(custom['ddate'].replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: custom['ddate_solt']);
Map<String, String> params = {
"sid": Provider.of<UserModel>(context, listen: false)
.user
... ...
... ... @@ -220,7 +220,9 @@ class MessageDialogItemF extends StatelessWidget {
),
),
HEmptyView(34),
message.message_type == "10" || message.message_type == "12"
message.message_type == "10" ||
message.message_type == "12" ||
message.message_type == "13"
? Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
... ... @@ -334,27 +336,33 @@ class MessageDialogItemF extends StatelessWidget {
fontSize: ScreenUtil().setSp(24)),
),
VEmptyView(8),
Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(16),
vertical: ScreenUtil().setWidth(6)),
decoration: BoxDecoration(
color: bgcolor,
borderRadius: BorderRadius.circular(8)),
child: Text(
'${message.message_type == '1' ? message.room_info : message.room_demand}',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
),
)
message.room_demand == '' ||
message.room_demand == null
? SizedBox()
: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(16),
vertical: ScreenUtil().setWidth(6)),
decoration: BoxDecoration(
color: bgcolor,
borderRadius: BorderRadius.circular(8)),
child: Text(
'${message.room_demand}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
),
)
],
))
: SizedBox(),
message.message_type == "11" ||
message.message_type == "16" ||
message.message_type == "1"
? Column(
? Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
... ... @@ -364,22 +372,49 @@ class MessageDialogItemF extends StatelessWidget {
fontSize: ScreenUtil().setSp(28)),
),
VEmptyView(8),
message.room_demand == ''
? SizedBox()
: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(16),
vertical: ScreenUtil().setWidth(6)),
decoration: BoxDecoration(
color: bgcolor,
borderRadius: BorderRadius.circular(8)),
child: Text(
'${message.room_demand}',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
),
),
message.message_type == "1"
? message.room_info == '' ||
message.room_info == null
? SizedBox()
: Container(
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(16),
vertical: ScreenUtil().setWidth(6)),
decoration: BoxDecoration(
color: bgcolor,
borderRadius:
BorderRadius.circular(8)),
child: Text(
'${message.room_info}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
),
)
: message.room_demand == '' ||
message.room_demand == null
? SizedBox()
: Container(
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(16),
vertical: ScreenUtil().setWidth(6)),
decoration: BoxDecoration(
color: bgcolor,
borderRadius:
BorderRadius.circular(8)),
child: Text(
'${message.room_demand}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
),
),
message.message_type == "1"
? SizedBox()
: Text(
... ... @@ -393,7 +428,7 @@ class MessageDialogItemF extends StatelessWidget {
fontSize: ScreenUtil().setSp(24)),
)
],
)
))
: SizedBox(),
message.message_type == "15"
? Column(
... ...
... ... @@ -261,7 +261,9 @@ class MessageItemF extends StatelessWidget {
),
),
HEmptyView(34),
message.message_type == "10" || message.message_type == "12"
message.message_type == "10" ||
message.message_type == "12" ||
message.message_type == "13"
? Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
... ... @@ -387,6 +389,8 @@ class MessageItemF extends StatelessWidget {
borderRadius: BorderRadius.circular(8)),
child: Text(
'${message.room_demand}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
... ... @@ -398,7 +402,8 @@ class MessageItemF extends StatelessWidget {
message.message_type == "11" ||
message.message_type == "16" ||
message.message_type == "1"
? Column(
? Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
... ... @@ -423,6 +428,8 @@ class MessageItemF extends StatelessWidget {
BorderRadius.circular(8)),
child: Text(
'${message.room_info}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
... ... @@ -442,6 +449,8 @@ class MessageItemF extends StatelessWidget {
BorderRadius.circular(8)),
child: Text(
'${message.room_demand}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(20)),
... ... @@ -460,7 +469,7 @@ class MessageItemF extends StatelessWidget {
fontSize: ScreenUtil().setSp(24)),
)
],
)
))
: SizedBox(),
message.message_type == "15"
? Column(
... ...
... ... @@ -3,7 +3,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:fluwx/fluwx.dart';
import 'package:one_key/constant/state.dart';
import 'package:one_key/models/sms_info.dart';
import 'package:one_key/models/store_info.dart';
import 'package:one_key/models/version.dart';
import 'package:one_key/provider/create_store_model.dart';
import 'package:one_key/provider/my_model.dart';
import 'package:one_key/provider/update_model.dart';
import 'package:one_key/provider/user_model.dart';
... ... @@ -36,6 +38,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
ScrollController controller;
Version _version;
SmsInfoData smsInfoData;
CreateStoreModel createStoreModel;
@override
void initState() {
... ... @@ -131,6 +134,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
@override
Widget build(BuildContext context) {
myModel = Provider.of<MyModel>(context, listen: true);
createStoreModel = Provider.of<CreateStoreModel>(context, listen: false);
return Scaffold(
appBar: AppBar(
backgroundColor: MyColours.color_199095, //把appbar的背景色改成透明
... ... @@ -175,6 +179,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
height: ScreenUtil().setWidth(50),
child: Text(
model.user.sellername,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(36)),
... ... @@ -223,7 +229,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
)),
Positioned(
right: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(156),
bottom: ScreenUtil().setWidth(116),
child: RoundButton(
text: '切换店铺',
gradientStart: MyColours.color_ffffff,
... ... @@ -233,14 +239,17 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
height: ScreenUtil().setWidth(56),
fontSize: 28,
isBold: false,
textColor: App.sp.getBool("accountLogin")
textColor: App.sp.getBool("accountLogin") ?? false
? MyColours.color_999999
: MyColours.color_199095,
radius: ScreenUtil().setWidth(20),
onPressed: () {
if (App.sp.getBool("accountLogin")) {
if (App.sp.getBool("accountLogin") ?? false) {
return;
}
print(createStoreModel.storeInfo);
createStoreModel.storeInfo = StoreInfo();
NavigatorUtil.goIfNeedCreateStorePage(context,
changeStatus: true);
},
... ...
... ... @@ -151,12 +151,10 @@ var homeHandler = new Handler(
String solt = params["solt"].first;
DateTime dateTime = params["dateTime"].first == "null"
? null
: DateTime.fromMillisecondsSinceEpoch(
int.parse(params["dateTime"].first));
return HomePage(
initialIndex: int.parse(initialIndex),
needReresh: needRefresh,
... ...