x1ongzhu před 6 roky
rodič
revize
7c747004bd

+ 12 - 5
android/app/src/main/res/drawable/launch_background.xml

@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
+<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape>
+            <solid android:color="#FF3A3D5C" />
+        </shape>
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/logo" />
+    </item>
     <!-- You can insert your own image assets here -->
     <!-- <item>
         <bitmap

binární
android/app/src/main/res/mipmap-hdpi/logo.png


binární
android/app/src/main/res/mipmap-mdpi/logo.png


binární
android/app/src/main/res/mipmap-xhdpi/logo.png


binární
android/app/src/main/res/mipmap-xxhdpi/logo.png


binární
android/app/src/main/res/mipmap-xxxhdpi/logo.png


+ 30 - 30
lib/main.dart

@@ -21,36 +21,37 @@ class MobileCyberGamesApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return StoreProvider(
-        store: this.store,
-        child: new MaterialApp(
-          title: '全民电竞',
-          supportedLocales: [
-            const Locale('en'), // English
-            const Locale('zh'), // China
-          ],
-          localizationsDelegates: [
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-            ChineseCupertinoLocalizations.delegate,
-          ],
-          theme: ThemeData(
-              cardColor: Color(0xFF2B2B42),
-              backgroundColor: Color(0xFF222335),
-              primaryColor: Color(0xFFC2524D),
-              buttonColor: Color(0xFFC2524D),
+      store: this.store,
+      child: new MaterialApp(
+        title: '全民电竞',
+        supportedLocales: [
+          const Locale('en'), // English
+          const Locale('zh'), // China
+        ],
+        localizationsDelegates: [
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          ChineseCupertinoLocalizations.delegate,
+        ],
+        theme: ThemeData(
+            cardColor: Color(0xFF2B2B42),
+            backgroundColor: Color(0xFF222335),
+            primaryColor: Color(0xFFC2524D),
+            buttonColor: Color(0xFFC2524D),
 //              highlightColor: Color(0xFF933E3E),
-              accentColor: Color(0xFFC2524D),
-              textSelectionColor: Colors.white,
-              textTheme: TextTheme(
-                subhead: TextStyle(color: Colors.white),
-              ),
-              buttonTheme: ButtonThemeData(
-                buttonColor: Color(0xFFC2524D),
-                highlightColor: Color(0xFF9B4040),
-                splashColor: Color(0xFF9B4040),
-              )),
-          home: store.state.isLogin ? HomePage() : LoginFirst(),
-        ));
+            accentColor: Color(0xFFC2524D),
+            textSelectionColor: Colors.white,
+            textTheme: TextTheme(
+              subhead: TextStyle(color: Colors.white),
+            ),
+            buttonTheme: ButtonThemeData(
+              buttonColor: Color(0xFFC2524D),
+              highlightColor: Color(0xFF9B4040),
+              splashColor: Color(0xFF9B4040),
+            )),
+        home: store.state.isLogin ? HomePage() : LoginFirst(),
+      ),
+    );
   }
 }
 
@@ -69,7 +70,6 @@ void main() async {
     state.isLogin = true;
     UserInfo userInfo = UserInfo.fromJson(result.data);
     state.userInfo = userInfo;
-    prefs.setString("token", result.token);
   } else {
     state.isLogin = false;
   }

+ 4 - 11
lib/pages/loginSecond.dart

@@ -29,7 +29,6 @@ class LoginSecondState extends State<LoginSecond> {
   void initState() {
     super.initState();
     Future.delayed(Duration(milliseconds: 100), () {
-      print('发送');
       sendMsg();
     });
   }
@@ -122,17 +121,13 @@ class LoginSecondState extends State<LoginSecond> {
                                     } else if (inputCode.length != 6) {
                                       Toast.show(context, '请输入验证码', 1500, 'info');
                                     } else {
-                                      print(_sessionID);
-                                      print(inputCode);
                                       Toast.show(context, '加载中', -1, 'loading');
-                                      Toast.hide();
                                       final Result res = await HttpManager.post('auth/loginSms',
                                           data: {"phone": widget.phone, "code": inputCode, "sessionId": _sessionID, "requireToken": true});
                                       Toast.hide();
                                       if (res.success) {
-                                        print(res);
                                         final prefs = await SharedPreferences.getInstance();
-                                        prefs.setString('token', res.token);
+                                        await prefs.setString('token', res.token);
                                         print(prefs.getString('token'));
                                         HttpManager.token = res.token;
                                         StoreProvider.of<AppState>(context).dispatch({"action": Actions.updateAll, "user": res.data});
@@ -159,17 +154,13 @@ class LoginSecondState extends State<LoginSecond> {
         ),
         onWillPop: () {
           Toast.hide();
-          print("返回键点击了");
           Navigator.pop(context);
           return Future.value(false);
         });
   }
 
   void sendMsg() async {
-    print('发送验证码');
-
     Toast.show(context, '加载中', -1, 'loading');
-
     final Result res = await HttpManager.get('rong/sendCode', data: {"phone": widget.phone});
     Toast.hide();
     if (res.success) {
@@ -191,7 +182,9 @@ class LoginSecondState extends State<LoginSecond> {
         isSend = false;
       });
     } else {
-      sendTime = sendTime - 1;
+      setState(() {
+        sendTime = sendTime - 1;
+      });
       Future.delayed(Duration(milliseconds: 1000), () {
         getTime();
       });