完善功能

android/gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m
 android.useAndroidX=true
 android.enableJetifier=true
 
-org.gradle.java.home=D:/jdk-17.0.11
+#org.gradle.java.home=D:/jdk-17.0.11
 #systemProp.http.proxyHost=127.0.0.1
 #systemProp.http.proxyPort=10810
 #systemProp.https.proxyHost=127.0.0.1

lib/controller/discover/room_controller.dart

@@ -727,6 +727,8 @@ class RoomController extends GetxController with WidgetsBindingObserver {
     return false;
   }
 
+  final isClose = false.obs;
+
   Future<void> leaveChannel() async {
     if (currentRole == CurrentRole.broadcaster) {
       try {

lib/controller/home/home_controller.dart

@@ -238,8 +238,7 @@ class HomeController extends GetxController {
       
       // 根据返回的分页信息判断是否还有更多数据
       final int currentPage = result['current'] ?? 1;
-      // final int totalPages = result['pages'] ?? 1;
-      final int totalPages = 100;
+      final int totalPages = result['pages'] ?? 1;
       nearbyHasMore.value = currentPage < totalPages;
     } catch (e) {
       _handleError('获取同城列表异常', e, '同城列表加载失败，请稍后重试');
@@ -274,8 +273,7 @@ class HomeController extends GetxController {
 
         // 根据返回的分页信息判断是否还有更多数据
         final int currentPage = result['current'] ?? 1;
-        // final int totalPages = result['pages'] ?? 1;
-        final int totalPages = 100;
+        final int totalPages = result['pages'] ?? 1;
         nearbyHasMore.value = currentPage < totalPages;
       } catch (e) {
         _handleError('获取同城列表异常', e, '同城列表加载失败，请稍后重试');
@@ -390,8 +388,7 @@ class HomeController extends GetxController {
       
       // 根据返回的分页信息判断是否还有更多数据
       final int currentPage = result['current'] as int;
-      // final int totalPages = result['pages'] as int;
-      final int totalPages = 100;
+      final int totalPages = result['pages'] as int;
       nearbyHasMore.value = currentPage < totalPages;
       print('同城列表加载更多完成 - 当前页: $currentPage, 总页数: $totalPages, 还有更多: ${nearbyHasMore.value}');
     } catch (e) {
@@ -425,8 +422,7 @@ class HomeController extends GetxController {
 
       // 根据返回的分页信息判断是否还有更多数据
       final int currentPage = result['current'] as int;
-      // final int totalPages = result['pages'] as int;
-      final int totalPages = 100;
+      final int totalPages = result['pages'] as int;
       nearbyHasMore.value = currentPage < totalPages;
       print('同城列表加载更多完成 - 当前页: $currentPage, 总页数: $totalPages, 还有更多: ${nearbyHasMore.value}');
     } catch (e) {
@@ -537,8 +533,7 @@ class HomeController extends GetxController {
       
       // 根据返回的分页信息判断是否还有更多数据
       final int currentPage = result['current'] ?? 1;
-      // final int totalPages = result['pages'] ?? 1;
-      final int totalPages = 100;
+      final int totalPages = result['pages'] ?? 1;
       nearbyHasMore.value = currentPage < totalPages;
     } catch (e) {
       _handleError('刷新同城数据异常', e, '刷新失败，请稍后重试');
@@ -569,8 +564,7 @@ class HomeController extends GetxController {
 
       // 根据返回的分页信息判断是否还有更多数据
       final int currentPage = result['current'] ?? 1;
-      // final int totalPages = result['pages'] ?? 1;
-      final int totalPages = 100;
+      final int totalPages = result['pages'] ?? 1;
       nearbyHasMore.value = currentPage < totalPages;
     } catch (e) {
       _handleError('刷新同城数据异常', e, '刷新失败，请稍后重试');

lib/pages/discover/live_room_page.dart

@@ -616,20 +616,27 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                                             ),
                                           ).onTap(() async {
                                             // 退出房间时清空RTM消息
-                                            await _roomController.leaveChannel();
-                                            await _roomController.getLiveData();
-                                            await _roomController.getLiveIncome();
-                                            SmartDialog.dismiss();
-                                            if (Get.isRegistered<RoomController>()) {
-                                              final roomController = Get.find<RoomController>();
-                                              roomController.chatMessages.clear();
+                                            try {
+                                              if(_roomController.isClose.value) return;
+                                              _roomController.isClose.value = true;
+                                              await _roomController.leaveChannel();
+                                              await _roomController.getLiveData();
+                                              await _roomController.getLiveIncome();
+                                              SmartDialog.dismiss();
+                                              if (Get.isRegistered<RoomController>()) {
+                                                final roomController = Get.find<RoomController>();
+                                                roomController.chatMessages.clear();
+                                              }
+                                              // 如果还没有执行 pop，手动调用 Get.back()
+                                              Get.off(() => SettlementPage());
+                                              // 等待页面关闭后再显示小窗口，确保小窗口能正确显示
+                                              Future.delayed(const Duration(milliseconds: 200), () {
+                                                _overlayController.hide();
+                                                _roomController.isClose.value = false;
+                                              });
+                                            } catch (e){
+                                              _roomController.isClose.value = false;
                                             }
-                                            // 如果还没有执行 pop，手动调用 Get.back()
-                                            Get.off(() => SettlementPage());
-                                            // 等待页面关闭后再显示小窗口，确保小窗口能正确显示
-                                            Future.delayed(const Duration(milliseconds: 200), () {
-                                              _overlayController.hide();
-                                            });
 
                                           }),
                                         ],

lib/pages/home/report_page.dart

@@ -405,16 +405,17 @@ class ReportPage extends StatelessWidget {
                       ),
                     ],
                   ),
+                  SizedBox(height: 13.w ,),
                   Container(
-                    padding: EdgeInsets.all(17.w),
+                    padding: EdgeInsets.all(10.w),
                     decoration: BoxDecoration(
                         borderRadius: BorderRadius.all(Radius.circular(8.w)),
                         border: Border.all(width: 1, color: const Color.fromRGBO(224, 224, 224, 1))
                     ),
                     child: TextField(
                       controller: controller.messageController.value,
-                      minLines: 3,             // 多行
-                      maxLines: 3,          // 自适应高度
+                      minLines: 5,             // 多行
+                      maxLines: 5,          // 自适应高度
                       maxLength: 200,
                         buildCounter: (
                             context, {
@@ -434,7 +435,9 @@ class ReportPage extends StatelessWidget {
                             horizontal: 0
                         ),
                         hintText: "请告诉您举报的具体原因，以便更快处理",
-
+                        hintStyle: TextStyle(
+                          color: const Color.fromRGBO(184, 184, 184, 1)
+                        ),
                         border: const OutlineInputBorder(
                           borderSide: BorderSide.none, // 这将移除边框 // 可选：设置圆角
                         ),

lib/pages/mine/real_feedback_page.dart

@@ -211,7 +211,7 @@ class RealFeedbackPage extends StatelessWidget {
                             ),
                             SizedBox(height: 11.w,),
                             Wrap(
-                              alignment: WrapAlignment.spaceBetween,
+                              alignment: WrapAlignment.start,
                               spacing: 10.w,
                               runSpacing: 10.w,
                               children: [

location_plugin/android/src/main/kotlin/com/touchme/location/location_plugin/LocationPlugin.kt

@@ -109,7 +109,7 @@ class LocationPlugin :
             return
         }
 
-        if (isGooglePlayServicesAvailable(context)) {
+        if (false) {
             fetchLocationWithPlayServices(context)
         } else {
             fetchLocationWithLocationManager(context)
@@ -154,7 +154,8 @@ class LocationPlugin :
                     null
                 }
             }
-            .maxByOrNull { it.time }
+            .filter { it.accuracy > 0 }
+            .minByOrNull { it.accuracy }
 
         if (lastKnown != null) {
             deliverLocation(lastKnown)