diff --git a/lib/controller/discover/room_controller.dart b/lib/controller/discover/room_controller.dart
index 12c90f1..a6663c2 100644
--- a/lib/controller/discover/room_controller.dart
+++ b/lib/controller/discover/room_controller.dart
@@ -330,6 +330,10 @@ class RoomController extends GetxController with WidgetsBindingObserver {
   }
 
   Future<void> leaveChannel() async {
+    if(!isLive.value){
+      // 如果是非直播中，不需要处理
+      return;
+    }
     // 如果是主播，先销毁 RTC 频道，然后发送结束直播消息
     if (currentRole == CurrentRole.broadcaster) {
       try {
diff --git a/lib/controller/setting/setting_controller.dart b/lib/controller/setting/setting_controller.dart
index 4f60ada..82bbbb3 100644
--- a/lib/controller/setting/setting_controller.dart
+++ b/lib/controller/setting/setting_controller.dart
@@ -77,8 +77,11 @@ class SettingController extends GetxController {
       final conversationController = Get.find<ConversationController>();
       conversationController.clearConversations();
     }
-    // 清除本地存储
-    storage.erase();
+    // App清除本地存储，有待处理，
+    // storage.erase();
+    storage.remove('userId');
+    storage.remove('token');
+    // storage.write('hasAgreedUserAgreement', true);
     // 清除全局数据
     GlobalData().logout();
   }