Skip to content

Commit

Permalink
First commit for RTM 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
littleGnAl committed Aug 13, 2024
1 parent baf47e7 commit 50b00d3
Show file tree
Hide file tree
Showing 20 changed files with 134 additions and 352 deletions.
2 changes: 1 addition & 1 deletion example/lib/src/log_sink.dart
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class _LogActionWidgetState extends State<LogActionWidget> {
),
);
});
Overlay.of(context)?.insert(_overlayEntry!);
Overlay.of(context).insert(_overlayEntry!);
}
_isOverlayShowed = !_isOverlayShowed;
// setState(() {
Expand Down
5 changes: 4 additions & 1 deletion scripts/testcase_gen/lib/default_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import 'package:testcase_gen/generator.dart';

const ignoreForFile = '// ignore_for_file: '
'deprecated_member_use,'
'constant_identifier_names';
'constant_identifier_names,'
'unused_local_variable,'
'unused_import,'
'unnecessary_import';

const defaultHeader = '''
/// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND.
Expand Down
50 changes: 25 additions & 25 deletions scripts/testcase_gen/lib/templated_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -294,31 +294,31 @@ class TemplatedGenerator extends DefaultGenerator {
parseResult, pb, field.type.parameters, []);

jsonBuffer.writeln('final eventJson = {');
for (final parameter in field.type.parameters) {
if (parameter.isPrimitiveType) {
final parameterType = getParamType(parameter);

if (parameterType == 'Uint8List') {
jsonBuffer
.writeln('\'${parameter.name}\': ${parameter.name}.toList(),');
} else {
jsonBuffer.writeln('\'${parameter.name}\': ${parameter.name},');
}
} else {
final bool isEnum = parseResult.hasEnum(parameter.type.type);
if (isEnum) {
jsonBuffer
.writeln('\'${parameter.name}\': ${parameter.name}.value(),');
} else {
final parameterClass = parseResult.getClazz(parameter.type.type)[0];
if (parameterClass.constructors.isEmpty) {
continue;
}
jsonBuffer
.writeln('\'${parameter.name}\': ${parameter.name}.toJson(),');
}
}
}
// for (final parameter in field.type.parameters) {
// if (parameter.isPrimitiveType) {
// final parameterType = getParamType(parameter);

// if (parameterType == 'Uint8List') {
// jsonBuffer
// .writeln('\'${parameter.name}\': ${parameter.name}.toList(),');
// } else {
// jsonBuffer.writeln('\'${parameter.name}\': ${parameter.name},');
// }
// } else {
// final bool isEnum = parseResult.hasEnum(parameter.type.type);
// if (isEnum) {
// jsonBuffer
// .writeln('\'${parameter.name}\': ${parameter.name}.value(),');
// } else {
// final parameterClass = parseResult.getClazz(parameter.type.type)[0];
// if (parameterClass.constructors.isEmpty) {
// continue;
// }
// jsonBuffer
// .writeln('\'${parameter.name}\': ${parameter.name}.toJson(),');
// }
// }
// }
jsonBuffer.writeln('};');

final eventCompleterName = '${field.name}Completer';
Expand Down
2 changes: 1 addition & 1 deletion test_shard/integration_test_app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
applicationId "io.agora.integration_test_app.integration_test_app"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion 19
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
Expand All @@ -17,8 +15,8 @@ import 'generated/bindings/rtmstorage_binding_fake_test.generated.dart'
as rtmstorage_binding_fake_test;
import 'generated/bindings/streamchannel_binding_fake_test.generated.dart'
as streamchannel_binding_fake_test;
import 'generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart'
as rtmclient_rtmeventhandler_testcases;
// import 'generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart'
// as rtmclient_rtmeventhandler_testcases;

import 'package:agora_rtm/src/impl/agora_rtm_client_impl_override.dart'
as rtm_client_impl_override;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND.
// ignore_for_file: deprecated_member_use,constant_identifier_names
// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import

import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException;
import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart';
Expand Down
Loading

0 comments on commit 50b00d3

Please sign in to comment.