diff --git a/services/ans/src/advanced_notification_publish_service.cpp b/services/ans/src/advanced_notification_publish_service.cpp index 7cad489225c7acbc6da9644ef723d14d39243fb0..8aa1f9f936848ca527e24d3c1be048a091942207 100644 --- a/services/ans/src/advanced_notification_publish_service.cpp +++ b/services/ans/src/advanced_notification_publish_service.cpp @@ -2708,6 +2708,7 @@ ErrCode AdvancedNotificationService::SetBadgeNumberForDhByBundle( { if (bundleOption == nullptr) { ANS_LOGE("SetBadgeNumberForDhByBundle bundleOption is null"); + return ERR_ANS_INVALID_PARAM; } if (bundleOption->GetBundleName().empty()) { ANS_LOGE("SetBadgeNumberForDhByBundle Invalid bundle name."); diff --git a/services/dialog_ui/enable_notification_dialog/AppScope/app.json b/services/dialog_ui/enable_notification_dialog/AppScope/app.json index e47e9a48e16d93196b3f0fb28efe7a653f64d48e..fba0af917c0d9b83d268a80d5c7867d61ae0cfd9 100644 --- a/services/dialog_ui/enable_notification_dialog/AppScope/app.json +++ b/services/dialog_ui/enable_notification_dialog/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.notificationdialog", "vendor": "example", - "versionCode": 1000021, - "versionName": "1.2.1", + "versionCode": 1000022, + "versionName": "1.2.2", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true, diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/base/element/string.json b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/base/element/string.json index a8f9ddcaffbaef570831879cb6445386b251e821..06771b8be2a1415ce892dcac6aa0e21208bb8883 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/base/element/string.json +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/base/element/string.json @@ -22,7 +22,7 @@ }, { "name":"reason_zyt", - "value":"These may include lock screen and banner notifications as well as sounds and vibration. You can modify these settings in EasyAbroad > App management." + "value":"These may include lock screen notifications, banners, badges, sounds, and vibration. You can change these settings in DroiTong > App management." }, { "name":"reason_tv", diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/bo_CN/element/string.json b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/bo_CN/element/string.json index 5b87718f09defd2195794e61a4268d784c219ed3..e0b1491f5792395a2bdeeb49194caed9fc460dc9 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/bo_CN/element/string.json +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/bo_CN/element/string.json @@ -22,7 +22,7 @@ }, { "name":"reason_zyt", - "value":"བརྡ་ཐོའི་དྲན་སྐུལ་གྱི་ཐབས་ལམ་ལ་སྒོ་ལྕགས་བརྙན་ཡོལ་དང་། འཕྲེད་བྱང་། དྲིལ་སྒྲ། སྦིར་བརྡ་སོགས་ཚུད་སྲིད། ༼ཀྲུའོ་དབྱི་ཐུང་༽>༼ ཉེར་སྤྱོད་དོ་དམ་༽ལ་བསྐྱོད་ནས་བཅོས་ཆོག" + "value":"བརྡ་ཐོའི་དྲན་སྐུལ་གྱི་ཐབས་ལམ་ལ་སྒོ་ལྕགས་བརྙན་ཡོལ་དང་། འཕྲེད་བྱང་། ཟུར་རྟགས། དྲིལ་སྒྲ། སྦིར་བརྡ་བཅས་ཚུད་སྲིད། ༼DroiTong༽>༼ ཉེར་སྤྱོད་དོ་དམ་༽ལ་བསྐྱོད་ནས་བཅོས་ཆོག" }, { "name":"ALLOW", diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/ug/element/string.json b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/ug/element/string.json index f741f9c39e93f2e8b4136945b3a521847f266e46..0f5d2b0cf9b4489666b0898bd140969ee38493b8 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/ug/element/string.json +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/ug/element/string.json @@ -22,7 +22,7 @@ }, { "name":"reason_zyt", - "value":"قۇلۇپ ئېكرانى، بالداق، ئاۋاز ۋە تىترەش قاتارلىقلار شۇنىڭ ئىچىدە. DroiTong > ئەپ باشقۇرۇش دېگەن ئورۇندىن ئۆزگەرتەلەيسىز." + "value":"قۇلۇپ ئېكرانى، بالداق، تامغا، ئاۋاز ۋە تىترەش شۇنىڭ ئىچىدە. DroiTong > ئەپ باشقۇرۇش دېگەن ئورۇندىن ئۆزگەرتەلەيسىز." }, { "name":"ALLOW", diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_CN/element/string.json b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_CN/element/string.json index c3bae4662fcfec8457b0b27ea8132ef2fcaa90a4..4990d706f4f6779cbf210bd2f8ba6d539652d456 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_CN/element/string.json +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_CN/element/string.json @@ -22,7 +22,7 @@ }, { "name":"reason_zyt", - "value":"通知提醒方式可能包括锁屏、横幅、响铃、振动等。可前往“卓易通”>“应用管理”更改。" + "value":"通知提醒方式可能包括锁屏、横幅、角标、响铃、振动。可前往“卓易通”>“应用管理”更改。" }, { "name":"reason_tv", diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_HK/element/string.json b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_HK/element/string.json index ad3bc78e97145f2cc08242d820955622a79994e7..555dbc880e5ce087a5d29246e679590941a4749b 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_HK/element/string.json +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_HK/element/string.json @@ -22,7 +22,7 @@ }, { "name":"reason_zyt", - "value":"通知提醒方式可能包括鎖屏、橫幅、響鬧和震動等。可前往「卓易通」>「應用程式管理」更改。" + "value":"通知提醒方式可能包括鎖屏、橫幅、徽章圖標、響鬧、震動。可前往「DroiTong」>「應用程式管理」更改。" }, { "name":"ALLOW", diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_TW/element/string.json b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_TW/element/string.json index 99bfcbe6a5d383e821f7659e2247a26339cd631f..181a80b1c11297d52b40a12353232fd3887ed003 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_TW/element/string.json +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/resources/zh_TW/element/string.json @@ -22,7 +22,7 @@ }, { "name":"reason_zyt", - "value":"通知提醒方式可能包括鎖定螢幕、橫幅、響鈴、振動等。您可以前往「卓易通」>「應用程式管理」變更。" + "value":"通知提醒方式可能包括鎖定螢幕、橫幅、徽章圖示、響鈴和振動。您可以前往「DroiTong」>「應用程式管理」變更。" }, { "name":"ALLOW",