add screenshots

yubo725 · Oct 16, 2018 · dbaf9b7 · dbaf9b7
1 parent a1ab75b
commit dbaf9b7
Show file tree

Hide file tree

Showing 24 changed files with 395 additions and 118 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/flutter_osc.iml b/flutter_osc.iml
@@ -9,6 +9,30 @@
       <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/barcode_scan/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/barcode_scan/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/barcode_scan/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/barcode_scan/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/barcode_scan/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/barcode_scan/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/flutter_webview_plugin/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/flutter_webview_plugin/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/flutter_webview_plugin/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/flutter_webview_plugin/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/flutter_webview_plugin/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/flutter_webview_plugin/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />

diff --git a/lib/pages/MyInfoPage.dart b/lib/pages/MyInfoPage.dart
@@ -4,6 +4,7 @@ import 'package:flutter_osc/events/LoginEvent.dart';
 import 'package:flutter_osc/events/LogoutEvent.dart';
 import '../pages/CommonWebPage.dart';
 import '../pages/LoginPage.dart';
+import '../pages/NewLoginPage.dart';
 import 'dart:convert';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../api/Api.dart';
@@ -120,7 +121,7 @@ class MyInfoPageState extends State<MyInfoPage> {
     final result = await Navigator
         .of(context)
         .push(new MaterialPageRoute(builder: (context) {
-      return new LoginPage();
+      return new NewLoginPage();
     }));
     // result为"refresh"代表登录成功
     if (result != null && result == "refresh") {

diff --git a/lib/pages/NewLoginPage.dart b/lib/pages/NewLoginPage.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+
+// 新的登录界面，隐藏WebView登录页面
+class NewLoginPage extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => new NewLoginPageState();
+}
+
+class NewLoginPageState extends State<NewLoginPage> {
+
+  final usernameCtrl = new TextEditingController(text: '');
+  final passwordCtrl = new TextEditingController(text: '');
+
+  @override
+  Widget build(BuildContext context) {
+    return new Scaffold(
+      appBar: new AppBar(
+        title: new Text("登录", style: new TextStyle(color: Colors.white)),
+        iconTheme: new IconThemeData(color: Colors.white),
+      ),
+      body: new Container(
+        padding: const EdgeInsets.all(10.0),
+        child: new Column(
+          children: <Widget>[
+            new Center(child: new Text("请使用OSC帐号密码登录")),
+            new Container(height: 20.0),
+            new Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                new Text("用户名："),
+                new Expanded(child: new TextField(
+                  controller: usernameCtrl,
+                  decoration: new InputDecoration(
+                    hintText: "OSC帐号/注册邮箱",
+                    hintStyle: new TextStyle(
+                        color: const Color(0xFF808080)
+                    ),
+                    border: new OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(const Radius.circular(6.0))
+                    ),
+                    contentPadding: const EdgeInsets.all(10.0)
+                  ),
+                ))
+              ],
+            ),
+            new Container(height: 20.0),
+            new Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                new Text("密　码："),
+                new Expanded(child: new TextField(
+                  controller: passwordCtrl,
+                  obscureText: true,
+                  decoration: new InputDecoration(
+                    hintText: "登录密码",
+                    hintStyle: new TextStyle(
+                        color: const Color(0xFF808080)
+                    ),
+                    border: new OutlineInputBorder(
+                        borderRadius: const BorderRadius.all(const Radius.circular(6.0))
+                    ),
+                    contentPadding: const EdgeInsets.all(10.0)
+                  ),
+                ))
+              ],
+            ),
+            new Container(height: 20.0),
+            new RaisedButton(
+              child: new Text("登录"),
+              onPressed: () {
+
+              },
+            )
+          ],
+        ),
+      )
+    );
+  }
+}
diff --git a/screenshots/android01.jpg b/screenshots/android01.jpg
diff --git a/screenshots/android02.jpg b/screenshots/android02.jpg
diff --git a/screenshots/android03.jpg b/screenshots/android03.jpg
diff --git a/screenshots/android04.jpg b/screenshots/android04.jpg
diff --git a/screenshots/android05.jpg b/screenshots/android05.jpg
diff --git a/screenshots/android06.jpg b/screenshots/android06.jpg
diff --git a/screenshots/android07.jpg b/screenshots/android07.jpg
diff --git a/screenshots/android08.jpg b/screenshots/android08.jpg
diff --git a/screenshots/android09.jpg b/screenshots/android09.jpg
diff --git a/screenshots/ios01.png b/screenshots/ios01.png
diff --git a/screenshots/ios02.png b/screenshots/ios02.png
diff --git a/screenshots/ios03.png b/screenshots/ios03.png
diff --git a/screenshots/ios04.png b/screenshots/ios04.png
diff --git a/screenshots/ios05.png b/screenshots/ios05.png
diff --git a/screenshots/ios06.png b/screenshots/ios06.png
diff --git a/screenshots/ios07.png b/screenshots/ios07.png
diff --git a/screenshots/ios08.png b/screenshots/ios08.png
diff --git a/screenshots/ios09.png b/screenshots/ios09.png
diff --git a/screenshots/ios10.png b/screenshots/ios10.png
diff --git a/screenshots/qrcode.png b/screenshots/qrcode.png