Merge pr & fix #6

flutterchina · Dec 4, 2018 · 23f73aa · 23f73aa
1 parent fbef0d4
commit 23f73aa
Show file tree

Hide file tree

Showing 66 changed files with 361 additions and 419 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/_book/chapter1/dart.html b/_book/chapter1/dart.html
@@ -367,9 +367,9 @@
 
         </li>
 
-        <li class="chapter " data-level="1.4.3" data-path="../chapter3/img_and_icon.html">
+        <li class="chapter " data-level="1.4.3" data-path="../chapter3/buttons.html">
 
-                <a href="../chapter3/img_and_icon.html">
+                <a href="../chapter3/buttons.html">
 
 
                     按钮
@@ -1355,7 +1355,7 @@ <h1>
 
                                 <h1 id="dart&#x8BED;&#x8A00;&#x7B80;&#x4ECB;">Dart&#x8BED;&#x8A00;&#x7B80;&#x4ECB;</h1>
 <p>&#x5728;&#x4E4B;&#x524D;&#x6211;&#x4EEC;&#x5DF2;&#x7ECF;&#x4ECB;&#x7ECD;&#x8FC7;Dart&#x8BED;&#x8A00;&#x7684;&#x76F8;&#x5173;&#x7279;&#x6027;&#xFF0C;&#x8BFB;&#x8005;&#x53EF;&#x4EE5;&#x7FFB;&#x770B;&#x4E00;&#x4E0B;&#xFF0C;&#x5982;&#x679C;&#x4F60;&#x719F;&#x6089;Dart&#x8BED;&#x6CD5;&#xFF0C;&#x53EF;&#x4EE5;&#x8DF3;&#x8FC7;&#x672C;&#x8282;&#xFF0C;&#x5982;&#x679C;&#x4F60;&#x8FD8;&#x4E0D;&#x4E86;&#x89E3;Dart&#xFF0C;&#x4E0D;&#x7528;&#x62C5;&#x5FC3;&#xFF0C;&#x6309;&#x7167;&#x7B14;&#x8005;&#x7ECF;&#x9A8C;&#xFF0C;&#x5982;&#x679C;&#x4F60;&#x6709;&#x8FC7;&#x5176;&#x4ED6;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x7ECF;&#x9A8C;&#xFF0C;&#x5C24;&#x5176;&#x662F;Java&#x548C;JavaScript&#x7684;&#x8BDD;&#xFF0C;&#x6240;&#x4EE5;&#xFF0C;&#x5982;&#x679C;&#x4F60;&#x662F;&#x524D;&#x7AEF;&#x6216;Android&#x5F00;&#x53D1;&#x8005;&#xFF0C;&#x90A3;&#x4E48;&#x5C06;&#x4F1A;&#x975E;&#x5E38;&#x5BB9;&#x6613;&#x4E0A;&#x624B;Dart&#x3002;&#x5F53;&#x7136;&#xFF0C;&#x5982;&#x679C;&#x4F60;&#x662F;iOS&#x5F00;&#x53D1;&#x8005;&#xFF0C;&#x4E5F;&#x4E0D;&#x7528;&#x62C5;&#x5FC3;&#xFF0C;dart&#x4E2D;&#x4E5F;&#x6709;&#x4E00;&#x4E9B;&#x4E0E;swift&#x6BD4;&#x8F83;&#x76F8;&#x4F3C;&#x7684;&#x7279;&#x6027;&#xFF0C;&#x5982;&#x547D;&#x540D;&#x53C2;&#x6570;&#x7B49;&#xFF0C;&#x7B14;&#x8005;&#x5F53;&#x65F6;&#x5B66;&#x4E60;Dart&#x65F6;&#xFF0C;&#x53EA;&#x662F;&#x82B1;&#x4E86;&#x4E00;&#x4E2A;&#x5C0F;&#x65F6;&#xFF0C;&#x770B;&#x5B8C;Dart&#x5B98;&#x7F51;&#x7684;Language Tour&#xFF0C;&#x5C31;&#x5F00;&#x59CB;&#x52A8;&#x624B;&#x5199;Fluttter&#x4E86;&#x3002;</p>
-<p>&#x5728;&#x7B14;&#x8005;&#x770B;&#x6765;&#xFF0C;Dart&#x7684;&#x8BBE;&#x8BA1;&#x76EE;&#x6807;&#x5E94;&#x8BE5;&#x662F;&#x65E2;&#x5BF9;&#x6807;Java&#xFF0C;&#x4E5F;&#x5BF9;&#x6807;JavaScript&#xFF0C;Dart&#x5728;&#x9759;&#x6001;&#x8BED;&#x6CD5;&#x65B9;&#x9762;&#x548C;Java&#x975E;&#x5E38;&#x76F8;&#x4F3C;&#xFF0C;&#x5982;&#x7C7B;&#x578B;&#x5B9A;&#x4E49;&#x3001;&#x51FD;&#x6570;&#x58F0;&#x660E;&#x3001;&#x6CDB;&#x578B;&#x7B49;&#xFF0C;&#x800C;&#x5728;&#x52A8;&#x6001;&#x7279;&#x6027;&#x65B9;&#x9762;&#x53C8;&#x548C;JavaScript&#x5F88;&#x50CF;&#xFF0C;&#x5982;&#x51FD;&#x6570;&#x5F0F;&#x7279;&#x6027;&#x3001;&#x5F02;&#x6B65;&#x652F;&#x6301;&#x7B49;&#x3002;&#x9664;&#x4E86;&#x878D;&#x5408;Java&#x548C;JavaScript&#x8BED;&#x8A00;&#x4E4B;&#x6240;&#x957F;&#x4E4B;&#x5916;&#xFF0C;Dart&#x4E5F;&#x5177;&#x6709;&#x4E00;&#x4E9B;&#x5176;&#x5B83;&#x5177;&#x6709;&#x8868;&#x73B0;&#x529B;&#x7684;&#x8BED;&#x6CD5;&#xFF0C;&#x5982;&#x53EF;&#x9009;&#x547D;&#x540D;&#x53C2;&#x6570;&#x3001;<code>..</code>&#xFF08;&#x7EA7;&#x8054;&#x8FD0;&#x7B97;&#x7B26;&#xFF09;&#x548C;<code>?.</code>&#xFF08;&#x6761;&#x4EF6;&#x6210;&#x5458;&#x8BBF;&#x95EE;&#x8FD0;&#x7B97;&#x7B26;&#xFF09;&#x4EE5;&#x53CA;<code>??</code>&#xFF08;&#x5224;&#x7A7A;&#x8D4B;&#x503C;&#x8FD0;&#x7B97;&#x7B26;&#xFF09;&#x3002;&#x5176;&#x5B9E;&#xFF0C;&#x5BF9;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x4E86;&#x89E3;&#x6BD4;&#x8F83;&#x591A;&#x7684;&#x8BFB;&#x8005;&#x4F1A;&#x53D1;&#x73B0;&#xFF0C;&#x5728;Dart&#x4E2D;&#x5176;&#x5B9E;&#x770B;&#x5230;&#x7684;&#x4E0D;&#x4EC5;&#x6709;Java&#x548C;JavaScript&#x7684;&#x5F71;&#x5B50;&#xFF0C;&#x5B83;&#x8FD8;&#x5177;&#x6709;&#x5176;&#x5B83;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x4E2D;&#x7684;&#x8EAB;&#x5F71;&#xFF0C;&#x5982;&#x547D;&#x540D;&#x53C2;&#x6570;&#x5728;Objective-C&#x548C;Swift&#x4E2D;&#x65E9;&#x5C31;&#x5F88;&#x666E;&#x904D;&#xFF0C;&#x800C;<code>??</code>&#x64CD;&#x4F5C;&#x7B26;&#x5728;Php 7.0&#x8BED;&#x6CD5;&#x4E2D;&#x5C31;&#x5DF2;&#x7ECF;&#x5B58;&#x5728;&#x4E86;&#xFF0C;&#x56E0;&#x6B64;&#x6211;&#x4EEC;&#x53EF;&#x4EE5;&#x770B;&#x5230;Google&#x5BF9;Dart&#x8BED;&#x8A00;&#x7ED9;&#x4E88;&#x539A;&#x671B;&#xFF0C;&#x4E8B;&#x9879;&#x628A;Dart&#x6253;&#x9020;&#x6210;&#x4E00;&#x95E8;&#x96C6;&#x767E;&#x5BB6;&#x4E4B;&#x6240;&#x957F;&#x7684;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x3002;</p>
+<p>&#x5728;&#x7B14;&#x8005;&#x770B;&#x6765;&#xFF0C;Dart&#x7684;&#x8BBE;&#x8BA1;&#x76EE;&#x6807;&#x5E94;&#x8BE5;&#x662F;&#x65E2;&#x5BF9;&#x6807;Java&#xFF0C;&#x4E5F;&#x5BF9;&#x6807;JavaScript&#xFF0C;Dart&#x5728;&#x9759;&#x6001;&#x8BED;&#x6CD5;&#x65B9;&#x9762;&#x548C;Java&#x975E;&#x5E38;&#x76F8;&#x4F3C;&#xFF0C;&#x5982;&#x7C7B;&#x578B;&#x5B9A;&#x4E49;&#x3001;&#x51FD;&#x6570;&#x58F0;&#x660E;&#x3001;&#x6CDB;&#x578B;&#x7B49;&#xFF0C;&#x800C;&#x5728;&#x52A8;&#x6001;&#x7279;&#x6027;&#x65B9;&#x9762;&#x53C8;&#x548C;JavaScript&#x5F88;&#x50CF;&#xFF0C;&#x5982;&#x51FD;&#x6570;&#x5F0F;&#x7279;&#x6027;&#x3001;&#x5F02;&#x6B65;&#x652F;&#x6301;&#x7B49;&#x3002;&#x9664;&#x4E86;&#x878D;&#x5408;Java&#x548C;JavaScript&#x8BED;&#x8A00;&#x4E4B;&#x6240;&#x957F;&#x4E4B;&#x5916;&#xFF0C;Dart&#x4E5F;&#x5177;&#x6709;&#x4E00;&#x4E9B;&#x5176;&#x5B83;&#x5177;&#x6709;&#x8868;&#x73B0;&#x529B;&#x7684;&#x8BED;&#x6CD5;&#xFF0C;&#x5982;&#x53EF;&#x9009;&#x547D;&#x540D;&#x53C2;&#x6570;&#x3001;<code>..</code>&#xFF08;&#x7EA7;&#x8054;&#x8FD0;&#x7B97;&#x7B26;&#xFF09;&#x548C;<code>?.</code>&#xFF08;&#x6761;&#x4EF6;&#x6210;&#x5458;&#x8BBF;&#x95EE;&#x8FD0;&#x7B97;&#x7B26;&#xFF09;&#x4EE5;&#x53CA;<code>??</code>&#xFF08;&#x5224;&#x7A7A;&#x8D4B;&#x503C;&#x8FD0;&#x7B97;&#x7B26;&#xFF09;&#x3002;&#x5176;&#x5B9E;&#xFF0C;&#x5BF9;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x4E86;&#x89E3;&#x6BD4;&#x8F83;&#x591A;&#x7684;&#x8BFB;&#x8005;&#x4F1A;&#x53D1;&#x73B0;&#xFF0C;&#x5728;Dart&#x4E2D;&#x5176;&#x5B9E;&#x770B;&#x5230;&#x7684;&#x4E0D;&#x4EC5;&#x6709;Java&#x548C;JavaScript&#x7684;&#x5F71;&#x5B50;&#xFF0C;&#x5B83;&#x8FD8;&#x5177;&#x6709;&#x5176;&#x5B83;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x4E2D;&#x7684;&#x8EAB;&#x5F71;&#xFF0C;&#x5982;&#x547D;&#x540D;&#x53C2;&#x6570;&#x5728;Objective-C&#x548C;Swift&#x4E2D;&#x65E9;&#x5C31;&#x5F88;&#x666E;&#x904D;&#xFF0C;&#x800C;<code>??</code>&#x64CD;&#x4F5C;&#x7B26;&#x5728;Php 7.0&#x8BED;&#x6CD5;&#x4E2D;&#x5C31;&#x5DF2;&#x7ECF;&#x5B58;&#x5728;&#x4E86;&#xFF0C;&#x56E0;&#x6B64;&#x6211;&#x4EEC;&#x53EF;&#x4EE5;&#x770B;&#x5230;Google&#x5BF9;Dart&#x8BED;&#x8A00;&#x7ED9;&#x4E88;&#x539A;&#x671B;&#xFF0C;&#x662F;&#x60F3;&#x628A;Dart&#x6253;&#x9020;&#x6210;&#x4E00;&#x95E8;&#x96C6;&#x767E;&#x5BB6;&#x4E4B;&#x6240;&#x957F;&#x7684;&#x7F16;&#x7A0B;&#x8BED;&#x8A00;&#x3002;</p>
 <p>&#x63A5;&#x4E0B;&#x6765;&#xFF0C;&#x6211;&#x4EEC;&#x5148;&#x5BF9;Dart&#x8BED;&#x6CD5;&#x505A;&#x4E00;&#x4E2A;&#x7B80;&#x5355;&#x7684;&#x4ECB;&#x7ECD;&#xFF0C;&#x7136;&#x540E;&#x518D;&#x5C06;Dart&#x4E0E;JavaScript&#x548C;Java&#x505A;&#x4E00;&#x4E2A;&#x7B80;&#x8981;&#x7684;&#x5BF9;&#x6BD4;&#xFF0C;&#x65B9;&#x9762;&#x8BFB;&#x8005;&#x66F4;&#x597D;&#x7684;&#x7406;&#x89E3;&#x3002;</p>
 <blockquote>
 <p>&#x6CE8;&#x610F;&#xFF1A;&#x7531;&#x4E8E;&#x672C;&#x4E66;&#x5E76;&#x975E;&#x4E13;&#x95E8;&#x4ECB;&#x7ECD;Dart&#x8BED;&#x8A00;&#x7684;&#x4E66;&#x7C4D;&#xFF0C;&#x6240;&#x4EE5;&#x672C;&#x7AE0;&#x4E3B;&#x8981;&#x4F1A;&#x4ECB;&#x7ECD;&#x4E00;&#x4E0B;&#x5728;Flutter&#x5F00;&#x53D1;&#x4E2D;&#x5E38;&#x7528;&#x7684;&#x8BED;&#x6CD5;&#x7279;&#x6027;&#xFF0C;&#x5982;&#x679C;&#x60F3;&#x66F4;&#x591A;&#x4E86;&#x89E3;Dart&#xFF0C;&#x8BFB;&#x8005;&#x53EF;&#x4EE5;&#x53BB;Dart&#x5B98;&#x7F51;&#x5B66;&#x4E60;&#xFF0C;&#x73B0;&#x5728;&#x4E92;&#x8054;&#x7F51;&#x4E0A;Dart&#x76F8;&#x5173;&#x8D44;&#x6599;&#x5DF2;&#x7ECF;&#x5F88;&#x591A;&#x4E86;&#x3002;&#x53E6;&#x5916;Dart 2.0&#x5DF2;&#x7ECF;&#x6B63;&#x5F0F;&#x53D1;&#x5E03;&#xFF0C;&#x6240;&#x4EE5;&#x672C;&#x4E66;&#x6240;&#x6709;&#x793A;&#x4F8B;&#x5747;&#x91C7;&#x7528;Dart 2.0&#x8BED;&#x6CD5;&#x3002;</p>
@@ -1682,7 +1682,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"Dart语言简介","level":"1.2.4","depth":2,"next":{"title":"第一个Flutter应用","level":"1.3","depth":1,"path":"chapter2/index.md","ref":"chapter2/index.md","articles":[{"title":"计数器示例","level":"1.3.1","depth":2,"path":"chapter2/first_flutter_app.md","ref":"chapter2/first_flutter_app.md","articles":[]},{"title":"路由管理","level":"1.3.2","depth":2,"path":"chapter2/flutter_router.md","ref":"chapter2/flutter_router.md","articles":[]},{"title":"包管理","level":"1.3.3","depth":2,"path":"chapter2/flutter_package_mgr.md","ref":"chapter2/flutter_package_mgr.md","articles":[]},{"title":"资源管理","level":"1.3.4","depth":2,"path":"chapter2/flutter_assets_mgr.md","ref":"chapter2/flutter_assets_mgr.md","articles":[]},{"title":"调试Flutter APP","level":"1.3.5","depth":2,"path":"chapter2/flutter_app_debug.md","ref":"chapter2/flutter_app_debug.md","articles":[]}]},"previous":{"title":"搭建Flutter开发环境","level":"1.2.3","depth":2,"path":"chapter1/install_flutter.md","ref":"chapter1/install_flutter.md","articles":[]},"dir":"ltr"},"config":{"plugins":["-search","search-pro","ace","splitter","toggle-chapters","prism","donate","-highlight","favicon"],"root":"docs","styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"prism":{},"ace":{},"github":{"url":"https://github.com/flutterchina"},"splitter":{},"search-pro":{"cutWordLib":"nodejieba","defineWord":["Gitbook Use"]},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"donate":{"alipay":"","alipayText":"支付宝打赏","button":"赏","title":"","wechat":"https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/pay.jpg","wechatText":"微信打赏"},"fontsettings":{"theme":"white","family":"sans","size":2},"favicon":{"shortcut":"https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/favicon.png","bookmark":"https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/favicon.png"},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"toggle-chapters":{}},"theme":"default","author":"wendux 824783146@qq.com","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"title":"《Flutter实战》","language":"zh-hans","links":{"sharing":{"all":null,"facebook":null,"google":null,"twitter":null,"weibo":null},"sidebar":{"<div><img height=20 style='position:relative; top:5px; padding-right:5px ' src='https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/favicon.png'/> Flutter中文网</div>":"https://flutterchina.club"}},"gitbook":"*","description":"记录Gitbook的配置和一些插件的使用"},"file":{"path":"chapter1/dart.md","mtime":"2018-11-28T06:10:37.858Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-11-30T11:11:59.830Z"},"basePath":"..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"Dart语言简介","level":"1.2.4","depth":2,"next":{"title":"第一个Flutter应用","level":"1.3","depth":1,"path":"chapter2/index.md","ref":"chapter2/index.md","articles":[{"title":"计数器示例","level":"1.3.1","depth":2,"path":"chapter2/first_flutter_app.md","ref":"chapter2/first_flutter_app.md","articles":[]},{"title":"路由管理","level":"1.3.2","depth":2,"path":"chapter2/flutter_router.md","ref":"chapter2/flutter_router.md","articles":[]},{"title":"包管理","level":"1.3.3","depth":2,"path":"chapter2/flutter_package_mgr.md","ref":"chapter2/flutter_package_mgr.md","articles":[]},{"title":"资源管理","level":"1.3.4","depth":2,"path":"chapter2/flutter_assets_mgr.md","ref":"chapter2/flutter_assets_mgr.md","articles":[]},{"title":"调试Flutter APP","level":"1.3.5","depth":2,"path":"chapter2/flutter_app_debug.md","ref":"chapter2/flutter_app_debug.md","articles":[]}]},"previous":{"title":"搭建Flutter开发环境","level":"1.2.3","depth":2,"path":"chapter1/install_flutter.md","ref":"chapter1/install_flutter.md","articles":[]},"dir":"ltr"},"config":{"plugins":["-search","search-pro","ace","splitter","toggle-chapters","prism","donate","-highlight","favicon"],"root":"docs","styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"prism":{},"ace":{},"github":{"url":"https://github.com/flutterchina"},"splitter":{},"search-pro":{"cutWordLib":"nodejieba","defineWord":["Gitbook Use"]},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"donate":{"alipay":"","alipayText":"支付宝打赏","button":"有用，赏","title":"","wechat":"https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/pay.jpg","wechatText":"微信打赏"},"fontsettings":{"theme":"white","family":"sans","size":2},"favicon":{"shortcut":"https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/favicon.png","bookmark":"https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/favicon.png"},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"toggle-chapters":{}},"theme":"default","author":"wendux 824783146@qq.com","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"title":"《Flutter实战》","language":"zh-hans","links":{"sharing":{"all":null,"facebook":null,"google":null,"twitter":null,"weibo":null},"sidebar":{"<div><img height=20 style='position:relative; top:5px; padding-right:5px ' src='https://cdn.jsdelivr.net/gh/flutterchina/website@1.0/images/favicon.png'/> Flutter中文网</div>":"https://flutterchina.club"}},"gitbook":"*","description":"记录Gitbook的配置和一些插件的使用"},"file":{"path":"chapter1/dart.md","mtime":"2018-12-04T02:38:54.400Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-12-04T02:45:40.221Z"},"basePath":"..","book":{"language":""}});
         });
     </script>
 </div>