xt / Flutter-ReserveApp · Commits

Go to a project

Commit 452ad4a9f4333b43ab1c83ced76556001405476b

Authored by “gaiyaguang”
1 parent f9366f4b
build: skipped

红点修复

Inline Side-by-side
Showing 4 changed files with 23 additions and 11 deletions
1 -196f9f292c7f47fcf809595ac8fc6ce8  
  1 +83b3ddec6f4d9a6ed2f11de1a0a1915e
@@ -12,6 +12,8 @@ PODS: @@ -12,6 +12,8 @@ PODS:
12 - easy_contact_picker (0.0.1): 12 - easy_contact_picker (0.0.1):
13 - Flutter 13 - Flutter
14 - Flutter (1.0.0) 14 - Flutter (1.0.0)
  15 + - flutter_app_badger (0.0.1):
  16 + - Flutter
15 - flutter_bugly (0.0.1): 17 - flutter_bugly (0.0.1):
16 - Bugly 18 - Bugly
17 - Flutter 19 - Flutter
@@ -56,6 +58,7 @@ DEPENDENCIES: @@ -56,6 +58,7 @@ DEPENDENCIES:
56 - device_info (from `.symlinks/plugins/device_info/ios`) 58 - device_info (from `.symlinks/plugins/device_info/ios`)
57 - easy_contact_picker (from `.symlinks/plugins/easy_contact_picker/ios`) 59 - easy_contact_picker (from `.symlinks/plugins/easy_contact_picker/ios`)
58 - Flutter (from `Flutter`) 60 - Flutter (from `Flutter`)
  61 + - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
59 - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`) 62 - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
60 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`) 63 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
61 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) 64 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
@@ -91,6 +94,8 @@ EXTERNAL SOURCES: @@ -91,6 +94,8 @@ EXTERNAL SOURCES:
91 :path: ".symlinks/plugins/easy_contact_picker/ios" 94 :path: ".symlinks/plugins/easy_contact_picker/ios"
92 Flutter: 95 Flutter:
93 :path: Flutter 96 :path: Flutter
  97 + flutter_app_badger:
  98 + :path: ".symlinks/plugins/flutter_app_badger/ios"
94 flutter_bugly: 99 flutter_bugly:
95 :path: ".symlinks/plugins/flutter_bugly/ios" 100 :path: ".symlinks/plugins/flutter_bugly/ios"
96 flutter_statusbarcolor: 101 flutter_statusbarcolor:
@@ -126,6 +131,7 @@ SPEC CHECKSUMS: @@ -126,6 +131,7 @@ SPEC CHECKSUMS:
126 device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 131 device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
127 easy_contact_picker: 9ab9dc70e8ddde6e76a19ffc482d7bf899868730 132 easy_contact_picker: 9ab9dc70e8ddde6e76a19ffc482d7bf899868730
128 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec 133 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
  134 + flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68
129 flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3 135 flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3
130 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 136 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
131 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b 137 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
@@ -254,6 +254,7 @@ @@ -254,6 +254,7 @@
254 "${BUILT_PRODUCTS_DIR}/contacts_service/contacts_service.framework", 254 "${BUILT_PRODUCTS_DIR}/contacts_service/contacts_service.framework",
255 "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework", 255 "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
256 "${BUILT_PRODUCTS_DIR}/easy_contact_picker/easy_contact_picker.framework", 256 "${BUILT_PRODUCTS_DIR}/easy_contact_picker/easy_contact_picker.framework",
  257 + "${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
257 "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor/flutter_statusbarcolor.framework", 258 "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor/flutter_statusbarcolor.framework",
258 "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework", 259 "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
259 "${BUILT_PRODUCTS_DIR}/install_plugin/install_plugin.framework", 260 "${BUILT_PRODUCTS_DIR}/install_plugin/install_plugin.framework",
@@ -274,6 +275,7 @@ @@ -274,6 +275,7 @@
274 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/contacts_service.framework", 275 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/contacts_service.framework",
275 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework", 276 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
276 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/easy_contact_picker.framework", 277 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/easy_contact_picker.framework",
  278 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
277 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor.framework", 279 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor.framework",
278 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework", 280 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
279 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/install_plugin.framework", 281 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/install_plugin.framework",
@@ -407,7 +409,7 @@ @@ -407,7 +409,7 @@
407 CODE_SIGN_IDENTITY = "iPhone Developer"; 409 CODE_SIGN_IDENTITY = "iPhone Developer";
408 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
409 CODE_SIGN_STYLE = Automatic; 411 CODE_SIGN_STYLE = Automatic;
410 - CURRENT_PROJECT_VERSION = 141; 412 + CURRENT_PROJECT_VERSION = 146;
411 DEVELOPMENT_TEAM = 8J59HM8B82; 413 DEVELOPMENT_TEAM = 8J59HM8B82;
412 ENABLE_BITCODE = NO; 414 ENABLE_BITCODE = NO;
413 FRAMEWORK_SEARCH_PATHS = ( 415 FRAMEWORK_SEARCH_PATHS = (
@@ -420,7 +422,7 @@ @@ -420,7 +422,7 @@
420 "$(inherited)", 422 "$(inherited)",
421 "$(PROJECT_DIR)/Flutter", 423 "$(PROJECT_DIR)/Flutter",
422 ); 424 );
423 - MARKETING_VERSION = 1.4.1; 425 + MARKETING_VERSION = 1.4.6;
424 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 426 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
425 PRODUCT_NAME = "一键订"; 427 PRODUCT_NAME = "一键订";
426 PROVISIONING_PROFILE_SPECIFIER = ""; 428 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -549,7 +551,7 @@ @@ -549,7 +551,7 @@
549 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 551 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
550 CODE_SIGN_IDENTITY = "iPhone Developer"; 552 CODE_SIGN_IDENTITY = "iPhone Developer";
551 CODE_SIGN_STYLE = Automatic; 553 CODE_SIGN_STYLE = Automatic;
552 - CURRENT_PROJECT_VERSION = 141; 554 + CURRENT_PROJECT_VERSION = 146;
553 DEVELOPMENT_TEAM = 8J59HM8B82; 555 DEVELOPMENT_TEAM = 8J59HM8B82;
554 ENABLE_BITCODE = NO; 556 ENABLE_BITCODE = NO;
555 FRAMEWORK_SEARCH_PATHS = ( 557 FRAMEWORK_SEARCH_PATHS = (
@@ -562,7 +564,7 @@ @@ -562,7 +564,7 @@
562 "$(inherited)", 564 "$(inherited)",
563 "$(PROJECT_DIR)/Flutter", 565 "$(PROJECT_DIR)/Flutter",
564 ); 566 );
565 - MARKETING_VERSION = 1.4.1; 567 + MARKETING_VERSION = 1.4.6;
566 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 568 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
567 PRODUCT_NAME = "一键订"; 569 PRODUCT_NAME = "一键订";
568 PROVISIONING_PROFILE_SPECIFIER = ""; 570 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -582,7 +584,7 @@ @@ -582,7 +584,7 @@
582 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 584 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
583 CODE_SIGN_IDENTITY = "iPhone Developer"; 585 CODE_SIGN_IDENTITY = "iPhone Developer";
584 CODE_SIGN_STYLE = Automatic; 586 CODE_SIGN_STYLE = Automatic;
585 - CURRENT_PROJECT_VERSION = 141; 587 + CURRENT_PROJECT_VERSION = 146;
586 DEVELOPMENT_TEAM = 8J59HM8B82; 588 DEVELOPMENT_TEAM = 8J59HM8B82;
587 ENABLE_BITCODE = NO; 589 ENABLE_BITCODE = NO;
588 FRAMEWORK_SEARCH_PATHS = ( 590 FRAMEWORK_SEARCH_PATHS = (
@@ -595,7 +597,7 @@ @@ -595,7 +597,7 @@
595 "$(inherited)", 597 "$(inherited)",
596 "$(PROJECT_DIR)/Flutter", 598 "$(PROJECT_DIR)/Flutter",
597 ); 599 );
598 - MARKETING_VERSION = 1.4.1; 600 + MARKETING_VERSION = 1.4.6;
599 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 601 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
600 PRODUCT_NAME = "一键订"; 602 PRODUCT_NAME = "一键订";
601 PROVISIONING_PROFILE_SPECIFIER = ""; 603 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -105,7 +105,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -105,7 +105,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
105 105
106 //获取点击通知栏的自定义参数 106 //获取点击通知栏的自定义参数
107 _getIntent() async { 107 _getIntent() async {
108 - _clearBadge(); 108 + _clearBadge(() {});
109 Map param = await Tools().getIntent(); 109 Map param = await Tools().getIntent();
110 Map notifyParam = param; 110 Map notifyParam = param;
111 if (Platform.isIOS && param != null) { 111 if (Platform.isIOS && param != null) {
@@ -188,7 +188,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -188,7 +188,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
188 print("flutter xgPushDidClearAllIdentifiers: $msg"); 188 print("flutter xgPushDidClearAllIdentifiers: $msg");
189 }, 189 },
190 xgPushClickAction: (Map<String, dynamic> msg) async { 190 xgPushClickAction: (Map<String, dynamic> msg) async {
191 - _clearBadge(); 191 + _clearBadge(() {});
192 if (Platform.isIOS && msg != null && msg['custom'] != null) { 192 if (Platform.isIOS && msg != null && msg['custom'] != null) {
193 Map custom = json.decode(msg['custom'].toString()); 193 Map custom = json.decode(msg['custom'].toString());
194 switch (custom["messageType"].toString()) { 194 switch (custom["messageType"].toString()) {
@@ -245,11 +245,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -245,11 +245,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
245 FlutterAppBadger.updateBadgeCount(numPush); 245 FlutterAppBadger.updateBadgeCount(numPush);
246 } 246 }
247 247
248 - void _clearBadge() async { 248 + void _clearBadge(VoidCallback callback) async {
249 numPush = 0; 249 numPush = 0;
250 XgFlutterPlugin().setBadge(0); 250 XgFlutterPlugin().setBadge(0);
251 XgFlutterPlugin().setAppBadge(0); 251 XgFlutterPlugin().setAppBadge(0);
252 FlutterAppBadger.removeBadge(); 252 FlutterAppBadger.removeBadge();
  253 + callback();
253 } 254 }
254 255
255 //初始化推送token 256 //初始化推送token
@@ -285,7 +286,10 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -285,7 +286,10 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
285 super.didChangeAppLifecycleState(state); 286 super.didChangeAppLifecycleState(state);
286 switch (state) { 287 switch (state) {
287 case AppLifecycleState.resumed: //应用前台可见 288 case AppLifecycleState.resumed: //应用前台可见
288 - getUntreatedMessage(); 289 + _clearBadge(() {
  290 + getUntreatedMessage();
  291 + });
  292 +
289 break; 293 break;
290 case AppLifecycleState.inactive: 294 case AppLifecycleState.inactive:
291 print('inactive'); 295 print('inactive');