From b32b84213259083669b65512028d8db455a8ebb2 Mon Sep 17 00:00:00 2001 From: v7lin Date: Fri, 24 Feb 2023 14:57:43 +0800 Subject: [PATCH] feature 5.0.0 --- example/lib/api/model/tencent_api_resp.g.dart | 51 +++++++++---------- .../lib/api/model/tencent_unionid_resp.g.dart | 17 +++---- example/lib/main.dart | 10 ++-- lib/src/model/resp.dart | 24 ++++----- lib/src/model/resp.g.dart | 36 ++++++------- lib/src/tencent_kit_method_channel.dart | 10 ++-- lib/src/tencent_kit_platform_interface.dart | 2 +- test/tencent_test.dart | 2 +- 8 files changed, 75 insertions(+), 77 deletions(-) diff --git a/example/lib/api/model/tencent_api_resp.g.dart b/example/lib/api/model/tencent_api_resp.g.dart index f4303d7..ecb63ab 100644 --- a/example/lib/api/model/tencent_api_resp.g.dart +++ b/example/lib/api/model/tencent_api_resp.g.dart @@ -6,32 +6,31 @@ part of 'tencent_api_resp.dart'; // JsonSerializableGenerator // ************************************************************************** -TencentUserInfoResp _$TencentUserInfoRespFromJson(Map json) { - return TencentUserInfoResp( - ret: json['ret'] as int? ?? 0, - msg: json['msg'] as String?, - isLost: json['is_lost'] as int?, - nickname: json['nickname'] as String?, - gender: json['gender'] as String?, - genderType: json['gender_type'] as int?, - province: json['province'] as String?, - city: json['city'] as String?, - year: json['year'] as String?, - constellation: json['constellation'] as String?, - figureurl: json['figureurl'] as String?, - figureurl1: json['figureurl_1'] as String?, - figureurl2: json['figureurl_2'] as String?, - figureurlQq: json['figureurl_qq'] as String?, - figureurlQq1: json['figureurl_qq_1'] as String?, - figureurlQq2: json['figureurl_qq_2'] as String?, - figureurlType: json['figureurl_type'] as String?, - isYellowVip: json['is_yellow_vip'] as String?, - vip: json['vip'] as String?, - yellowVipLevel: json['yellow_vip_level'] as String?, - level: json['level'] as String?, - isYellowYearVip: json['is_yellow_year_vip'] as String?, - ); -} +TencentUserInfoResp _$TencentUserInfoRespFromJson(Map json) => + TencentUserInfoResp( + ret: json['ret'] as int? ?? 0, + msg: json['msg'] as String?, + isLost: json['is_lost'] as int?, + nickname: json['nickname'] as String?, + gender: json['gender'] as String?, + genderType: json['gender_type'] as int?, + province: json['province'] as String?, + city: json['city'] as String?, + year: json['year'] as String?, + constellation: json['constellation'] as String?, + figureurl: json['figureurl'] as String?, + figureurl1: json['figureurl_1'] as String?, + figureurl2: json['figureurl_2'] as String?, + figureurlQq: json['figureurl_qq'] as String?, + figureurlQq1: json['figureurl_qq_1'] as String?, + figureurlQq2: json['figureurl_qq_2'] as String?, + figureurlType: json['figureurl_type'] as String?, + isYellowVip: json['is_yellow_vip'] as String?, + vip: json['vip'] as String?, + yellowVipLevel: json['yellow_vip_level'] as String?, + level: json['level'] as String?, + isYellowYearVip: json['is_yellow_year_vip'] as String?, + ); Map _$TencentUserInfoRespToJson( TencentUserInfoResp instance) => diff --git a/example/lib/api/model/tencent_unionid_resp.g.dart b/example/lib/api/model/tencent_unionid_resp.g.dart index 7b4bb07..01b1682 100644 --- a/example/lib/api/model/tencent_unionid_resp.g.dart +++ b/example/lib/api/model/tencent_unionid_resp.g.dart @@ -6,15 +6,14 @@ part of 'tencent_unionid_resp.dart'; // JsonSerializableGenerator // ************************************************************************** -TencentUnionidResp _$TencentUnionidRespFromJson(Map json) { - return TencentUnionidResp( - error: json['error'] as int? ?? 0, - errorDescription: json['error_description'] as String?, - clientId: json['client_id'] as String?, - openid: json['openid'] as String?, - unionid: json['unionid'] as String?, - ); -} +TencentUnionidResp _$TencentUnionidRespFromJson(Map json) => + TencentUnionidResp( + error: json['error'] as int? ?? 0, + errorDescription: json['error_description'] as String?, + clientId: json['client_id'] as String?, + openid: json['openid'] as String?, + unionid: json['unionid'] as String?, + ); Map _$TencentUnionidRespToJson(TencentUnionidResp instance) => { diff --git a/example/lib/main.dart b/example/lib/main.dart index 5c8803f..dde9f05 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -40,9 +40,9 @@ class Home extends StatefulWidget { } class _HomeState extends State { - late final StreamSubscription _respSubs; + late final StreamSubscription _respSubs; - LoginResp? _loginResp; + TencentLoginResp? _loginResp; @override void initState() { @@ -50,12 +50,12 @@ class _HomeState extends State { _respSubs = TencentKitPlatform.instance.respStream().listen(_listenLogin); } - void _listenLogin(BaseResp resp) { - if (resp is LoginResp) { + void _listenLogin(TencentResp resp) { + if (resp is TencentLoginResp) { _loginResp = resp; final String content = 'login: ${resp.openid} - ${resp.accessToken}'; _showTips('登录', content); - } else if (resp is ShareMsgResp) { + } else if (resp is TencentShareMsgResp) { final String content = 'share: ${resp.ret} - ${resp.msg}'; _showTips('分享', content); } diff --git a/lib/src/model/resp.dart b/lib/src/model/resp.dart index 1d67ab5..f149f66 100644 --- a/lib/src/model/resp.dart +++ b/lib/src/model/resp.dart @@ -4,8 +4,8 @@ import 'package:json_annotation/json_annotation.dart'; part 'resp.g.dart'; -abstract class BaseResp { - const BaseResp({ +abstract class TencentResp { + const TencentResp({ required this.ret, this.msg, }); @@ -41,8 +41,8 @@ abstract class BaseResp { explicitToJson: true, fieldRename: FieldRename.snake, ) -class LoginResp extends BaseResp { - const LoginResp({ +class TencentLoginResp extends TencentResp { + const TencentLoginResp({ required super.ret, super.msg, this.openid, @@ -51,8 +51,8 @@ class LoginResp extends BaseResp { this.createAt, }); - factory LoginResp.fromJson(Map json) => - _$LoginRespFromJson(json); + factory TencentLoginResp.fromJson(Map json) => + _$TencentLoginRespFromJson(json); final String? openid; final String? accessToken; @@ -64,22 +64,22 @@ class LoginResp extends BaseResp { : null; @override - Map toJson() => _$LoginRespToJson(this); + Map toJson() => _$TencentLoginRespToJson(this); } @JsonSerializable( explicitToJson: true, fieldRename: FieldRename.snake, ) -class ShareMsgResp extends BaseResp { - const ShareMsgResp({ +class TencentShareMsgResp extends TencentResp { + const TencentShareMsgResp({ required super.ret, super.msg, }); - factory ShareMsgResp.fromJson(Map json) => - _$ShareMsgRespFromJson(json); + factory TencentShareMsgResp.fromJson(Map json) => + _$TencentShareMsgRespFromJson(json); @override - Map toJson() => _$ShareMsgRespToJson(this); + Map toJson() => _$TencentShareMsgRespToJson(this); } diff --git a/lib/src/model/resp.g.dart b/lib/src/model/resp.g.dart index 9958336..af83bb7 100644 --- a/lib/src/model/resp.g.dart +++ b/lib/src/model/resp.g.dart @@ -6,18 +6,18 @@ part of 'resp.dart'; // JsonSerializableGenerator // ************************************************************************** -LoginResp _$LoginRespFromJson(Map json) { - return LoginResp( - ret: json['ret'] as int? ?? 0, - msg: json['msg'] as String?, - openid: json['openid'] as String?, - accessToken: json['access_token'] as String?, - expiresIn: json['expires_in'] as int?, - createAt: json['create_at'] as int?, - ); -} +TencentLoginResp _$TencentLoginRespFromJson(Map json) => + TencentLoginResp( + ret: json['ret'] as int? ?? 0, + msg: json['msg'] as String?, + openid: json['openid'] as String?, + accessToken: json['access_token'] as String?, + expiresIn: json['expires_in'] as int?, + createAt: json['create_at'] as int?, + ); -Map _$LoginRespToJson(LoginResp instance) => { +Map _$TencentLoginRespToJson(TencentLoginResp instance) => + { 'ret': instance.ret, 'msg': instance.msg, 'openid': instance.openid, @@ -26,14 +26,14 @@ Map _$LoginRespToJson(LoginResp instance) => { 'create_at': instance.createAt, }; -ShareMsgResp _$ShareMsgRespFromJson(Map json) { - return ShareMsgResp( - ret: json['ret'] as int? ?? 0, - msg: json['msg'] as String?, - ); -} +TencentShareMsgResp _$TencentShareMsgRespFromJson(Map json) => + TencentShareMsgResp( + ret: json['ret'] as int? ?? 0, + msg: json['msg'] as String?, + ); -Map _$ShareMsgRespToJson(ShareMsgResp instance) => +Map _$TencentShareMsgRespToJson( + TencentShareMsgResp instance) => { 'ret': instance.ret, 'msg': instance.msg, diff --git a/lib/src/tencent_kit_method_channel.dart b/lib/src/tencent_kit_method_channel.dart index 0dd1a96..cdd340b 100644 --- a/lib/src/tencent_kit_method_channel.dart +++ b/lib/src/tencent_kit_method_channel.dart @@ -14,17 +14,17 @@ class MethodChannelTencentKit extends TencentKitPlatform { const MethodChannel('v7lin.github.io/tencent_kit') ..setMethodCallHandler(_handleMethod); - final StreamController _respStreamController = - StreamController.broadcast(); + final StreamController _respStreamController = + StreamController.broadcast(); Future _handleMethod(MethodCall call) async { switch (call.method) { case 'onLoginResp': - _respStreamController.add(LoginResp.fromJson( + _respStreamController.add(TencentLoginResp.fromJson( (call.arguments as Map).cast())); break; case 'onShareResp': - _respStreamController.add(ShareMsgResp.fromJson( + _respStreamController.add(TencentShareMsgResp.fromJson( (call.arguments as Map).cast())); break; } @@ -59,7 +59,7 @@ class MethodChannelTencentKit extends TencentKitPlatform { } @override - Stream respStream() { + Stream respStream() { return _respStreamController.stream; } diff --git a/lib/src/tencent_kit_platform_interface.dart b/lib/src/tencent_kit_platform_interface.dart index a2cd388..713de24 100644 --- a/lib/src/tencent_kit_platform_interface.dart +++ b/lib/src/tencent_kit_platform_interface.dart @@ -43,7 +43,7 @@ abstract class TencentKitPlatform extends PlatformInterface { } /// - Stream respStream() { + Stream respStream() { throw UnimplementedError('respStream() has not been implemented.'); } diff --git a/test/tencent_test.dart b/test/tencent_test.dart index 4a3c66b..4012656 100644 --- a/test/tencent_test.dart +++ b/test/tencent_test.dart @@ -37,7 +37,7 @@ class MockTencentKitPlatform } @override - Stream respStream() { + Stream respStream() { throw UnimplementedError(); }