Merge branch 'develop' of gitlab.m.tbkt.cn:liangjialin/Flutter_app into develop

doc/liangjialin/20200313Flutter容器类组件学习（1）/填充、尺寸限制类容器、装饰容器、变换

-填充、尺寸限制类容器、装饰容器、变换
-填充、尺寸限制类容器、装饰容器、变换
+++ /dev/null
\ No newline at end of file

lib/liangjialin/liangjialin.dart

 import 'package:flutter/material.dart';
 
 import 'liangjialin_image.dart';
+import 'liangjialin_image_local.dart';
 
-
-class liangjialin extends StatelessWidget{
-
+class liangjialin extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-
-    return MaterialApp(
-      title: "梁佳霖",
-      home: new Scaffold(
-        appBar: AppBar(title:Text('梁佳霖'),centerTitle: true),
+      return new Scaffold(
+        appBar: AppBar(title: Text('梁佳霖'), centerTitle: true),
         body: LiangjialinHome(),
-      ),
       );
   }
 }
 
-class LiangjialinHome extends StatelessWidget{
-
+class LiangjialinHome extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     // TODO: implement build
@@ -37,12 +31,23 @@ class LiangjialinHome extends StatelessWidget{
                       builder: (context) => liangjialin_image(),
                     ));
               },
-              child: Text("图片组件Demo"),
+              child: Text("网络加载图片并裁剪"),
+            ),RaisedButton(
+              color: Theme.of(context).primaryColor,
+              textColor: Colors.white,
+              onPressed: () {
+                Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => liangjialin_image_local(),
+                    ));
+              },
+              child: Text("加载本地图片"),
             ),
           ],
         ),
         alignment: Alignment.center,
-        padding:EdgeInsets.all(10) ,
+        padding: EdgeInsets.all(10),
         decoration: BoxDecoration(
           color: Colors.black12,
         ),

lib/liangjialin/liangjialin_image.dart

 import 'package:flutter/material.dart';
 
-class liangjialin_image extends StatelessWidget{
+class liangjialin_image extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
-    return MaterialApp(
-      title: "梁佳霖",
-      home: new Scaffold(
-        appBar: AppBar(title:Text('梁佳霖'),centerTitle: true),
+        return new Scaffold(
+          appBar: AppBar(title: Text("网络获取图片裁剪"),centerTitle: true),
+          body: ImageDemoSection(),
+        );
+  }
+}
+
+class ImageDemoSection extends StatelessWidget{
+
+  @override
+  Widget build(BuildContext context) {
+
+    return new Center(
+        child: new Container(
+          width: 300,
+          height: 300,
+          decoration: BoxDecoration(
+            color: Colors.green,
+            borderRadius: BorderRadius.all(Radius.circular(150.0)),
+            image: DecorationImage(
+                image: new NetworkImage('https://flylai.com/wp-content/uploads/2019/02/flutter_bg2-576x1024.png'),
+                fit: BoxFit.cover
+            ),
           ),
+        )
     );
   }
 }
\ No newline at end of file

lib/liangjialin/liangjialin_image_local.dart

+import 'package:flutter/material.dart';
+
+class liangjialin_image_local extends StatelessWidget {
+
+  @override
+  Widget build(BuildContext context) {
+        return new Scaffold(
+          appBar: AppBar(title: Text("加载本地图片并裁剪"),centerTitle: true),
+          body: ImageDemoSection(),
+        );
+  }
+}
+
+class ImageDemoSection extends StatelessWidget{
+
+  @override
+  Widget build(BuildContext context) {
+
+    return new Center(
+        child: new Container(
+          width: 300,
+          height: 300,
+          decoration: BoxDecoration(
+            color: Colors.green,
+            borderRadius: BorderRadius.all(Radius.circular(150.0)),
+            image: DecorationImage(
+                image: new ExactAssetImage("images/time.png"),
+            fit: BoxFit.fill)
+          ),
+        )
+    );
+  }
+}
\ No newline at end of file

lib/router_path.dart

@@ -5,6 +5,8 @@ import 'package:flutterpro/yangjunlei/yangjunlei.dart';
 import 'dingbaojie/FirstDay/PaddingDemo.dart';
 import 'jiexifeng/jiexifeng.dart';
 import 'liangjialin/liangjialin.dart';
+import 'liangjialin/liangjialin_image.dart';
+import 'liangjialin/liangjialin_image_local.dart';
 
 class RouterName {
   static const String dingbaojie = 'dingbaojie';
@@ -12,6 +14,7 @@ class RouterName {
   static const String yangjunlei = 'yangjunlei';
   static const String liangjialin = 'liangjialin';
   static const String image_liangjialin = 'liangjialin/image';
+  static const String image_liangjialin_local = 'liangjialin/image_local';
 }
 
 class Router {
@@ -21,7 +24,8 @@ class Router {
       RouterName.jiexifeng: (context) => new jiexifeng(),
       RouterName.yangjunlei: (context) => new YangJunLei(),
       RouterName.liangjialin: (context) => new liangjialin(),
-      RouterName.image_liangjialin: (context) => new liangjialin(),
+      RouterName.image_liangjialin: (context) => new liangjialin_image(),
+      RouterName.image_liangjialin_local: (context) => new liangjialin_image_local(),
     };
     return routes;
   }

pubspec.yaml

@@ -39,7 +39,11 @@ flutter:
   # included with your application, so that you can use the icons in
   # the material Icons class.
   uses-material-design: true
-
+  assets:
+    - images/2.0x/time.png
+    - images/3.0x/time.png
+    - images/4.0x/time.png
+    - images/time.png
   # To add assets to your application, add an assets section, like this:
   # assets:
   #  - images/a_dot_burr.jpeg