Update 1.1.0

EOEFANS · Jan 21, 2023 · f2eea2e · f2eea2e
1 parent d660c89
commit f2eea2e
Show file tree

Hide file tree

Showing 16 changed files with 290 additions and 151 deletions.
diff --git a/assets/banner1.jpg b/assets/banner1.jpg
diff --git a/assets/banner2.png b/assets/banner2.png
diff --git a/assets/banner3.png b/assets/banner3.png
diff --git a/assets/jijiji.jpg b/assets/jijiji.jpg
diff --git a/lib/common/Global.dart b/lib/common/Global.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:eoe_fans/models/eoeTheme.dart';
 import 'package:eoe_fans/models/member.dart';
 import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/cacheConfig.dart';
@@ -89,8 +90,12 @@ class Global {
   //是否为release版
   static bool get isRelease => bool.fromEnvironment("dart.vm.product");
 
+  static late PackageInfo packageInfo;
+
   //初始化全局信息，会在App启动时启动
   static Future init() async {
+    WidgetsFlutterBinding.ensureInitialized();
+
     _prefs = await SharedPreferences.getInstance();
     var _profile = _prefs.getString("profile");
     if (_profile != null) {
@@ -111,6 +116,7 @@ class Global {
     if (t != null && t != '') {
       theme = t;
     }
+    packageInfo = await PackageInfo.fromPlatform();
   }
 
   static saveProfile() =>

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:eoe_fans/routes/mainPage.dart';
+import 'package:eoe_fans/routes/setting/aboutUs.dart';
 import 'package:eoe_fans/routes/setting/settingPage.dart';
 import 'package:eoe_fans/routes/setting/settingTheme.dart';
 import 'package:eoe_fans/routes/splashPage.dart';
@@ -41,6 +42,7 @@ class MyApp extends StatelessWidget {
               '/splash': (BuildContext context) => SplashScreen(),
               '/setting': (BuildContext context) => const SettingPage(),
               '/theme': (BuildContext context) => const SettingTheme(),
+              '/about': (BuildContext context) => const AboutUs(),
             },
           );
         }));

diff --git a/lib/routes/music/musicPage.dart b/lib/routes/music/musicPage.dart
@@ -12,12 +12,14 @@ class _MusicPageState extends State<MusicPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        leading: GestureDetector(
-          child: Text('leading'),
+      body: Container(
+        height: double.maxFinite,
+        padding: EdgeInsets.only(bottom: 50),
+        child: Image(
+          image: AssetImage('assets/jijiji.jpg'),
+          fit: BoxFit.cover,
         ),
       ),
-      body: Text('MusicPage'),
     );
   }
 }
diff --git a/lib/routes/picture/picturePage.dart b/lib/routes/picture/picturePage.dart
@@ -1,3 +1,5 @@
+import 'dart:ffi';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -12,7 +14,14 @@ class _PicturePageState extends State<PicturePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Text('PicturePage'),
+      body: Container(
+        height: double.maxFinite,
+        padding: EdgeInsets.only(bottom: 50),
+        child: Image(
+          image: AssetImage('assets/jijiji.jpg'),
+          fit: BoxFit.cover,
+        ),
+      ),
     );
   }
 }
diff --git a/lib/routes/setting/aboutUs.dart b/lib/routes/setting/aboutUs.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+
+class AboutUs extends StatefulWidget {
+  const AboutUs({Key? key}) : super(key: key);
+
+  @override
+  State<AboutUs> createState() => _AboutUsState();
+}
+
+const developers = [
+  {'name': '乔治', 'title': '总技术负责人'},
+  {'name': '阿正', 'title': '后端负责人'},
+  {'name': '艾米莉娅', 'title': '后端开发'},
+  {'name': '锋子', 'title': '前端开发'},
+  {'name': 'master1lan', 'title': '前端开发'},
+  {'name': '御坂吉米', 'title': '移动端开发'},
+  {'name': '隔壁PM（Wing）', 'title': '产品经理'},
+  {'name': 'UI-阿池', 'title': 'UI设计'},
+  {'name': '梁心', 'title': 'LOGO设计'},
+];
+
+class _AboutUsState extends State<AboutUs> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: PreferredSize(
+        preferredSize: Size.fromHeight(270),
+        child: AppBar(
+          centerTitle: true,
+          flexibleSpace: Container(
+            height: double.maxFinite,
+            child: Image(
+              alignment: Alignment.topCenter,
+              image: AssetImage(
+                  'assets/logo.jpg'),
+              fit: BoxFit.cover,
+            ),
+          ),
+        ),
+      ),
+      body: ListView(
+        children: developers
+            .map((e) => ListTile(
+                  leading: CircleAvatar(
+                    child: Icon(
+                      Icons.manage_accounts_rounded,
+                      size: 24,
+                    ),
+                  ),
+                  title: Text(e['title']!),
+                  subtitle: Text(e['name']!),
+                ))
+            .toList(),
+      ),
+    );
+  }
+}
diff --git a/lib/routes/setting/settingPage.dart b/lib/routes/setting/settingPage.dart
@@ -55,6 +55,7 @@ class _SettingPageState extends State<SettingPage> {
                   Navigator.pushNamed(context, '/theme');
                 },
               ),
+
               // SettingsTile.switchTile(
               //   onToggle: (value) {},
               //   initialValue: true,
@@ -63,6 +64,28 @@ class _SettingPageState extends State<SettingPage> {
               // ),
             ],
           ),
+          SettingsSection(
+            title: Text('关于'),
+            tiles: [
+              SettingsTile.navigation(
+                leading: Icon(Icons.update),
+                title: Text('检查版本'),
+                value: Text(
+                    '当前版本: ${Global.packageInfo.version}'),
+                // onPressed: (BuildContext context) {
+                //   Navigator.pushNamed(context, '/theme');
+                // },
+              ),
+              SettingsTile.navigation(
+                leading: Icon(Icons.info_outline),
+                title: Text('关于我们'),
+                trailing: Icon(Icons.keyboard_arrow_right),
+                onPressed: (BuildContext context) {
+                  Navigator.pushNamed(context, '/about');
+                },
+              ),
+            ],
+          ),
         ],
       ),
     );

diff --git a/lib/routes/video/videoList.dart b/lib/routes/video/videoList.dart
@@ -174,7 +174,7 @@ class _VideoListState extends State<VideoList> {
           // double progress = notification.metrics.pixels /
           //     notification.metrics.maxScrollExtent;
           // print("${(progress * 100).toInt()}%");
-          print(notification.metrics.maxScrollExtent - notification.metrics.pixels);
+          // print(notification.metrics.maxScrollExtent - notification.metrics.pixels);
           //重新构建
           setState(() {
             if (notification.metrics.maxScrollExtent - notification.metrics.pixels < 1000 && !_loading) {

diff --git a/lib/routes/video/videoListItem.dart b/lib/routes/video/videoListItem.dart
@@ -44,6 +44,14 @@ class VideoListItem extends StatelessWidget {
                           right: 0,
                           child: Container(
                             padding: const EdgeInsets.all(4.0),
+                            decoration: new BoxDecoration(
+                              color: Color.fromRGBO(0, 0, 0, .3),
+                              gradient: LinearGradient(
+                                colors: [Colors.transparent, Colors.black],
+                                begin:  Alignment.topCenter,
+                                end: Alignment.bottomCenter,
+                              )
+                            ),
                             child: Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: <Widget>[
@@ -59,7 +67,7 @@ class VideoListItem extends StatelessWidget {
                                       child: Text(
                                         video.view < 10000
                                             ? video.view.toString()
-                                            : '${(video.view / 10000).toStringAsFixed(2)}万',
+                                            : '${(video.view / 10000).toStringAsFixed(1)}万',
                                         textAlign: TextAlign.center,
                                         style: const TextStyle(
                                             fontSize: 10, color: Colors.white),
@@ -93,7 +101,9 @@ class VideoListItem extends StatelessWidget {
                                         SecondToDate(int.parse(video.duration)),
                                         textAlign: TextAlign.center,
                                         style: const TextStyle(
-                                            fontSize: 10, color: Colors.white),
+                                          fontSize: 10,
+                                          color: Colors.white,
+                                        ),
                                       ),
                                     )
                                   ],

diff --git a/lib/routes/video/videoSwiper.dart b/lib/routes/video/videoSwiper.dart
@@ -1,11 +1,18 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_swiper_null_safety/flutter_swiper_null_safety.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 const images = [
-  'https://i0.hdslb.com/bfs/banner/8ad45f463da4c6411b94c960a713dd72bbf97657.jpg',
-  'https://i0.hdslb.com/bfs/banner/023d359000172a213d7a5537295e4236fca63004.png',
-  'https://i0.hdslb.com/bfs/banner/6c87d994adab02603270d84c93bdc99dab6e64be.jpg'
+  'assets/banner1.jpg',
+  'assets/banner2.png',
+  'assets/banner3.png',
+];
+
+const urls = [
+  'https://b23.tv/GI9EDCl',
+  'bilibili://video/BV1Pv4y1C7TE',
+  'https://b23.tv/kI0MBkx'
 ];
 
 class VideoSwiper extends StatelessWidget {
@@ -17,12 +24,18 @@ class VideoSwiper extends StatelessWidget {
       itemBuilder: (BuildContext context, int index) {
         return Container(
           child: Image(
-            image: CachedNetworkImageProvider(images[index]),
+            image: AssetImage(images[index]),
             fit: BoxFit.fill,
           ),
         );
       },
       itemCount: images.length,
+      onTap: (int index) async {
+        print(index);
+        if (!await launchUrl(Uri.parse(urls[index]))) {
+          throw 'Could not launch ${urls[index]}';
+        }
+      },
       pagination: const SwiperPagination(
         alignment: Alignment.bottomRight,
         builder: DotSwiperPaginationBuilder(

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,12 +5,14 @@
 import FlutterMacOS
 import Foundation
 
+import package_info_plus
 import path_provider_macos
 import shared_preferences_foundation
 import sqflite
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))