refactor(rtc): 重构RTC频道详情获取逻辑

- 将_fetchRtcChannelDetail方法改为私有，并新增公共方法fetchRtcChannelDetail - 在RTCManager中用户加入和离开频道时主动调用频道详情获取 - 移除RoomController中冗余的用户加入/离开消息处理逻辑 - 优化RTCManager中的网络服务依赖导入 - 调整_leaveChat消息发送逻辑以适配新的角色判断方式 # Conflicts: # lib/network/home_api.g.dart # lib/network/rtc_api.g.dart # lib/network/user_api.g.dart
4 months ago · 216f96ca1e
3 changed files with 45 additions and 81 deletions
--- a/lib/network/home_api.g.dart
+++ b/lib/network/home_api.g.dart
@ -58,7 +58,7 @@ class _HomeApi implements HomeApi {
        ),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
--- a/lib/network/rtc_api.g.dart
+++ b/lib/network/rtc_api.g.dart
@ -45,7 +45,7 @@ class _RtcApi implements RtcApi {
        (json) => RtcChannelData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -76,7 +76,7 @@ class _RtcApi implements RtcApi {
        (json) => RtcChannelData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -107,7 +107,7 @@ class _RtcApi implements RtcApi {
        (json) => RtcChannelData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -143,7 +143,7 @@ class _RtcApi implements RtcApi {
        (json) => RtcChannelDetail.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -177,7 +177,7 @@ class _RtcApi implements RtcApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -212,7 +212,7 @@ class _RtcApi implements RtcApi {
        (json) => RtcSeatUserInfo.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -246,7 +246,7 @@ class _RtcApi implements RtcApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -280,7 +280,7 @@ class _RtcApi implements RtcApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -311,7 +311,7 @@ class _RtcApi implements RtcApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -351,7 +351,7 @@ class _RtcApi implements RtcApi {
        ),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -392,7 +392,7 @@ class _RtcApi implements RtcApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -426,7 +426,7 @@ class _RtcApi implements RtcApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
--- a/lib/network/user_api.g.dart
+++ b/lib/network/user_api.g.dart
@ -46,7 +46,7 @@ class _UserApi implements UserApi {
        (json) => LoginData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -79,7 +79,7 @@ class _UserApi implements UserApi {
        (json) => UserBaseData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -111,7 +111,7 @@ class _UserApi implements UserApi {
        (json) => UserData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -145,7 +145,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -179,7 +179,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -213,7 +213,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -247,7 +247,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -289,7 +289,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -320,7 +320,7 @@ class _UserApi implements UserApi {
        (json) => json as String,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -351,7 +351,7 @@ class _UserApi implements UserApi {
        (json) => OssData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -391,7 +391,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -425,7 +425,7 @@ class _UserApi implements UserApi {
        (json) => UserRoseData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -468,7 +468,7 @@ class _UserApi implements UserApi {
        (json) => RoseHistoryData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -505,7 +505,7 @@ class _UserApi implements UserApi {
        (json) => SubmitOrderData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -548,7 +548,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -591,7 +591,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -634,7 +634,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -677,7 +677,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -720,7 +720,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -754,7 +754,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -796,7 +796,7 @@ class _UserApi implements UserApi {
            : List.empty(),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -830,7 +830,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -867,7 +867,7 @@ class _UserApi implements UserApi {
        (json) => BankCardOcrData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -901,7 +901,7 @@ class _UserApi implements UserApi {
        (json) => WithdrawData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -935,7 +935,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -975,7 +975,7 @@ class _UserApi implements UserApi {
        (json) => WithdrawAuditData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -1007,7 +1007,7 @@ class _UserApi implements UserApi {
        (json) => UserInfoData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -1044,7 +1044,7 @@ class _UserApi implements UserApi {
        (json) => WalletAccountData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -1090,7 +1090,7 @@ class _UserApi implements UserApi {
            WalletAccountRecordData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -1122,7 +1122,7 @@ class _UserApi implements UserApi {
        (json) => UserInfoData.fromJson(json as Map<String, dynamic>),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -1160,7 +1160,7 @@ class _UserApi implements UserApi {
        ),
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);
@ -1191,43 +1191,7 @@ class _UserApi implements UserApi {
        (json) => json as dynamic,
      );
    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
-      rethrow;
-    }
-    final httpResponse = HttpResponse(_value, _result);
-    return httpResponse;
-  }
-
-  @override
-  Future<HttpResponse<BaseResponse<PaymentDetailData>>> getPaymentOrderDetail({
-    required String id,
-  }) async {
-    final _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{r'id': id};
-    final _headers = <String, dynamic>{};
-    const Map<String, dynamic>? _data = null;
-    final _options =
-        _setStreamType<HttpResponse<BaseResponse<PaymentDetailData>>>(
-          Options(method: 'GET', headers: _headers, extra: _extra)
-              .compose(
-                _dio.options,
-                '/dating-agency-mall/user/get/payment-order/detail',
-                queryParameters: queryParameters,
-                data: _data,
-              )
-              .copyWith(
-                baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl),
-              ),
-        );
-    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
-    late BaseResponse<PaymentDetailData> _value;
-    try {
-      _value = BaseResponse<PaymentDetailData>.fromJson(
-        _result.data!,
-        (json) => PaymentDetailData.fromJson(json as Map<String, dynamic>),
-      );
-    } on Object catch (e, s) {
-      errorLogger?.logError(e, s, _options);
+      errorLogger?.logError(e, s, _options, _result);
      rethrow;
    }
    final httpResponse = HttpResponse(_value, _result);