sth

liyanfei250 · liyanfei250 · commit 9e61da023960 · 2019-01-05T16:54:24.000+08:00
diff --git a/images/splash_logo.png b/images/splash_logo.png
diff --git a/lib/fonts/iconfont.ttf b/lib/fonts/iconfont.ttf
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,6 @@
 import 'package:coderiver/ui/Application.dart';
+import 'package:coderiver/ui/home/HomePage.dart';
+import 'package:coderiver/ui/home/SplashPage.dart';
 import 'package:coderiver/ui/login/LoginPage.dart';
 import 'package:flutter/material.dart';
 
@@ -9,10 +11,11 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      home: Scaffold(
-        body: LoginPage(),
-      )
+      home: new SplashPage(),
+      routes: <String, WidgetBuilder>{
+        // 路由
+        '/HomePage': (BuildContext context) => new LoginPage()
+      },
     );
   }
 }
-
diff --git a/lib/ui/home/SplashPage.dart b/lib/ui/home/SplashPage.dart
@@ -0,0 +1,44 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+
+class SplashPage extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() {
+    return _SplashPageState();
+  }
+}
+
+class _SplashPageState extends State<SplashPage> {
+  @override
+  Widget build(BuildContext context) {
+    return new MaterialApp(
+        theme: new ThemeData(backgroundColor: Colors.blue),
+        home: new Scaffold(
+          backgroundColor: Colors.white,
+          body: new Center(
+            child: new Image.asset(
+              "images/splash_logo.png",
+              width: 170,
+              height: 170,
+            ),
+          ),
+        ));
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    countDown();
+  }
+
+// 倒计时
+  void countDown() {
+    var _duration = new Duration(seconds: 3);
+    new Future.delayed(_duration, go2HomePage);
+  }
+
+  void go2HomePage() {
+    Navigator.of(context).pushReplacementNamed('/HomePage');
+  }
+}
diff --git a/lib/ui/login/LoginPage.dart b/lib/ui/login/LoginPage.dart
@@ -63,8 +63,11 @@ class _MarketPageState extends State<LoginPage> {
                 mainAxisAlignment: MainAxisAlignment.start,
                 children: <Widget>[
                   Padding(
-                      padding: EdgeInsets.all(10.0), child: weiboOR('新浪微博')),
-                  Padding(padding: EdgeInsets.all(20.0), child: weiboOR('微信')),
+                      padding: EdgeInsets.fromLTRB(0.0, 26.0, 0.0, 0.0),
+                      child: weiboOR('新浪微博')),
+                  Padding(
+                      padding: EdgeInsets.fromLTRB(20.0, 26.0, 0.0, 0.0),
+                      child: weChatOR('微信')),
                 ],
               )
               //_body(),
@@ -113,7 +116,7 @@ Widget _btnGithubLogin(context) {
         label: new Text(
           '使用GitHub账号登录',
           style: new TextStyle(
-              color: Colors.green, fontStyle: FontStyle.normal, fontSize: 16),
+              color: Colors.green, fontStyle: FontStyle.normal, fontSize: 20),
         )),
     width: double.infinity,
     height: 50,
@@ -135,19 +138,58 @@ Widget _btnCreadeAccound(context) {
         child: new Text(
           '创建账号',
           style: new TextStyle(
-              color: Colors.white, fontStyle: FontStyle.normal, fontSize: 16),
+              color: Colors.white, fontStyle: FontStyle.normal, fontSize: 20),
         )),
     width: double.infinity,
     height: 50,
   );
 }
 
 Widget weiboOR(String str) {
-  return RaisedButton.icon(
-      color: Colors.white,
-      disabledColor: Colors.transparent,
-      icon: new Icon(Icons.star),
-      label: new Text(str,
-          style:
-              new TextStyle(color: Colors.white, fontStyle: FontStyle.normal)));
+  return Row(
+    children: <Widget>[
+      Padding(
+          padding: const EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 0.0),
+          child: new Image.asset(
+            'images/silan_icon.png',
+          )),
+      Padding(
+        padding: const EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 0.0),
+        child: new GestureDetector(
+            child: new Text(
+              str,
+              style: new TextStyle(
+                  color: Colors.white, fontStyle: FontStyle.normal),
+            ),
+            onTap: () {
+              Fluttertoast.showToast(msg: "微博登录");
+            }),
+      ),
+    ],
+  );
+}
+
+Widget weChatOR(String str) {
+  return Row(
+    children: <Widget>[
+      Padding(
+        padding: const EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 0.0),
+        child: new Image.asset(
+          'images/wechat_icon.png',
+        ),
+      ),
+      Padding(
+        padding: const EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 0.0),
+        child: new GestureDetector(
+            child: new Text(
+              str,
+              style: new TextStyle(
+                  color: Colors.white, fontStyle: FontStyle.normal),
+            ),
+            onTap: () {
+              Fluttertoast.showToast(msg: "微信登录");
+            }),
+      ),
+    ],
+  );
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -42,3 +42,4 @@ flutter:
       - images/github_icon.png
       - images/silan_icon.png
       - images/wechat_icon.png
+      - images/splash_logo.png
