diff --git a/android/build.gradle b/android/build.gradle index c1ee1cb..11c7d70 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,5 +34,5 @@ android { } } dependencies { - api 'io.openim:core-sdk:2.3.5-t19@aar' + api 'io.openim:core-sdk:2.3.5-t21@aar' } \ No newline at end of file diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index 59413b3..b1d3db1 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -354,9 +354,8 @@ class IMManager { break; } } - } catch (err) { - print( - "回调失败了。$err ${call.method} ${call.arguments['type']} ${call.arguments['data']}"); + } catch (error, stackTrace) { + log("回调失败了。$error ${call.method} ${call.arguments['type']} ${call.arguments['data']} $stackTrace"); } return Future.value(null); }); @@ -414,10 +413,12 @@ class IMManager { /// 登录 /// [uid] 用户id /// [token] 登录token,从业务服务器上获取 + /// [defaultValue] 获取失败后使用的默认值 Future login({ required String uid, required String token, String? operationID, + Future Function()? defaultValue, }) async { await _channel.invokeMethod( 'login', @@ -430,8 +431,16 @@ class IMManager { this.isLogined = true; this.uid = uid; this.token = token; - this.uInfo = await userManager.getSelfUserInfo(); - return uInfo; + try { + return this.uInfo = await userManager.getSelfUserInfo(); + } catch (error, stackTrace) { + log('login e: $error s: $stackTrace'); + if (null != defaultValue) { + return this.uInfo = await (defaultValue.call()); + } + return Future.error(error, stackTrace); + } + // return uInfo; } /// 登出 diff --git a/lib/src/models/user_info.dart b/lib/src/models/user_info.dart index 0cbc0aa..b6359f4 100644 --- a/lib/src/models/user_info.dart +++ b/lib/src/models/user_info.dart @@ -20,7 +20,7 @@ class UserInfo { /// 手机号 String? phoneNumber; - @deprecated + /// 使用[birthTime] int? birth; /// 出生时间 @@ -288,7 +288,7 @@ class FriendInfo { /// 出生日期 String? birthTime; - @deprecated + /// 使用[birthTime] int? birth; /// 邮箱 diff --git a/pubspec.lock b/pubspec.lock index 44e6d01..dd4cb56 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,20 +5,23 @@ packages: dependency: transitive description: name: async + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 url: "https://pub.flutter-io.cn" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" @@ -26,6 +29,7 @@ packages: dependency: transitive description: name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" @@ -33,13 +37,15 @@ packages: dependency: transitive description: name: collection + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 url: "https://pub.flutter-io.cn" source: hosted - version: "1.16.0" + version: "1.17.0" fake_async: dependency: transitive description: name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" @@ -53,24 +59,35 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.6.5" matcher: dependency: transitive description: name: matcher + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0" @@ -78,6 +95,7 @@ packages: dependency: transitive description: name: path + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b url: "https://pub.flutter-io.cn" source: hosted version: "1.8.2" @@ -90,34 +108,39 @@ packages: dependency: transitive description: name: source_span + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.flutter-io.cn" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" @@ -125,16 +148,18 @@ packages: dependency: transitive description: name: test_api + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.12" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.18.0 <3.0.0" flutter: ">=1.20.0"