自习室优化ok

2025-11-28 13:31:23 +08:00
parent 4ecb0c35d6
commit 57305c5804
57 changed files with 2500 additions and 597 deletions
--- a/lib/pages/student/home/s_home_page.dart
+++ b/lib/pages/student/home/s_home_page.dart
@@ -1,9 +1,9 @@
 import 'package:app/config/theme/base/app_theme_ext.dart';
 import 'package:app/pages/student/home/viewmodel/s_home_vm.dart';
-import 'package:app/request/api/room_api.dart';
-import 'package:app/request/dto/room/room_type_dto.dart';
+import 'package:app/widgets/version/version_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'widgets/tip_card.dart';

 import 'today/s_today_card.dart';
 import 'widgets/user_header.dart';
@@ -13,6 +13,7 @@ class SHomePage extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    showUpdateDialog(context);
    return ChangeNotifierProvider(
      create: (_) => SHomeVm(),
      child: _HomeView(),
@@ -21,7 +22,7 @@ class SHomePage extends StatelessWidget {
 }

 class _HomeView extends StatelessWidget {
-  const _HomeView({super.key});
+  const _HomeView();

  @override
  Widget build(BuildContext context) {
@@ -35,6 +36,8 @@ class _HomeView extends StatelessWidget {
          padding: EdgeInsets.all(context.pagePadding),
          children: [
            STodayCard(),
+            TipCard1(),
+            TipCard2()
          ],
        ),
      ),
--- a/lib/pages/student/home/today/s_today_card.dart
+++ b/lib/pages/student/home/today/s_today_card.dart
@@ -2,6 +2,7 @@ import 'package:app/config/theme/base/app_theme_ext.dart';
 import 'package:app/pages/student/home/viewmodel/s_home_vm.dart';
 import 'package:app/router/route_paths.dart';
 import 'package:app/utils/permission.dart';
+import 'package:app/utils/time.dart';
 import 'package:app/widgets/base/button/index.dart';
 import 'package:app/widgets/base/empty/index.dart';
 import 'package:cached_network_image/cached_network_image.dart';
@@ -102,7 +103,7 @@ class _STodayCardState extends State<STodayCard> {
                          children: [
                            Text(vm.roomInfo?.teacherName ?? ""),
                            Text(
-                              vm.roomInfo?.teacherBackground ?? "",
+                              vm.roomInfo?.teacherSchoolName ?? "",
                              style: Theme.of(context).textTheme.labelLarge,
                            ),
                          ],
@@ -121,7 +122,7 @@ class _STodayCardState extends State<STodayCard> {
                      ),
                      InfoItem(
                        label: "自习时长",
-                        value: "${vm.roomMinutes} 分钟",
+                        value: "${formatSeconds(vm.roomMinutes * 60, 'hh小时mm分钟')} ",
                        icon: RemixIcons.timer_line,
                        color: context.success,
                      ),
--- a/lib/pages/student/home/viewmodel/s_home_vm.dart
+++ b/lib/pages/student/home/viewmodel/s_home_vm.dart
@@ -1,10 +1,10 @@
 import 'package:app/request/api/room_api.dart';
-import 'package:app/request/dto/room/room_info_dto.dart';
+import 'package:app/request/dto/room/room_list_item_dto.dart';
 import 'package:app/utils/time.dart';
 import 'package:flutter/cupertino.dart';

 class SHomeVm extends ChangeNotifier {
-  RoomInfoDto? roomInfo;
+  RoomListItemDto ? roomInfo;
  bool loading = true;

  SHomeVm() {
--- a/lib/pages/student/home/widgets/feature_static.dart
+++ b/lib/pages/student/home/widgets/feature_static.dart
@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:remixicon/remixicon.dart';
-
-class FeatureStatic extends StatelessWidget {
-  const FeatureStatic({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final List<FeatureItem> items = [
-      FeatureItem("视频陪学", "老师全程在线监督", RemixIcons.video_on_ai_line),
-      FeatureItem("举手提问", "实时互动解答疑惑", RemixIcons.hand),
-      FeatureItem("拍照题目", "快速上传问题截图", RemixIcons.camera_2_line),
-      FeatureItem("文件共享", "支持PDF等多种格式", RemixIcons.upload_2_line),
-    ];
-    return Container(
-      margin: EdgeInsets.only(top: 15),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        spacing: 15,
-        children: [
-          Text("核心功能", style: TextStyle(fontSize: 18)),
-          GridView.builder(
-            shrinkWrap: true,
-            physics: NeverScrollableScrollPhysics(),
-            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 4,
-              mainAxisSpacing: 15,
-              crossAxisSpacing: 15,
-              mainAxisExtent: 120
-            ),
-            itemBuilder: (_, index) {
-              return Container(
-                decoration: BoxDecoration(
-                  color: Colors.white
-                ),
-              );
-            },
-            itemCount: items.length,
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class FeatureItem {
-  final String title;
-  final String desc;
-  final IconData icon;
-
-  FeatureItem(this.title, this.desc, this.icon);
-}
--- a/lib/pages/student/home/widgets/tip_card.dart
+++ b/lib/pages/student/home/widgets/tip_card.dart
@@ -0,0 +1,131 @@
+import 'package:app/widgets/base/card/g_card.dart';
+import 'package:flutter/material.dart';
+import 'package:remixicon/remixicon.dart';
+
+class TipCard1 extends StatelessWidget {
+  const TipCard1({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final list = [
+      {
+        "icon": RemixIcons.video_on_line,
+        "title": "视频陪学",
+        "desc": "老师全程在线监督",
+      },
+      {
+        "icon": RemixIcons.hand,
+        "title": "举手提问",
+        "desc": "实时互动解答疑惑",
+      },
+      {
+        "icon": RemixIcons.camera_ai_line,
+        "title": "拍照题目",
+        "desc": "快速上传问题截图",
+      },
+      {
+        "icon": RemixIcons.file_upload_line,
+        "title": "文件共享",
+        "desc": "支持PDF等多种格式",
+      },
+    ];
+    return Container(
+      margin: EdgeInsets.only(top: 15),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 10,
+        children: [
+          Text("功能特色"),
+          Row(
+            spacing: 10,
+            children: list.map((t) {
+              final item = t as dynamic;
+              return Expanded(
+                child: GCard(
+                  child: Column(
+                    spacing: 5,
+                    children: [
+                      Container(
+                        padding: EdgeInsets.all(10),
+                        decoration: BoxDecoration(
+                          color: Theme.of(context).primaryColor.withValues(alpha: 0.2),
+                          borderRadius: BorderRadius.circular(10),
+                        ),
+                        child: Icon(
+                          item['icon'],
+                          color: Theme.of(context).primaryColor,
+                        ),
+                      ),
+                      Text(item['title'],style: Theme.of(context).textTheme.bodySmall),
+                      Text(
+                        item['desc'],
+                        style: Theme.of(context).textTheme.labelMedium,
+                      ),
+                    ],
+                  ),
+                ),
+              );
+            }).toList(),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+
+class TipCard2 extends StatelessWidget {
+  const TipCard2({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final tipList = [
+      "请保持摄像头开启，确保学习状态可见",
+      "遇到问题可随时举手向老师提问",
+      "建议准备好学习资料，提高学习效率",
+      "自习期间请保持安静，避免打扰他人",
+    ];
+    return Container(
+      margin: EdgeInsets.only(top: 15),
+      padding: EdgeInsets.all(15),
+      decoration: BoxDecoration(
+        color: Color(0xfffffbeb),
+        borderRadius: BorderRadius.circular(10),
+        border: Border.all(
+          color: Color(0xfffee685),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+            margin: EdgeInsets.only(bottom: 10),
+            child: Text("温馨提示"),
+          ),
+          ListView.separated(
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            itemBuilder: (_, index) {
+              return Row(
+                spacing: 4,
+                children: [
+                  Container(
+                    width: 5,
+                    height: 5,
+                    decoration: BoxDecoration(shape: BoxShape.circle, color: Colors.black),
+                  ),
+                  Text(
+                    tipList[index],
+                    style: Theme.of(context).textTheme.labelLarge,
+                  ),
+                ],
+              );
+            },
+            separatorBuilder: (_, __) => SizedBox(height: 3),
+            itemCount: tipList.length,
+          ),
+        ],
+      ),
+    );
+  }
+}