git@h5.yoqi.me 1 year ago
parent
commit
ba3dad0c04

+ 1 - 0
.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM jianboy/flutter-dev-container:2.10.5

+ 45 - 0
.devcontainer/devcontainer.json

@@ -0,0 +1,45 @@
+// java8 + android env
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/java-8
+{
+    "name": "Java 8",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "args": {
+            // Use the VARIANT arg to pick a Debian OS version: buster, bullseye
+            // Use bullseye when running on local arm64/Apple Silicon.
+            "VARIANT": "buster",
+            // Options
+            "INSTALL_MAVEN": "true",
+            "INSTALL_GRADLE": "true",
+            "NODE_VERSION": "lts/*"
+        }
+    },
+    // Set *default* container specific settings.json values on container create.
+    "settings": {
+        "java.home": "/docker-java-home",
+        "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current",
+        "java.configuration.runtimes": [
+            {
+                "default": true,
+                "name": "JavaSE-1.8",
+                "path": "/usr/local/sdkman/candidates/java/current"
+            }
+        ]
+    },
+    // Add the IDs of extensions you want installed when the container is created.
+    "extensions": [
+        "vscjava.vscode-java-pack",
+        "dart-code.dart-code",
+        "dart-code.flutter"
+    ],
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+    // Use 'postCreateCommand' to run commands after the container is created.
+    // "postCreateCommand": "java -version",
+    // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "vscode",
+    "features": {
+        "docker-in-docker": "latest"
+    }
+}

+ 2 - 2
android/build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext.kotlin_version = '1.3.50'
     repositories {
 //        google()
-//        jcenter()
+//        mavenCentral()
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
 //        google()
-//        jcenter()
+//        mavenCentral()
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }

+ 2 - 2
lib/pages/cart.dart

@@ -32,7 +32,7 @@ class ItemList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(
-      children: <Widget>[
+      children: [
         Expanded(child: CartList()),
         // TotalPrice(),
         Padding(
@@ -62,7 +62,7 @@ class CartList extends StatelessWidget {
           itemBuilder: (c, index) {
             return Row(
               mainAxisAlignment: MainAxisAlignment.start,
-              children: <Widget>[
+              children: [
                 Expanded(
                   flex: 1,
                   child: Container(

+ 1 - 1
lib/pages/check_out.dart

@@ -25,7 +25,7 @@ class CheckOut extends StatelessWidget {
             color: Colors.white,
             borderRadius: BorderRadius.all(Radius.circular(24))),
         child: Column(
-          children: <Widget>[
+          children: [
             Text(
               "订单支付页面",
               style: Theme.of(context)

+ 1 - 1
lib/pages/details/components/add_to_cart.dart

@@ -19,7 +19,7 @@ class AddToCart extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: kDefaultPaddin),
       child: Row(
-        children: <Widget>[
+        children: [
           Expanded(
             child: SizedBox(
               height: 50,

+ 3 - 3
lib/pages/details/components/body.dart

@@ -16,11 +16,11 @@ class DetailsBody extends StatelessWidget {
 
     return SingleChildScrollView(
       child: Column(
-        children: <Widget>[
+        children: [
           SizedBox(
             height: size.height * 1.2,
             child: Stack(
-              children: <Widget>[
+              children: [
                 Container(
                   margin: EdgeInsets.only(top: size.height * 0.4),
                   padding: EdgeInsets.only(
@@ -37,7 +37,7 @@ class DetailsBody extends StatelessWidget {
                     ),
                   ),
                   child: Column(
-                    children: <Widget>[
+                    children: [
                       // ColorAndSize(product: product),
                       // SizedBox(height: kDefaultPaddin / 2),
                       Description(product: product),

+ 1 - 1
lib/pages/details/components/cart_counter.dart

@@ -23,7 +23,7 @@ class _CartCounterState extends State<CartCounter> {
     final myTableDetail = Provider.of<TableDetail>(context);
     int numOfItems = myTableDetail.getItemCount(product);
     return Row(
-      children: <Widget>[
+      children: [
         buildOutlineButton(
           icon: Icons.remove,
           press: () {

+ 3 - 3
lib/pages/details/components/color_and_size.dart

@@ -13,14 +13,14 @@ class ColorAndSize extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
-      children: <Widget>[
+      children: [
         Expanded(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
+            children: [
               Text("Color"),
               Row(
-                children: <Widget>[
+                children: [
                   ColorDot(
                     color: Color(0xFF356C95),
                     isSelected: true,

+ 1 - 1
lib/pages/details/components/counter_with_fav_btn.dart

@@ -16,7 +16,7 @@ class CounterWithFavBtn extends StatelessWidget {
   Widget build(BuildContext context) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: <Widget>[
+      children: [
         CartCounter(
           product: product,
         ),

+ 2 - 2
lib/pages/details/components/product_title_with_image.dart

@@ -16,7 +16,7 @@ class ProductTitleWithImage extends StatelessWidget {
       padding: const EdgeInsets.symmetric(horizontal: kDefaultPaddin),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
+        children: [
           Text(
             "最最美味的菜品来自海底捞",
             style: TextStyle(color: Colors.white),
@@ -30,7 +30,7 @@ class ProductTitleWithImage extends StatelessWidget {
           ),
           SizedBox(height: kDefaultPaddin),
           Row(
-            children: <Widget>[
+            children: [
               RichText(
                 text: TextSpan(
                   children: [

+ 5 - 5
lib/pages/login_page.dart

@@ -45,7 +45,7 @@ class _LoginPageState extends State<LoginPage> {
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
+          children: [
             buildTopWidget(context),
             SizedBox(
               height: 80,
@@ -68,7 +68,7 @@ class _LoginPageState extends State<LoginPage> {
       color: Colors.green,
       child: Stack(
         overflow: Overflow.visible, // 超出部分显示
-        children: <Widget>[
+        children: [
           Positioned(
             left: (width - 90) / 2.0,
             top: height - 45,
@@ -101,7 +101,7 @@ class _LoginPageState extends State<LoginPage> {
     return Container(
       margin: EdgeInsets.only(left: 15, right: 15),
       child: Column(
-        children: <Widget>[
+        children: [
           buildLoginNameTextField(),
           SizedBox(height: 20.0),
           buildPwdTextField(),
@@ -118,7 +118,7 @@ class _LoginPageState extends State<LoginPage> {
         borderRadius: BorderRadius.all(Radius.circular(20.0)),
       ),
       child: Stack(
-        children: <Widget>[
+        children: [
           Positioned(
             left: 16,
             top: 11,
@@ -163,7 +163,7 @@ class _LoginPageState extends State<LoginPage> {
           borderRadius: BorderRadius.all(Radius.circular(20.0)),
         ),
         child: Stack(
-          children: <Widget>[
+          children: [
             Positioned(
               left: 16,
               top: 11,

+ 1 - 1
lib/pages/order/components/categories.dart

@@ -37,7 +37,7 @@ class _CategoriesState extends State<Categories> {
         padding: const EdgeInsets.symmetric(horizontal: kDefaultPaddin),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
+          children: [
             Text(
               categories[index],
               style: TextStyle(

+ 1 - 1
lib/pages/order/components/item-card.dart

@@ -18,7 +18,7 @@ class ItemCard extends StatelessWidget {
       onTap: press,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
+        children: [
           Expanded(
             child: Container(
               padding: EdgeInsets.all(kDefaultPaddin),

+ 2 - 2
lib/pages/staff_info_page.dart

@@ -17,11 +17,11 @@ class _StaffInfoState extends State<StaffInfoPage> {
       ),
       body: Card(
         child: Row(
-          children: <Widget>[
+          children: [
             Column(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
+              children: [
                 Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Text(

+ 5 - 5
lib/pages/table.dart

@@ -42,7 +42,7 @@ class _TableState extends State<TablePage> {
     return FlexibleSpaceBar(
       title: Column(
         mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
+        children: [
           Text('目前开台数:' + tableStatusList.size().toString(),
               style: TextStyle(fontSize: 12)),
           Text(
@@ -108,9 +108,9 @@ class _TableState extends State<TablePage> {
             color: Colors.green,
           ),
           child: Column(
-            children: <Widget>[
+            children: [
               Row(
-                children: <Widget>[
+                children: [
                   Icon(
                     Icons.warning,
                     color: Colors.white,
@@ -134,9 +134,9 @@ class _TableState extends State<TablePage> {
             color: Colors.blue,
           ),
           child: Column(
-            children: <Widget>[
+            children: [
               Row(
-                children: <Widget>[
+                children: [
                   Icon(
                     Icons.audiotrack,
                     color: Colors.white,

+ 4 - 4
lib/pages/welcome_page.dart

@@ -18,7 +18,7 @@ class WelcomePage extends StatelessWidget {
       ),
       body: Consumer<UserStatus>(builder: (context, userStatus, child) {
         return Column(
-          children: <Widget>[
+          children: [
             GestureDetector(
               child: IndexCard("顾客", "开始自主点餐,并进行结算"),
               onTap: () {
@@ -60,10 +60,10 @@ class IndexCard extends StatelessWidget {
             padding: EdgeInsets.fromLTRB(15, 15, 15, 15),
             child: Column(
               mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
+              children: [
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: <Widget>[
+                  children: [
                     Text(
                       title,
                       style: TextStyle(fontSize: 30),
@@ -73,7 +73,7 @@ class IndexCard extends StatelessWidget {
                   ],
                 ),
                 Row(
-                  children: <Widget>[
+                  children: [
                     Icon(Icons.border_color),
                     Text(description)
                   ],