xt / Flutter-ReserveApp · Commits

Go to a project

Commit feaca5e6adbdafe133df08d8e2ae391d52487f17

Authored by wdn127929
1 parent e973968c
build: skipped

null处理

Inline Side-by-side
Showing 7 changed files with 23 additions and 18 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "261" 14 +def flutterVersionCode = "262"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '261' 16 + flutterVersionCode = '262'
17 } 17 }
18 18
19 -def flutterVersionName = "2.6.1" 19 +def flutterVersionName = "2.6.2"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.6.1' 21 + flutterVersionName = '2.6.2'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -475,7 +475,7 @@ @@ -475,7 +475,7 @@
475 CURRENT_PROJECT_VERSION = 251; 475 CURRENT_PROJECT_VERSION = 251;
476 DEVELOPMENT_TEAM = 8J59HM8B82; 476 DEVELOPMENT_TEAM = 8J59HM8B82;
477 ENABLE_BITCODE = NO; 477 ENABLE_BITCODE = NO;
478 - FLUTTER_BUILD_MODE = release; 478 + FLUTTER_BUILD_MODE = debug;
479 FRAMEWORK_SEARCH_PATHS = ( 479 FRAMEWORK_SEARCH_PATHS = (
480 "$(inherited)", 480 "$(inherited)",
481 "$(PROJECT_DIR)/Flutter", 481 "$(PROJECT_DIR)/Flutter",
@@ -619,7 +619,7 @@ @@ -619,7 +619,7 @@
619 CURRENT_PROJECT_VERSION = 251; 619 CURRENT_PROJECT_VERSION = 251;
620 DEVELOPMENT_TEAM = 8J59HM8B82; 620 DEVELOPMENT_TEAM = 8J59HM8B82;
621 ENABLE_BITCODE = NO; 621 ENABLE_BITCODE = NO;
622 - FLUTTER_BUILD_MODE = release; 622 + FLUTTER_BUILD_MODE = debug;
623 FRAMEWORK_SEARCH_PATHS = ( 623 FRAMEWORK_SEARCH_PATHS = (
624 "$(inherited)", 624 "$(inherited)",
625 "$(PROJECT_DIR)/Flutter", 625 "$(PROJECT_DIR)/Flutter",
@@ -654,7 +654,7 @@ @@ -654,7 +654,7 @@
654 CURRENT_PROJECT_VERSION = 251; 654 CURRENT_PROJECT_VERSION = 251;
655 DEVELOPMENT_TEAM = 8J59HM8B82; 655 DEVELOPMENT_TEAM = 8J59HM8B82;
656 ENABLE_BITCODE = NO; 656 ENABLE_BITCODE = NO;
657 - FLUTTER_BUILD_MODE = release; 657 + FLUTTER_BUILD_MODE = debug;
658 FRAMEWORK_SEARCH_PATHS = ( 658 FRAMEWORK_SEARCH_PATHS = (
659 "$(inherited)", 659 "$(inherited)",
660 "$(PROJECT_DIR)/Flutter", 660 "$(PROJECT_DIR)/Flutter",
@@ -205,7 +205,7 @@ class _ContantItemPageState extends State<ContantItemPage> { @@ -205,7 +205,7 @@ class _ContantItemPageState extends State<ContantItemPage> {
205 padding: EdgeInsets.symmetric( 205 padding: EdgeInsets.symmetric(
206 horizontal: ScreenUtil().setWidth(40), 206 horizontal: ScreenUtil().setWidth(40),
207 vertical: ScreenUtil().setWidth(30)), 207 vertical: ScreenUtil().setWidth(30)),
208 - height: ScreenUtil().setWidth(76 * 2), 208 + // height: ScreenUtil().setWidth(76 * 2),
209 decoration: BoxDecoration( 209 decoration: BoxDecoration(
210 border: Border( 210 border: Border(
211 top: widget.index == 0 211 top: widget.index == 0
@@ -40,7 +40,7 @@ class _ContactListPageState extends State<ContactListPage> @@ -40,7 +40,7 @@ class _ContactListPageState extends State<ContactListPage>
40 return Material( 40 return Material(
41 child: InkWell( 41 child: InkWell(
42 onTap: () { 42 onTap: () {
43 - FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 43 + // FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
44 }, 44 },
45 child: Scaffold( 45 child: Scaffold(
46 resizeToAvoidBottomInset: false, 46 resizeToAvoidBottomInset: false,
@@ -90,14 +90,19 @@ class _ContantRightPageState extends State<ContantRightPage> { @@ -90,14 +90,19 @@ class _ContantRightPageState extends State<ContantRightPage> {
90 UserHistoryEntity item = UserHistoryEntity( 90 UserHistoryEntity item = UserHistoryEntity(
91 '', 91 '',
92 '', 92 '',
93 - _contacts[i].displayName, 93 + _contacts[i].displayName == null ? '' : _contacts[i].displayName,
94 '', 94 '',
95 - _contacts[i].phones.first.value.replaceAll(' ', ''), 95 + _contacts[i].phones == null
  96 + ? ''
  97 + : _contacts[i].phones.first.value.replaceAll(' ', ''),
96 ''); 98 '');
97 - item.pinyin = PinyinHelper.getPinyin(_contacts[i].displayName)  
98 - .replaceAll(' ', '');  
99 - List<String> pinyinList =  
100 - PinyinHelper.getPinyin(_contacts[i].displayName).split(' '); 99 + item.pinyin = _contacts[i].displayName == null
  100 + ? ''
  101 + : PinyinHelper.getPinyin(_contacts[i].displayName)
  102 + .replaceAll(' ', '');
  103 + List<String> pinyinList = _contacts[i].displayName == null
  104 + ? []
  105 + : PinyinHelper.getPinyin(_contacts[i].displayName).split(' ');
101 item.pinyinFirst = ''; 106 item.pinyinFirst = '';
102 item.pinyinList = []; 107 item.pinyinList = [];
103 String pinyinAll = ''; //组装全拼组合 108 String pinyinAll = ''; //组装全拼组合
@@ -231,7 +231,7 @@ packages: @@ -231,7 +231,7 @@ packages:
231 name: contacts_service 231 name: contacts_service
232 url: "https://pub.flutter-io.cn" 232 url: "https://pub.flutter-io.cn"
233 source: hosted 233 source: hosted
234 - version: "0.4.6" 234 + version: "0.6.1"
235 convert: 235 convert:
236 dependency: transitive 236 dependency: transitive
237 description: 237 description:
@@ -785,7 +785,7 @@ packages: @@ -785,7 +785,7 @@ packages:
785 name: quiver 785 name: quiver
786 url: "https://pub.flutter-io.cn" 786 url: "https://pub.flutter-io.cn"
787 source: hosted 787 source: hosted
788 - version: "2.1.5" 788 + version: "3.0.1"
789 rational: 789 rational:
790 dependency: transitive 790 dependency: transitive
791 description: 791 description:
@@ -87,7 +87,7 @@ dependencies: @@ -87,7 +87,7 @@ dependencies:
87 # webview 87 # webview
88 webview_flutter: ^0.3.22+1 88 webview_flutter: ^0.3.22+1
89 # 获取通讯录 89 # 获取通讯录
90 - contacts_service: ^0.4.6 90 + contacts_service: ^0.6.1
91 common_utils: ^1.1.3 91 common_utils: ^1.1.3
92 easy_contact_picker: ^0.0.2 92 easy_contact_picker: ^0.0.2
93 flutter_app_badger: ^1.1.2 93 flutter_app_badger: ^1.1.2