xt / Flutter-ReserveApp · Commits

Go to a project

Commit b133758912f3d1879923156a367a4379503541f2

Authored by gaiyaguang
1 parent 55522651
build: skipped

ios bug修复

Inline Side-by-side
Showing 13 changed files with 75 additions and 45 deletions
... ... @@ -6,6 +6,9 @@ PODS:
- Reachability
- connectivity_macos (0.0.1):
- Flutter
- fake_push (0.0.1):
- Flutter
- QQ_XGPush (~> 3.3.7)
- Flutter (1.0.0)
- flutter_statusbarcolor (0.0.1):
- Flutter
... ... @@ -29,6 +32,7 @@ PODS:
- Flutter
- permission_handler (4.4.0):
- Flutter
- QQ_XGPush (3.3.7)
- Reachability (3.2)
- shared_preferences (0.0.1):
- Flutter
... ... @@ -51,6 +55,7 @@ DEPENDENCIES:
- audioplayers (from `.symlinks/plugins/audioplayers/ios`)
- connectivity (from `.symlinks/plugins/connectivity/ios`)
- connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
- fake_push (from `.symlinks/plugins/fake_push/ios`)
- Flutter (from `Flutter`)
- flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
... ... @@ -72,6 +77,7 @@ SPEC REPOS:
- FMDB
- JCore
- JPush
- QQ_XGPush
- Reachability
- WechatOpenSDK
... ... @@ -82,6 +88,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/connectivity/ios"
connectivity_macos:
:path: ".symlinks/plugins/connectivity_macos/ios"
fake_push:
:path: ".symlinks/plugins/fake_push/ios"
Flutter:
:path: Flutter
flutter_statusbarcolor:
... ... @@ -117,6 +125,7 @@ SPEC CHECKSUMS:
audioplayers: 84f968cea3f2deab00ec4f8ff53358b3c0b3992c
connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75
connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
fake_push: 4910f18f47de46b488f01ba99c64ee92df1e8d62
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
... ... @@ -128,6 +137,7 @@ SPEC CHECKSUMS:
path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
permission_handler: f615215121f43c1640d2b8500d4ad749512828a8
QQ_XGPush: b3b7065cd0b11490974e3b33a24bf6803e7f9392
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
... ...
... ... @@ -48,7 +48,7 @@
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
97C146EE1CF9000F007C117D /* 一键订.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "一键订.app"; sourceTree = BUILT_PRODUCTS_DIR; };
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
... ... @@ -118,7 +118,7 @@
97C146EF1CF9000F007C117D /* Products */ = {
isa = PBXGroup;
children = (
97C146EE1CF9000F007C117D /* Runner.app */,
97C146EE1CF9000F007C117D /* 一键订.app */,
);
name = Products;
sourceTree = "<group>";
... ... @@ -170,7 +170,7 @@
);
name = Runner;
productName = Runner;
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
productReference = 97C146EE1CF9000F007C117D /* 一键订.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
... ... @@ -351,8 +351,8 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: 亚光 盖 (78U98359LM)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 亚光 盖 (78U98359LM)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
... ... @@ -383,7 +383,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
... ... @@ -396,10 +396,10 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
PRODUCT_NAME = "一键订";
PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
... ... @@ -526,7 +526,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
... ... @@ -539,9 +539,9 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "一键订";
PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
... ... @@ -558,7 +558,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
... ... @@ -571,10 +571,10 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
PRODUCT_NAME = "一键订";
PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
... ...
... ... @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BuildableName = "&#x4e00;&#x952e;&#x8ba2;.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
... ... @@ -27,19 +27,17 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BuildableName = "&#x4e00;&#x952e;&#x8ba2;.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
... ... @@ -56,13 +54,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BuildableName = "&#x4e00;&#x952e;&#x8ba2;.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"
... ... @@ -75,7 +71,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BuildableName = "&#x4e00;&#x952e;&#x8ba2;.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
... ...
... ... @@ -7,7 +7,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string></string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
... ...
... ... @@ -55,13 +55,15 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
detailEntity=await detailModel.getReserveDetail(context, {
"rid":widget.rid,
});
setState(() {//未处理
cusmanText=detailEntity.cusman.isEmpty?"请选择":detailEntity.cusman;
});
if(detailEntity.status!="0"){//已处理
Future.delayed(Duration(milliseconds: 200),(){
NavigatorUtil.goNotebookDetailPage(context, detailEntity.id,replace: true);
});
setMessageStatus();
NavigatorUtil.goNotebookDetailPage(context, detailEntity.id,replace: true);
}else{
setState(() {//未处理
cusmanText=detailEntity.cusman.isEmpty?"请选择":detailEntity.cusman;
});
managers=await detailModel.getManagers(context);
}
});
... ... @@ -99,7 +101,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
child: Text("去安排",style: TextStyle(fontSize: ScreenUtil().setSp(32)),),
onPressed: () async {
Navigator.of(context).pop();
String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000),detailEntity.ddate_solt);
String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,int.parse(detailEntity.ddate)*1000,detailEntity.ddate_solt);
if(tid!=null){
setReserveStatus("5",tid:tid);
}
... ... @@ -143,8 +145,12 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
@override
Widget build(BuildContext context) {
// TODO: implement build
return detailEntity==null?Container():SafeArea(
child: Column(
return SafeArea(
child: detailEntity==null?Container(
width: double.infinity,
height: double.infinity,
color: MyColours.color_ffffff,
):Column(
children: <Widget>[
MyAppBar(
"在线预订详情",
... ... @@ -244,7 +250,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
height: 76,
fontSize: 34,
onPress: () async {
String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000),detailEntity.ddate_solt);
String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,int.parse(detailEntity.ddate)*1000,detailEntity.ddate_solt);
if(tid!=null){
setReserveStatus("5",tid:tid);
}
... ...
... ... @@ -76,8 +76,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
@override
Widget build(BuildContext context) {
// TODO: implement build
return detailEntity==null?Container():SafeArea(
child: Container(
return SafeArea(
child: detailEntity==null?Container(
width: double.infinity,
height: double.infinity,
color: MyColours.color_ffffff,
):Container(
color: MyColours.color_ffffff,
child: Column(
children: <Widget>[
... ...
... ... @@ -107,7 +107,7 @@ class HomePageState extends State<HomePage>{
);
jpush.applyPushAuthority(
new NotificationSettingsIOS(sound: true, alert: true, badge: true));
new NotificationSettingsIOS(sound: true, alert: true, badge: false));
// Platform messages may fail, so we use a try/catch PlatformException.
jpush.getRegistrationID().then((rid) {
... ...
... ... @@ -91,7 +91,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
UserModel userModel=Provider.of<UserModel>(context,listen: false);
userModel.initUser();
if(App.sp.getBool("isLogin")??false){
NavigatorUtil.goHomePage(context);
Future.delayed(Duration(milliseconds: 200),(){
NavigatorUtil.goHomePage(context);
});
}
}
... ...
... ... @@ -149,8 +149,12 @@ class SelectTablePageState extends State<SelectTablePage>{
@override
Widget build(BuildContext context) {
// TODO: implement build
return areaTableMap.isEmpty?Container():SafeArea(
child: Column(
return SafeArea(
child: areaTableMap.isEmpty?Container(
width: double.infinity,
height: double.infinity,
color: MyColours.color_ffffff,
):Column(
children: <Widget>[
MyAppBar(
"选择桌位",
... ...
... ... @@ -18,7 +18,7 @@ class NoteBookModel extends ChangeNotifier{
Future<List<Notebook>> getReserveList(BuildContext context,Map<String,String> params) async {
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_reserve_list,
data: params,showLoading: false)
data: params,showLoading: true)
.catchError((error) {
print(error.toString());
});
... ...
... ... @@ -14,7 +14,7 @@ class SelectTableModel{
Future<List<TableOuter>> getTableList(BuildContext context,Map<String,String> params) async {
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.table_list,
data: params,showLoading: false)
data: params,showLoading: true)
.catchError((error) {
print(error.toString());
});
... ...
... ... @@ -45,8 +45,8 @@ class NavigatorUtil {
}
/// 选择桌位
static Future goSelectTablePage(BuildContext context,String rid,DateTime dateTime,String ddate_slot) {
return _navigateTo(context,"${Routes.select_table}?rid=$rid&dateTime=${dateTime.millisecondsSinceEpoch}&ddate_slot=$ddate_slot");
static Future goSelectTablePage(BuildContext context,String rid,int dateTime,String ddate_slot) {
return _navigateTo(context,"${Routes.select_table}?rid=$rid&dateTime=$dateTime&ddate_slot=$ddate_slot");
}
/// 邀请函
... ...