From a055962fe89095f39c35439fb1f06edd5a3bc99e Mon Sep 17 00:00:00 2001 From: v7lin Date: Tue, 26 Nov 2019 03:00:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 7 +++++++ CHANGELOG.md | 4 ++++ lib/src/model/api/tencent_user_info_resp.dart | 12 ++++++++---- pubspec.yaml | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 55addb7..d2790ea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,6 +29,13 @@ steps: # - cd example/android/ # - ./gradlew :tencent_kit:check +# docker run --rm -it -v ${PWD}:/src v7lin/clang:5.0.2-r0 sh -c "clang-format -style=file -i src/Classes/*.h src/Classes/*.m" +#- name: ios-format +# image: v7lin/clang +# commands: +# - cd ios/ +# - clang-format -style=file -i src/Classes/*.h src/Classes/*.m + - name: format image: v7lin/flutter:1.9.1-hotfix.6-stable volumes: diff --git a/CHANGELOG.md b/CHANGELOG.md index b9468f2..7ec6e2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.1 - 2019.11.14 + +* δΌ˜εŒ– + ## 1.0.0 - 2019.11.14 * 更名 tencent_kit diff --git a/lib/src/model/api/tencent_user_info_resp.dart b/lib/src/model/api/tencent_user_info_resp.dart index 50fae19..80a79fc 100644 --- a/lib/src/model/api/tencent_user_info_resp.dart +++ b/lib/src/model/api/tencent_user_info_resp.dart @@ -1,4 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; +import 'package:quiver/strings.dart' as strings; import 'package:tencent_kit/src/model/api/tencent_api_resp.dart'; part 'tencent_user_info_resp.g.dart'; @@ -80,16 +81,19 @@ class TencentUserInfoResp extends TencentApiResp { } String headImgUrl() { - if (figureurlQq2 != null && figureurlQq2.isNotEmpty) { + if (strings.isNotEmpty(figureurlQq)) { + return figureurlQq; + } + if (strings.isNotEmpty(figureurlQq2)) { return figureurlQq2; } - if (figureurlQq1 != null && figureurlQq1.isNotEmpty) { + if (strings.isNotEmpty(figureurlQq1)) { return figureurlQq1; } - if (figureurl2 != null && figureurl2.isNotEmpty) { + if (strings.isNotEmpty(figureurl2)) { return figureurl2; } - if (figureurl1 != null && figureurl1.isNotEmpty) { + if (strings.isNotEmpty(figureurl1)) { return figureurl1; } return figureurl; diff --git a/pubspec.yaml b/pubspec.yaml index d46d6fe..4b38cc8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: tencent_kit description: A powerful Flutter plugin allowing developers to share or authorize with natvie android & iOS Tencent SDKs. -version: 1.0.0 +version: 1.0.1 author: v7lin homepage: https://github.com/v7lin/fake_tencent