Commit feaca5e6adbdafe133df08d8e2ae391d52487f17

Authored by wdn127929
1 parent e973968c

null处理

... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "261"
def flutterVersionCode = "262"
if (flutterVersionCode == null) {
flutterVersionCode = '261'
flutterVersionCode = '262'
}
def flutterVersionName = "2.6.1"
def flutterVersionName = "2.6.2"
if (flutterVersionName == null) {
flutterVersionName = '2.6.1'
flutterVersionName = '2.6.2'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -475,7 +475,7 @@
CURRENT_PROJECT_VERSION = 251;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
FLUTTER_BUILD_MODE = debug;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -619,7 +619,7 @@
CURRENT_PROJECT_VERSION = 251;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
FLUTTER_BUILD_MODE = debug;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -654,7 +654,7 @@
CURRENT_PROJECT_VERSION = 251;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
FLUTTER_BUILD_MODE = debug;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ...
... ... @@ -205,7 +205,7 @@ class _ContantItemPageState extends State<ContantItemPage> {
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
vertical: ScreenUtil().setWidth(30)),
height: ScreenUtil().setWidth(76 * 2),
// height: ScreenUtil().setWidth(76 * 2),
decoration: BoxDecoration(
border: Border(
top: widget.index == 0
... ...
... ... @@ -40,7 +40,7 @@ class _ContactListPageState extends State<ContactListPage>
return Material(
child: InkWell(
onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
// FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
},
child: Scaffold(
resizeToAvoidBottomInset: false,
... ...
... ... @@ -90,14 +90,19 @@ class _ContantRightPageState extends State<ContantRightPage> {
UserHistoryEntity item = UserHistoryEntity(
'',
'',
_contacts[i].displayName,
_contacts[i].displayName == null ? '' : _contacts[i].displayName,
'',
_contacts[i].phones.first.value.replaceAll(' ', ''),
_contacts[i].phones == null
? ''
: _contacts[i].phones.first.value.replaceAll(' ', ''),
'');
item.pinyin = PinyinHelper.getPinyin(_contacts[i].displayName)
.replaceAll(' ', '');
List<String> pinyinList =
PinyinHelper.getPinyin(_contacts[i].displayName).split(' ');
item.pinyin = _contacts[i].displayName == null
? ''
: PinyinHelper.getPinyin(_contacts[i].displayName)
.replaceAll(' ', '');
List<String> pinyinList = _contacts[i].displayName == null
? []
: PinyinHelper.getPinyin(_contacts[i].displayName).split(' ');
item.pinyinFirst = '';
item.pinyinList = [];
String pinyinAll = ''; //组装全拼组合
... ...
... ... @@ -231,7 +231,7 @@ packages:
name: contacts_service
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.6"
version: "0.6.1"
convert:
dependency: transitive
description:
... ... @@ -785,7 +785,7 @@ packages:
name: quiver
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.5"
version: "3.0.1"
rational:
dependency: transitive
description:
... ...
... ... @@ -87,7 +87,7 @@ dependencies:
# webview
webview_flutter: ^0.3.22+1
# 获取通讯录
contacts_service: ^0.4.6
contacts_service: ^0.6.1
common_utils: ^1.1.3
easy_contact_picker: ^0.0.2
flutter_app_badger: ^1.1.2
... ...