diff --git a/README.md b/README.md index dcec36c3..eabd8cbf 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,8 @@ flutter优点主要包括： ### app 预览 - + + ### Core Team diff --git a/assets/app.db b/assets/app.db index b5b6f0ab..70bb8d87 100644 Binary files a/assets/app.db and b/assets/app.db differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d0f97355..8c3f0e89 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -7,6 +7,22 @@ objects = { /* Begin PBXBuildFile section */ + 0828E495220692B500A59437 /* iPhone Portrait-Retina 4.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E486220692B400A59437 /* iPhone Portrait-Retina 4.png */; }; + 0828E496220692B500A59437 /* iPad Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E487220692B400A59437 /* iPad Portrait.png */; }; + 0828E497220692B500A59437 /* iPhone X_XS Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E488220692B400A59437 /* iPhone X_XS Landscape.png */; }; + 0828E498220692B500A59437 /* iPhone XS Max Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E489220692B400A59437 /* iPhone XS Max Portrait.png */; }; + 0828E499220692B500A59437 /* iPhone Portrait-Retina HD 4.7.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E48A220692B400A59437 /* iPhone Portrait-Retina HD 4.7.png */; }; + 0828E49A220692B500A59437 /* iPhone X_XS Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E48B220692B400A59437 /* iPhone X_XS Portrait.png */; }; + 0828E49B220692B500A59437 /* iPad Landscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E48C220692B400A59437 /* iPad Landscape@2x.png */; }; + 0828E49C220692B500A59437 /* iPhone Landscape-Retina HD 5.5.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E48D220692B400A59437 /* iPhone Landscape-Retina HD 5.5.png */; }; + 0828E49D220692B500A59437 /* iPhone Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E48E220692B400A59437 /* iPhone Portrait@2x.png */; }; + 0828E49E220692B500A59437 /* iPad Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E48F220692B400A59437 /* iPad Portrait@2x.png */; }; + 0828E49F220692B500A59437 /* iPhone XS Max Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E490220692B400A59437 /* iPhone XS Max Landscape.png */; }; + 0828E4A0220692B500A59437 /* iPad Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E491220692B500A59437 /* iPad Landscape.png */; }; + 0828E4A1220692B500A59437 /* iPhone XR Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E492220692B500A59437 /* iPhone XR Portrait.png */; }; + 0828E4A2220692B500A59437 /* iPhone Portrait-Retina HD 5.5.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E493220692B500A59437 /* iPhone Portrait-Retina HD 5.5.png */; }; + 0828E4A3220692B500A59437 /* iPhone XR Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 0828E494220692B500A59437 /* iPhone XR Landscape.png */; }; + 0828E4A52206936100A59437 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0828E4A42206936100A59437 /* Images.xcassets */; }; 084A20882202E4FD00428FF5 /* flutter go.png in Resources */ = {isa = PBXBuildFile; fileRef = 084A20872202E4FD00428FF5 /* flutter go.png */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 333E5DAE7FC10AC69FEC26C0 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA792F029EDD7A11295D192 /* libPods-Runner.a */; }; @@ -38,13 +54,25 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0828E486220692B400A59437 /* iPhone Portrait-Retina 4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone Portrait-Retina 4.png"; sourceTree = ""; }; + 0828E487220692B400A59437 /* iPad Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad Portrait.png"; sourceTree = ""; }; + 0828E488220692B400A59437 /* iPhone X_XS Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone X_XS Landscape.png"; sourceTree = ""; }; + 0828E489220692B400A59437 /* iPhone XS Max Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone XS Max Portrait.png"; sourceTree = ""; }; + 0828E48A220692B400A59437 /* iPhone Portrait-Retina HD 4.7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone Portrait-Retina HD 4.7.png"; sourceTree = ""; }; + 0828E48B220692B400A59437 /* iPhone X_XS Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone X_XS Portrait.png"; sourceTree = ""; }; + 0828E48C220692B400A59437 /* iPad Landscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad Landscape@2x.png"; sourceTree = ""; }; + 0828E48D220692B400A59437 /* iPhone Landscape-Retina HD 5.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone Landscape-Retina HD 5.5.png"; sourceTree = ""; }; + 0828E48E220692B400A59437 /* iPhone Portrait@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone Portrait@2x.png"; sourceTree = ""; }; + 0828E48F220692B400A59437 /* iPad Portrait@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad Portrait@2x.png"; sourceTree = ""; }; + 0828E490220692B400A59437 /* iPhone XS Max Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone XS Max Landscape.png"; sourceTree = ""; }; + 0828E491220692B500A59437 /* iPad Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad Landscape.png"; sourceTree = ""; }; + 0828E492220692B500A59437 /* iPhone XR Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone XR Portrait.png"; sourceTree = ""; }; + 0828E493220692B500A59437 /* iPhone Portrait-Retina HD 5.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone Portrait-Retina HD 5.5.png"; sourceTree = ""; }; + 0828E494220692B500A59437 /* iPhone XR Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone XR Landscape.png"; sourceTree = ""; }; + 0828E4A42206936100A59437 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 084A20872202E4FD00428FF5 /* flutter go.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "flutter go.png"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; -<<<<<<< HEAD -======= - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; ->>>>>>> 12990ce0e83473226cfb16ad9c682c065856d684 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -76,6 +104,28 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0828E485220692A700A59437 /* launch */ = { + isa = PBXGroup; + children = ( + 0828E491220692B500A59437 /* iPad Landscape.png */, + 0828E48C220692B400A59437 /* iPad Landscape@2x.png */, + 0828E48F220692B400A59437 /* iPad Portrait@2x.png */, + 0828E487220692B400A59437 /* iPad Portrait.png */, + 0828E48D220692B400A59437 /* iPhone Landscape-Retina HD 5.5.png */, + 0828E486220692B400A59437 /* iPhone Portrait-Retina 4.png */, + 0828E48A220692B400A59437 /* iPhone Portrait-Retina HD 4.7.png */, + 0828E493220692B500A59437 /* iPhone Portrait-Retina HD 5.5.png */, + 0828E48E220692B400A59437 /* iPhone Portrait@2x.png */, + 0828E488220692B400A59437 /* iPhone X_XS Landscape.png */, + 0828E48B220692B400A59437 /* iPhone X_XS Portrait.png */, + 0828E494220692B500A59437 /* iPhone XR Landscape.png */, + 0828E492220692B500A59437 /* iPhone XR Portrait.png */, + 0828E490220692B400A59437 /* iPhone XS Max Landscape.png */, + 0828E489220692B400A59437 /* iPhone XS Max Portrait.png */, + ); + path = launch; + sourceTree = ""; + }; 0C172CA58CDB230D5DA80034 /* Pods */ = { isa = PBXGroup; children = ( @@ -107,6 +157,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( + 0828E485220692A700A59437 /* launch */, 084A20872202E4FD00428FF5 /* flutter go.png */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, @@ -136,6 +187,7 @@ 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 0828E4A42206936100A59437 /* Images.xcassets */, ); path = Runner; sourceTree = ""; @@ -211,11 +263,27 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 0828E4A0220692B500A59437 /* iPad Landscape.png in Resources */, + 0828E4A1220692B500A59437 /* iPhone XR Portrait.png in Resources */, + 0828E49F220692B500A59437 /* iPhone XS Max Landscape.png in Resources */, 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 0828E4A3220692B500A59437 /* iPhone XR Landscape.png in Resources */, + 0828E4A2220692B500A59437 /* iPhone Portrait-Retina HD 5.5.png in Resources */, + 0828E49A220692B500A59437 /* iPhone X_XS Portrait.png in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 0828E49E220692B500A59437 /* iPad Portrait@2x.png in Resources */, + 0828E49D220692B500A59437 /* iPhone Portrait@2x.png in Resources */, + 0828E499220692B500A59437 /* iPhone Portrait-Retina HD 4.7.png in Resources */, 084A20882202E4FD00428FF5 /* flutter go.png in Resources */, + 0828E497220692B500A59437 /* iPhone X_XS Landscape.png in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 0828E4A52206936100A59437 /* Images.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + 0828E49B220692B500A59437 /* iPad Landscape@2x.png in Resources */, + 0828E495220692B500A59437 /* iPhone Portrait-Retina 4.png in Resources */, + 0828E498220692B500A59437 /* iPhone XS Max Portrait.png in Resources */, + 0828E496220692B500A59437 /* iPad Portrait.png in Resources */, + 0828E49C220692B500A59437 /* iPhone Landscape-Retina HD 5.5.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -440,6 +508,7 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = RDJKXT446D; ENABLE_BITCODE = NO; @@ -464,6 +533,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = RDJKXT446D; ENABLE_BITCODE = NO; diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/ios/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/Image.imageset/Contents.json b/ios/Runner/Assets.xcassets/Image.imageset/Contents.json new file mode 100644 index 00000000..f8f827e4 --- /dev/null +++ b/ios/Runner/Assets.xcassets/Image.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/Contents.json b/ios/Runner/Assets.xcassets/Launch2.launchimage/Contents.json new file mode 100644 index 00000000..ca2d1f56 --- /dev/null +++ b/ios/Runner/Assets.xcassets/Launch2.launchimage/Contents.json @@ -0,0 +1,201 @@ +{ + "images" : [ + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2688h", + "filename" : "iPhone XS Max Portrait.png", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "12.0", + "subtype" : "2688h", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "1792h", + "filename" : "iPhone XR Portrait.png", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "12.0", + "subtype" : "1792h", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2436h", + "filename" : "iPhone X_XS Portrait.png", + "minimum-system-version" : "11.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "11.0", + "subtype" : "2436h", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "iPhone Portrait-Retina HD 5.5.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "iPhone Portrait-Retina HD 4.7.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "iPhone Portrait@2x.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "iPhone Portrait-Retina 4.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "iPad Portrait.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "iPad Landscape.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "iPad Portrait@2x.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "iPad Landscape@2x.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Landscape.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Landscape.png new file mode 100644 index 00000000..67d50a0e Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Landscape.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Landscape@2x.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Landscape@2x.png new file mode 100644 index 00000000..43bc74a8 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Landscape@2x.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Portrait.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Portrait.png new file mode 100644 index 00000000..77b47800 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Portrait.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Portrait@2x.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Portrait@2x.png new file mode 100644 index 00000000..7ef64577 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPad Portrait@2x.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina 4.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina 4.png new file mode 100644 index 00000000..71444466 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina 4.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina HD 4.7.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina HD 4.7.png new file mode 100644 index 00000000..4742330c Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina HD 4.7.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina HD 5.5.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina HD 5.5.png new file mode 100644 index 00000000..a54e30b3 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait-Retina HD 5.5.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait@2x.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait@2x.png new file mode 100644 index 00000000..be1234ca Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone Portrait@2x.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone XR Portrait.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone XR Portrait.png new file mode 100644 index 00000000..da1c3963 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone XR Portrait.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone XS Max Portrait.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone XS Max Portrait.png new file mode 100644 index 00000000..43cbc3cc Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone XS Max Portrait.png differ diff --git a/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone X_XS Portrait.png b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone X_XS Portrait.png new file mode 100644 index 00000000..d4889395 Binary files /dev/null and b/ios/Runner/Assets.xcassets/Launch2.launchimage/iPhone X_XS Portrait.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index 37c7268f..c09c47c0 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -14,6 +14,18 @@ "idiom" : "universal", "filename" : "flutter go-2.png", "scale" : "3x" + }, + { + "idiom" : "iphone", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "scale" : "3x" } ], "info" : { diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index bb646759..73c0a8c2 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -22,13 +22,7 @@ - - - - - - - + diff --git a/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json b/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json new file mode 100644 index 00000000..5a296668 --- /dev/null +++ b/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json @@ -0,0 +1,49 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/launch/iPad Landscape.png b/ios/launch/iPad Landscape.png new file mode 100644 index 00000000..67d50a0e Binary files /dev/null and b/ios/launch/iPad Landscape.png differ diff --git a/ios/launch/iPad Landscape@2x.png b/ios/launch/iPad Landscape@2x.png new file mode 100644 index 00000000..43bc74a8 Binary files /dev/null and b/ios/launch/iPad Landscape@2x.png differ diff --git a/ios/launch/iPad Portrait.png b/ios/launch/iPad Portrait.png new file mode 100644 index 00000000..77b47800 Binary files /dev/null and b/ios/launch/iPad Portrait.png differ diff --git a/ios/launch/iPad Portrait@2x.png b/ios/launch/iPad Portrait@2x.png new file mode 100644 index 00000000..7ef64577 Binary files /dev/null and b/ios/launch/iPad Portrait@2x.png differ diff --git a/ios/launch/iPhone Landscape-Retina HD 5.5.png b/ios/launch/iPhone Landscape-Retina HD 5.5.png new file mode 100644 index 00000000..2c9ee6e5 Binary files /dev/null and b/ios/launch/iPhone Landscape-Retina HD 5.5.png differ diff --git a/ios/launch/iPhone Portrait-Retina 4.png b/ios/launch/iPhone Portrait-Retina 4.png new file mode 100644 index 00000000..71444466 Binary files /dev/null and b/ios/launch/iPhone Portrait-Retina 4.png differ diff --git a/ios/launch/iPhone Portrait-Retina HD 4.7.png b/ios/launch/iPhone Portrait-Retina HD 4.7.png new file mode 100644 index 00000000..4742330c Binary files /dev/null and b/ios/launch/iPhone Portrait-Retina HD 4.7.png differ diff --git a/ios/launch/iPhone Portrait-Retina HD 5.5.png b/ios/launch/iPhone Portrait-Retina HD 5.5.png new file mode 100644 index 00000000..a54e30b3 Binary files /dev/null and b/ios/launch/iPhone Portrait-Retina HD 5.5.png differ diff --git a/ios/launch/iPhone Portrait@2x.png b/ios/launch/iPhone Portrait@2x.png new file mode 100644 index 00000000..be1234ca Binary files /dev/null and b/ios/launch/iPhone Portrait@2x.png differ diff --git a/ios/launch/iPhone XR Landscape.png b/ios/launch/iPhone XR Landscape.png new file mode 100644 index 00000000..2b9df193 Binary files /dev/null and b/ios/launch/iPhone XR Landscape.png differ diff --git a/ios/launch/iPhone XR Portrait.png b/ios/launch/iPhone XR Portrait.png new file mode 100644 index 00000000..da1c3963 Binary files /dev/null and b/ios/launch/iPhone XR Portrait.png differ diff --git a/ios/launch/iPhone XS Max Landscape.png b/ios/launch/iPhone XS Max Landscape.png new file mode 100644 index 00000000..079621c5 Binary files /dev/null and b/ios/launch/iPhone XS Max Landscape.png differ diff --git a/ios/launch/iPhone XS Max Portrait.png b/ios/launch/iPhone XS Max Portrait.png new file mode 100644 index 00000000..43cbc3cc Binary files /dev/null and b/ios/launch/iPhone XS Max Portrait.png differ diff --git a/ios/launch/iPhone X_XS Landscape.png b/ios/launch/iPhone X_XS Landscape.png new file mode 100644 index 00000000..dd4d82f9 Binary files /dev/null and b/ios/launch/iPhone X_XS Landscape.png differ diff --git a/ios/launch/iPhone X_XS Portrait.png b/ios/launch/iPhone X_XS Portrait.png new file mode 100644 index 00000000..d4889395 Binary files /dev/null and b/ios/launch/iPhone X_XS Portrait.png differ diff --git a/lib/utils/shared_preferences.dart b/lib/utils/shared_preferences.dart index 9dee93d4..6d3fc27e 100644 --- a/lib/utils/shared_preferences.dart +++ b/lib/utils/shared_preferences.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:shared_preferences/shared_preferences.dart'; export 'package:flutter_go/resources/shared_preferences_keys.dart'; -/// + /// 用来做shared_preferences的存储 class SpUtil { static SpUtil _instance; @@ -20,7 +20,6 @@ class SpUtil { } static Future getInstance() async { - print("_instance>>$_instance"); if (_instance == null) { _instance = new SpUtil._(); await _instance._init(); diff --git a/lib/widgets/components/Pick/CityPIcker/demo.dart b/lib/widgets/components/Pick/CityPIcker/demo.dart new file mode 100644 index 00000000..99f843a3 --- /dev/null +++ b/lib/widgets/components/Pick/CityPIcker/demo.dart @@ -0,0 +1,44 @@ +// +// Created with Android Studio. +// User: 三帆 +// Date: 05/02/2019 +// Time: 22:06 +// email: sanfan.hx@alibaba-inc.com +// tartget: xxx +// + +import 'package:flutter/material.dart'; +import 'package:city_pickers/city_pickers.dart'; + +class CityPickerDemo extends StatefulWidget { + _Demo createState() => _Demo(); +} + +class _Demo extends State { + String _result; + show(context) async { + Result temp = await CityPickers.showCityPicker( + context: context, +// locationCode: '640221', + height: 400, + ); + setState(() { + _result = "${temp.toString()}"; + }); + } + + Widget build(BuildContext context) { + return Center( + child: Column( + children: [ + Text("result: ${_result.toString()}"), + RaisedButton( + onPressed: () {this.show(context); + }, + child: Text("select"), + ), + ], + ) + ); + } +} diff --git a/lib/widgets/components/Pick/CityPIcker/index.dart b/lib/widgets/components/Pick/CityPIcker/index.dart new file mode 100644 index 00000000..1ee27fa0 --- /dev/null +++ b/lib/widgets/components/Pick/CityPIcker/index.dart @@ -0,0 +1,43 @@ +// +// Created with Android Studio. +// User: 三帆 +// Date: 05/02/2019 +// Time: 22:06 +// email: sanfan.hx@alibaba-inc.com +// tartget: xxx +// + +import 'package:flutter/material.dart'; +import 'package:flutter_go/components/widget_demo.dart'; +import 'demo.dart'; +const String content0 = ''' +### **简介** +> 显示中国的省市县地区 +通过函数 **showCityPicker** 调用, 在容器窗口上弹出遮罩层 +'''; +const String content1 = ''' +### **基本用法** +- locationCode 初始化地区选择 +- height 弹出层高度 +- context 上下文对象 +'''; +class Demo extends StatefulWidget { + static const String routeName = '/components/Pick/CityPicker'; + _Demo createState() => _Demo(); +} + +class _Demo extends State { + + Widget build(BuildContext context) { + return WidgetDemo( + title: 'CityPicker', + codeUrl: '', + docUrl: '', + contentList: [ + content0, + content1, + CityPickerDemo() + ], + ); + } +} diff --git a/lib/widgets/components/Pick/index.dart b/lib/widgets/components/Pick/index.dart index eddd9af8..9c497ddf 100644 --- a/lib/widgets/components/Pick/index.dart +++ b/lib/widgets/components/Pick/index.dart @@ -5,6 +5,7 @@ import 'YearPicker/index.dart' as YearPicker; import 'DayPicker/index.dart' as DayPicker; import 'MonthPicker/index.dart' as MonthPicker; import 'ShowdatePicker/index.dart' as ShowdatePicker; +import 'CityPIcker/index.dart' as CityPicker; List widgetPoints = [ WidgetPoint( @@ -27,4 +28,10 @@ List widgetPoints = [ routerName: ShowdatePicker.Demo.routeName, buildRouter: (BuildContext context) => ShowdatePicker.Demo(), ), + WidgetPoint( + name: 'CityPicker', + routerName: CityPicker.Demo.routeName, + buildRouter: (BuildContext context) => CityPicker.Demo(), + ), + ]; diff --git a/pubspec.yaml b/pubspec.yaml index 3c8a6322..3a43950c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: flutter_webview_plugin: ^0.3.0+2 # 日期格式化 intl: 0.15.7 + city_pickers: ^0.1.0 dev_dependencies: flutter_test: