From 65d39aad4071a75810f3cf6e23974fbfc0fec189 Mon Sep 17 00:00:00 2001
From: Jolie <412895109@qq.com>
Date: Fri, 7 Nov 2025 00:24:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?IM=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/mine/login_page.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/pages/mine/login_page.dart b/lib/pages/mine/login_page.dart
index 25841d5..126daaf 100644
--- a/lib/pages/mine/login_page.dart
+++ b/lib/pages/mine/login_page.dart
@@ -24,11 +24,12 @@ class LoginPage extends StatelessWidget {
                 width: 1.sw,
                 height: 1.sh,
               ),
-              SizedBox(
-                height: MediaQuery.of(context).size.height,
+              Container(
+                height: 1.sh,
+                padding: EdgeInsets.symmetric(horizontal: 20),
                 child: Column(
                   children: [
-                    const SizedBox(height: 130),
+                    const SizedBox(height: 150),
 
                     // Logo和标题区域
                     Center(

From 80a79306d1863d4f7c6c834272381ad507f19b9f Mon Sep 17 00:00:00 2001
From: Jolie <412895109@qq.com>
Date: Fri, 7 Nov 2025 00:50:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?IM=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/controller/mine/login_controller.dart | 11 +++++++++--
 lib/im/im_manager.dart                    |  3 +++
 lib/main.dart                             |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/controller/mine/login_controller.dart b/lib/controller/mine/login_controller.dart
index a609404..493df7d 100644
--- a/lib/controller/mine/login_controller.dart
+++ b/lib/controller/mine/login_controller.dart
@@ -132,8 +132,15 @@ class LoginController extends GetxController {
   // 使用UserController中的方法获取用户信息
   Future<void> _handleUserInfoRetrieval(String userId) async {
     try {
-      // 使用UserController获取基础信息和婚姻信息
-      final userController = Get.find<UserController>();
+      // 检查并注册UserController
+      UserController userController;
+      if (Get.isRegistered<UserController>()) {
+        userController = Get.find<UserController>();
+      } else {
+        userController = Get.put(UserController());
+      }
+      
+      // 使用UserController获取基础信息
       await userController.getBaseUserInfo(userId);
     } catch (e) {
       // 获取用户信息失败不影响登录流程
diff --git a/lib/im/im_manager.dart b/lib/im/im_manager.dart
index ac278d9..addbf78 100644
--- a/lib/im/im_manager.dart
+++ b/lib/im/im_manager.dart
@@ -134,7 +134,9 @@ class IMManager {
         return false;
       }
       var userId = storage.read('userId');
+      await EMClient.getInstance.logout();
       await EMClient.getInstance.loginWithToken(userId, token);
+      await sendTextMessage('哈哈哈哈', '1114267797208305664');
       // 注册监听器
       _registerListeners();
       print('IM login successful');
@@ -162,6 +164,7 @@ class IMManager {
     String content,
     String toChatUsername,
   ) async {
+    print('Text message sent');
     try {
       // 创建文本消息
       final message = EMMessage.createTxtSendMessage(
diff --git a/lib/main.dart b/lib/main.dart
index ab1b26e..36f4a85 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -75,7 +75,7 @@ class MyApp extends StatelessWidget {
     
     // 如果token不为空，显示主页；如果token为空，显示登录页面
     if (token != null && token.isNotEmpty) {
-      return UserInfoPage();
+      return MainPage();
     } else {
       return LoginPage();
     }