react-native-netmera 1.4.6-nohms → 1.4.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -0
- package/android/.gradle/4.10.1/fileHashes/fileHashes.bin +0 -0
- package/android/.gradle/4.10.1/fileHashes/fileHashes.lock +0 -0
- package/android/build/intermediates/compile_library_classes_jar/debug/classes.jar +0 -0
- package/android/build/intermediates/compile_r_class_jar/debug/R.jar +0 -0
- package/android/build/intermediates/compile_symbol_list/debug/R.txt +103 -0
- package/android/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +1 -1
- package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmera.class +0 -0
- package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmeraConfiguration$Builder.class +0 -0
- package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmeraConfiguration.class +0 -0
- package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmeraModule.class +0 -0
- package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmeraUtil$1.class +0 -0
- package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmeraUtil.class +0 -0
- package/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar +0 -0
- package/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt +103 -0
- package/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin +0 -0
- package/android/build.gradle +2 -1
- package/android/src/main/java/com/netmera/reactnativesdk/RNNetmera.java +1 -1
- package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraConfiguration.java +12 -0
- package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraModule.java +4 -0
- package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraUtil.java +24 -9
- package/ios/RNNetmera.m +1 -1
- package/package.json +1 -1
- package/src/Netmera.js +9 -1
package/README.md
CHANGED
|
@@ -50,11 +50,13 @@ buildscript {
|
|
|
50
50
|
repositories {
|
|
51
51
|
google()
|
|
52
52
|
jcenter()
|
|
53
|
+
maven {url 'https://developer.huawei.com/repo/'}
|
|
53
54
|
}
|
|
54
55
|
|
|
55
56
|
dependencies {
|
|
56
57
|
classpath 'com.android.tools.build:gradle:4.1.3'
|
|
57
58
|
classpath 'com.google.gms:google-services:4.3.10'
|
|
59
|
+
classpath 'com.huawei.agconnect:agcp:1.6.3.300'
|
|
58
60
|
}
|
|
59
61
|
}
|
|
60
62
|
|
|
@@ -63,6 +65,7 @@ allprojects {
|
|
|
63
65
|
google()
|
|
64
66
|
jcenter()
|
|
65
67
|
maven { url 'https://maven.google.com'}
|
|
68
|
+
maven { url 'https://developer.huawei.com/repo/'}
|
|
66
69
|
maven { url "https://release.netmera.com/release/android" }
|
|
67
70
|
}
|
|
68
71
|
}
|
|
@@ -83,6 +86,7 @@ allprojects {
|
|
|
83
86
|
|
|
84
87
|
```
|
|
85
88
|
apply plugin: 'com.google.gms.google-services'
|
|
89
|
+
apply plugin: 'com.huawei.agconnect'
|
|
86
90
|
```
|
|
87
91
|
|
|
88
92
|
6) Create an application class as shown below.
|
|
@@ -97,6 +101,7 @@ apply plugin: 'com.google.gms.google-services'
|
|
|
97
101
|
super.onCreate();
|
|
98
102
|
RNNetmeraConfiguration netmeraConfiguration = new RNNetmeraConfiguration.Builder()
|
|
99
103
|
.firebaseSenderId(<YOUR GCM SENDER ID>)
|
|
104
|
+
.huaweiSenderId(<YOUR HMS SENDER ID>)
|
|
100
105
|
.apiKey(<YOUR NETMERA API KEY>) // This is for enabling Netmera logs.
|
|
101
106
|
.logging(true)
|
|
102
107
|
.build(this);
|
|
@@ -174,6 +179,24 @@ messaging().onMessage(async remoteMessage => {
|
|
|
174
179
|
});
|
|
175
180
|
```
|
|
176
181
|
|
|
182
|
+
10) If you have custom Huawei Messaging integration, please see usage below.
|
|
183
|
+
|
|
184
|
+
```
|
|
185
|
+
HmsPushInstanceId.getToken("")
|
|
186
|
+
.then((result) => {
|
|
187
|
+
Netmera.onNetmeraNewToken(result.result)
|
|
188
|
+
})
|
|
189
|
+
|
|
190
|
+
HmsPushEvent.onRemoteMessageReceived(event => {
|
|
191
|
+
const remoteMessage = new RNRemoteMessage(event.msg);
|
|
192
|
+
let data = JSON.parse(remoteMessage.getData())
|
|
193
|
+
console.log("onRemoteMessageReceived", data)
|
|
194
|
+
if (Netmera.isNetmeraRemoteMessage(data)) {
|
|
195
|
+
Netmera.onNetmeraHuaweiPushMessageReceived(remoteMessage.getFrom(), data)
|
|
196
|
+
}
|
|
197
|
+
})
|
|
198
|
+
```
|
|
199
|
+
|
|
177
200
|
### Setup - iOS Part
|
|
178
201
|
|
|
179
202
|
1) Navigate to ios folder in your terminal and run the following command.
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -76,6 +76,7 @@ int animator mtrl_fab_hide_motion_spec 0x0
|
|
|
76
76
|
int animator mtrl_fab_show_motion_spec 0x0
|
|
77
77
|
int animator mtrl_fab_transformation_sheet_collapse_spec 0x0
|
|
78
78
|
int animator mtrl_fab_transformation_sheet_expand_spec 0x0
|
|
79
|
+
int array huawei_module_network_services 0x0
|
|
79
80
|
int attr SharedValue 0x0
|
|
80
81
|
int attr SharedValueId 0x0
|
|
81
82
|
int attr actionBarDivider 0x0
|
|
@@ -1349,6 +1350,9 @@ int color dim_foreground_disabled_material_dark 0x0
|
|
|
1349
1350
|
int color dim_foreground_disabled_material_light 0x0
|
|
1350
1351
|
int color dim_foreground_material_dark 0x0
|
|
1351
1352
|
int color dim_foreground_material_light 0x0
|
|
1353
|
+
int color emui_color_gray_1 0x0
|
|
1354
|
+
int color emui_color_gray_10 0x0
|
|
1355
|
+
int color emui_color_gray_7 0x0
|
|
1352
1356
|
int color error_color_material_dark 0x0
|
|
1353
1357
|
int color error_color_material_light 0x0
|
|
1354
1358
|
int color fcm_test_color 0x0
|
|
@@ -1851,6 +1855,9 @@ int color test_mtrl_calendar_day 0x0
|
|
|
1851
1855
|
int color test_mtrl_calendar_day_selected 0x0
|
|
1852
1856
|
int color tooltip_background_dark 0x0
|
|
1853
1857
|
int color tooltip_background_light 0x0
|
|
1858
|
+
int color upsdk_color_gray_1 0x0
|
|
1859
|
+
int color upsdk_color_gray_10 0x0
|
|
1860
|
+
int color upsdk_color_gray_7 0x0
|
|
1854
1861
|
int dimen abc_action_bar_content_inset_material 0x0
|
|
1855
1862
|
int dimen abc_action_bar_content_inset_with_nav 0x0
|
|
1856
1863
|
int dimen abc_action_bar_default_height_material 0x0
|
|
@@ -2444,6 +2451,11 @@ int dimen tooltip_precise_anchor_threshold 0x0
|
|
|
2444
2451
|
int dimen tooltip_vertical_padding 0x0
|
|
2445
2452
|
int dimen tooltip_y_offset_non_touch 0x0
|
|
2446
2453
|
int dimen tooltip_y_offset_touch 0x0
|
|
2454
|
+
int dimen upsdk_margin_l 0x0
|
|
2455
|
+
int dimen upsdk_margin_m 0x0
|
|
2456
|
+
int dimen upsdk_margin_xs 0x0
|
|
2457
|
+
int dimen upsdk_master_body_2 0x0
|
|
2458
|
+
int dimen upsdk_master_subtitle 0x0
|
|
2447
2459
|
int drawable abc_ab_share_pack_mtrl_alpha 0x0
|
|
2448
2460
|
int drawable abc_action_bar_item_background_material 0x0
|
|
2449
2461
|
int drawable abc_btn_borderless_material 0x0
|
|
@@ -2638,6 +2650,10 @@ int drawable test_custom_background 0x0
|
|
|
2638
2650
|
int drawable test_level_drawable 0x0
|
|
2639
2651
|
int drawable tooltip_frame_dark 0x0
|
|
2640
2652
|
int drawable tooltip_frame_light 0x0
|
|
2653
|
+
int drawable upsdk_cancel_bg 0x0
|
|
2654
|
+
int drawable upsdk_cancel_normal 0x0
|
|
2655
|
+
int drawable upsdk_cancel_pressed_bg 0x0
|
|
2656
|
+
int drawable upsdk_third_download_bg 0x0
|
|
2641
2657
|
int id BOTTOM_END 0x0
|
|
2642
2658
|
int id BOTTOM_START 0x0
|
|
2643
2659
|
int id NO_DEBUG 0x0
|
|
@@ -2686,6 +2702,7 @@ int id accessibility_label 0x0
|
|
|
2686
2702
|
int id accessibility_role 0x0
|
|
2687
2703
|
int id accessibility_state 0x0
|
|
2688
2704
|
int id accessibility_value 0x0
|
|
2705
|
+
int id action 0x0
|
|
2689
2706
|
int id action0 0x0
|
|
2690
2707
|
int id actionDown 0x0
|
|
2691
2708
|
int id actionDownUp 0x0
|
|
@@ -2715,10 +2732,12 @@ int id adjust_width 0x0
|
|
|
2715
2732
|
int id alertTitle 0x0
|
|
2716
2733
|
int id aligned 0x0
|
|
2717
2734
|
int id allStates 0x0
|
|
2735
|
+
int id allsize_textview 0x0
|
|
2718
2736
|
int id animateToEnd 0x0
|
|
2719
2737
|
int id animateToStart 0x0
|
|
2720
2738
|
int id antiClockwise 0x0
|
|
2721
2739
|
int id anticipate 0x0
|
|
2740
|
+
int id appsize_textview 0x0
|
|
2722
2741
|
int id arc 0x0
|
|
2723
2742
|
int id asConfigured 0x0
|
|
2724
2743
|
int id async 0x0
|
|
@@ -2735,7 +2754,9 @@ int id bounce 0x0
|
|
|
2735
2754
|
int id buttonPanel 0x0
|
|
2736
2755
|
int id callMeasure 0x0
|
|
2737
2756
|
int id cancel_action 0x0
|
|
2757
|
+
int id cancel_bg 0x0
|
|
2738
2758
|
int id cancel_button 0x0
|
|
2759
|
+
int id cancel_imageview 0x0
|
|
2739
2760
|
int id carryVelocity 0x0
|
|
2740
2761
|
int id catalyst_redbox_title 0x0
|
|
2741
2762
|
int id center 0x0
|
|
@@ -2761,6 +2782,8 @@ int id constraint 0x0
|
|
|
2761
2782
|
int id container 0x0
|
|
2762
2783
|
int id content 0x0
|
|
2763
2784
|
int id contentPanel 0x0
|
|
2785
|
+
int id content_layout 0x0
|
|
2786
|
+
int id content_textview 0x0
|
|
2764
2787
|
int id contiguous 0x0
|
|
2765
2788
|
int id continuousVelocity 0x0
|
|
2766
2789
|
int id coordinator 0x0
|
|
@@ -2784,6 +2807,8 @@ int id design_menu_item_text 0x0
|
|
|
2784
2807
|
int id design_navigation_view 0x0
|
|
2785
2808
|
int id dialog_button 0x0
|
|
2786
2809
|
int id disjoint 0x0
|
|
2810
|
+
int id divider 0x0
|
|
2811
|
+
int id download_info_progress 0x0
|
|
2787
2812
|
int id dragAnticlockwise 0x0
|
|
2788
2813
|
int id dragClockwise 0x0
|
|
2789
2814
|
int id dragDown 0x0
|
|
@@ -2799,6 +2824,7 @@ int id easeOut 0x0
|
|
|
2799
2824
|
int id east 0x0
|
|
2800
2825
|
int id edit_query 0x0
|
|
2801
2826
|
int id elastic 0x0
|
|
2827
|
+
int id enable_service_text 0x0
|
|
2802
2828
|
int id end 0x0
|
|
2803
2829
|
int id endToStart 0x0
|
|
2804
2830
|
int id end_padder 0x0
|
|
@@ -2830,6 +2856,9 @@ int id gone 0x0
|
|
|
2830
2856
|
int id group_divider 0x0
|
|
2831
2857
|
int id guideline 0x0
|
|
2832
2858
|
int id header_title 0x0
|
|
2859
|
+
int id hms_message_text 0x0
|
|
2860
|
+
int id hms_progress_bar 0x0
|
|
2861
|
+
int id hms_progress_text 0x0
|
|
2833
2862
|
int id home 0x0
|
|
2834
2863
|
int id honorRequest 0x0
|
|
2835
2864
|
int id horizontal_only 0x0
|
|
@@ -2930,6 +2959,8 @@ int id mtrl_picker_text_input_range_start 0x0
|
|
|
2930
2959
|
int id mtrl_picker_title_text 0x0
|
|
2931
2960
|
int id mtrl_view_tag_bottom_padding 0x0
|
|
2932
2961
|
int id multiply 0x0
|
|
2962
|
+
int id name_layout 0x0
|
|
2963
|
+
int id name_textview 0x0
|
|
2933
2964
|
int id navigation_bar_item_active_indicator_view 0x0
|
|
2934
2965
|
int id navigation_bar_item_icon_container 0x0
|
|
2935
2966
|
int id navigation_bar_item_icon_view 0x0
|
|
@@ -2997,6 +3028,7 @@ int id screen 0x0
|
|
|
2997
3028
|
int id scrollIndicatorDown 0x0
|
|
2998
3029
|
int id scrollIndicatorUp 0x0
|
|
2999
3030
|
int id scrollView 0x0
|
|
3031
|
+
int id scroll_layout 0x0
|
|
3000
3032
|
int id scrollable 0x0
|
|
3001
3033
|
int id search_badge 0x0
|
|
3002
3034
|
int id search_bar 0x0
|
|
@@ -3015,6 +3047,7 @@ int id sharedValueSet 0x0
|
|
|
3015
3047
|
int id sharedValueUnset 0x0
|
|
3016
3048
|
int id shortcut 0x0
|
|
3017
3049
|
int id sin 0x0
|
|
3050
|
+
int id size_layout 0x0
|
|
3018
3051
|
int id skipped 0x0
|
|
3019
3052
|
int id slide 0x0
|
|
3020
3053
|
int id snackbar_action 0x0
|
|
@@ -3074,6 +3107,9 @@ int id textinput_helper_text 0x0
|
|
|
3074
3107
|
int id textinput_placeholder 0x0
|
|
3075
3108
|
int id textinput_prefix_text 0x0
|
|
3076
3109
|
int id textinput_suffix_text 0x0
|
|
3110
|
+
int id third_app_dl_progress_text 0x0
|
|
3111
|
+
int id third_app_dl_progressbar 0x0
|
|
3112
|
+
int id third_app_warn_text 0x0
|
|
3077
3113
|
int id time 0x0
|
|
3078
3114
|
int id title 0x0
|
|
3079
3115
|
int id titleDividerNoCustom 0x0
|
|
@@ -3099,6 +3135,8 @@ int id unchecked 0x0
|
|
|
3099
3135
|
int id uniform 0x0
|
|
3100
3136
|
int id unlabeled 0x0
|
|
3101
3137
|
int id up 0x0
|
|
3138
|
+
int id version_layout 0x0
|
|
3139
|
+
int id version_textview 0x0
|
|
3102
3140
|
int id vertical_only 0x0
|
|
3103
3141
|
int id view_offset_helper 0x0
|
|
3104
3142
|
int id view_tag_instance_handle 0x0
|
|
@@ -3210,6 +3248,7 @@ int layout abc_search_dropdown_item_icons_2line 0x0
|
|
|
3210
3248
|
int layout abc_search_view 0x0
|
|
3211
3249
|
int layout abc_select_dialog_material 0x0
|
|
3212
3250
|
int layout abc_tooltip 0x0
|
|
3251
|
+
int layout activity_endisable_service 0x0
|
|
3213
3252
|
int layout custom_dialog 0x0
|
|
3214
3253
|
int layout design_bottom_navigation_item 0x0
|
|
3215
3254
|
int layout design_bottom_sheet_dialog 0x0
|
|
@@ -3228,6 +3267,8 @@ int layout design_text_input_end_icon 0x0
|
|
|
3228
3267
|
int layout design_text_input_start_icon 0x0
|
|
3229
3268
|
int layout dev_loading_view 0x0
|
|
3230
3269
|
int layout fps_view 0x0
|
|
3270
|
+
int layout hms_download_progress 0x0
|
|
3271
|
+
int layout hwpush_trans_activity 0x0
|
|
3231
3272
|
int layout m3_alert_dialog 0x0
|
|
3232
3273
|
int layout m3_alert_dialog_actions 0x0
|
|
3233
3274
|
int layout m3_alert_dialog_title 0x0
|
|
@@ -3326,6 +3367,8 @@ int layout text_view_with_line_height_from_layout 0x0
|
|
|
3326
3367
|
int layout text_view_with_line_height_from_style 0x0
|
|
3327
3368
|
int layout text_view_with_theme_line_height 0x0
|
|
3328
3369
|
int layout text_view_without_line_height 0x0
|
|
3370
|
+
int layout upsdk_app_dl_progress_dialog 0x0
|
|
3371
|
+
int layout upsdk_ota_update_view 0x0
|
|
3329
3372
|
int menu example_menu 0x0
|
|
3330
3373
|
int menu example_menu2 0x0
|
|
3331
3374
|
int plurals mtrl_badge_content_description 0x0
|
|
@@ -3369,6 +3412,7 @@ int string abc_searchview_description_voice 0x0
|
|
|
3369
3412
|
int string abc_shareactionprovider_share_with 0x0
|
|
3370
3413
|
int string abc_shareactionprovider_share_with_application 0x0
|
|
3371
3414
|
int string abc_toolbar_collapse_description 0x0
|
|
3415
|
+
int string aimodule_exclude_domain 0x0
|
|
3372
3416
|
int string alert_description 0x0
|
|
3373
3417
|
int string androidx_startup 0x0
|
|
3374
3418
|
int string app_name 0x0
|
|
@@ -3438,6 +3482,31 @@ int string fcm_fallback_notification_channel_label 0x0
|
|
|
3438
3482
|
int string fcm_no_args 0x0
|
|
3439
3483
|
int string header_description 0x0
|
|
3440
3484
|
int string hide_bottom_view_on_scroll_behavior 0x0
|
|
3485
|
+
int string hms_abort 0x0
|
|
3486
|
+
int string hms_abort_message 0x0
|
|
3487
|
+
int string hms_apk_not_installed_hints 0x0
|
|
3488
|
+
int string hms_bindfaildlg_message 0x0
|
|
3489
|
+
int string hms_bindfaildlg_title 0x0
|
|
3490
|
+
int string hms_cancel 0x0
|
|
3491
|
+
int string hms_check_failure 0x0
|
|
3492
|
+
int string hms_checking 0x0
|
|
3493
|
+
int string hms_confirm 0x0
|
|
3494
|
+
int string hms_download_failure 0x0
|
|
3495
|
+
int string hms_download_no_space 0x0
|
|
3496
|
+
int string hms_download_retry 0x0
|
|
3497
|
+
int string hms_downloading_loading 0x0
|
|
3498
|
+
int string hms_install 0x0
|
|
3499
|
+
int string hms_install_message 0x0
|
|
3500
|
+
int string hms_is_spoof 0x0
|
|
3501
|
+
int string hms_push_channel 0x0
|
|
3502
|
+
int string hms_retry 0x0
|
|
3503
|
+
int string hms_spoof_hints 0x0
|
|
3504
|
+
int string hms_update 0x0
|
|
3505
|
+
int string hms_update_continue 0x0
|
|
3506
|
+
int string hms_update_message 0x0
|
|
3507
|
+
int string hms_update_message_new 0x0
|
|
3508
|
+
int string hms_update_nettype 0x0
|
|
3509
|
+
int string hms_update_title 0x0
|
|
3441
3510
|
int string icon_content_description 0x0
|
|
3442
3511
|
int string image_description 0x0
|
|
3443
3512
|
int string imagebutton_description 0x0
|
|
@@ -3531,21 +3600,31 @@ int string netmera_geo_not_available 0x0
|
|
|
3531
3600
|
int string netmera_geo_too_many_geofences 0x0
|
|
3532
3601
|
int string netmera_geo_too_many_pending_intents 0x0
|
|
3533
3602
|
int string netmera_geo_unknown_error 0x0
|
|
3603
|
+
int string networkkit_httpdns_domain 0x0
|
|
3534
3604
|
int string nmfcm_geo_not_available 0x0
|
|
3535
3605
|
int string nmfcm_geo_too_many_geofences 0x0
|
|
3536
3606
|
int string nmfcm_geo_too_many_pending_intents 0x0
|
|
3537
3607
|
int string nmfcm_geo_unknown_error 0x0
|
|
3608
|
+
int string nmhms_geo_not_available 0x0
|
|
3609
|
+
int string nmhms_geo_too_many_geofences 0x0
|
|
3610
|
+
int string nmhms_geo_too_many_pending_intents 0x0
|
|
3611
|
+
int string nmhms_geo_unknown_error 0x0
|
|
3538
3612
|
int string password_toggle_content_description 0x0
|
|
3539
3613
|
int string path_password_eye 0x0
|
|
3540
3614
|
int string path_password_eye_mask_strike_through 0x0
|
|
3541
3615
|
int string path_password_eye_mask_visible 0x0
|
|
3542
3616
|
int string path_password_strike_through 0x0
|
|
3543
3617
|
int string progressbar_description 0x0
|
|
3618
|
+
int string push_cat_body 0x0
|
|
3619
|
+
int string push_cat_head 0x0
|
|
3544
3620
|
int string radiogroup_description 0x0
|
|
3545
3621
|
int string rn_tab_description 0x0
|
|
3546
3622
|
int string scrollbar_description 0x0
|
|
3547
3623
|
int string search_description 0x0
|
|
3548
3624
|
int string search_menu_title 0x0
|
|
3625
|
+
int string spec_ip_0 0x0
|
|
3626
|
+
int string spec_ip_1 0x0
|
|
3627
|
+
int string spec_ip_2 0x0
|
|
3549
3628
|
int string spinbutton_description 0x0
|
|
3550
3629
|
int string state_busy_description 0x0
|
|
3551
3630
|
int string state_collapsed_description 0x0
|
|
@@ -3559,6 +3638,29 @@ int string summary_description 0x0
|
|
|
3559
3638
|
int string tablist_description 0x0
|
|
3560
3639
|
int string timer_description 0x0
|
|
3561
3640
|
int string toolbar_description 0x0
|
|
3641
|
+
int string upsdk_app_download_info_new 0x0
|
|
3642
|
+
int string upsdk_app_download_installing 0x0
|
|
3643
|
+
int string upsdk_app_size 0x0
|
|
3644
|
+
int string upsdk_app_version 0x0
|
|
3645
|
+
int string upsdk_appstore_install 0x0
|
|
3646
|
+
int string upsdk_cancel 0x0
|
|
3647
|
+
int string upsdk_checking_update_prompt 0x0
|
|
3648
|
+
int string upsdk_choice_update 0x0
|
|
3649
|
+
int string upsdk_detail 0x0
|
|
3650
|
+
int string upsdk_getting_message_fail_prompt_toast 0x0
|
|
3651
|
+
int string upsdk_mobile_dld_warn 0x0
|
|
3652
|
+
int string upsdk_no_available_network_prompt_toast 0x0
|
|
3653
|
+
int string upsdk_ota_app_name 0x0
|
|
3654
|
+
int string upsdk_ota_cancel 0x0
|
|
3655
|
+
int string upsdk_ota_force_cancel_new 0x0
|
|
3656
|
+
int string upsdk_ota_notify_updatebtn 0x0
|
|
3657
|
+
int string upsdk_ota_title 0x0
|
|
3658
|
+
int string upsdk_storage_utils 0x0
|
|
3659
|
+
int string upsdk_store_url 0x0
|
|
3660
|
+
int string upsdk_third_app_dl_cancel_download_prompt_ex 0x0
|
|
3661
|
+
int string upsdk_third_app_dl_install_failed 0x0
|
|
3662
|
+
int string upsdk_third_app_dl_sure_cancel_download 0x0
|
|
3663
|
+
int string upsdk_update_check_no_new_version 0x0
|
|
3562
3664
|
int style AlertDialog_AppCompat 0x0
|
|
3563
3665
|
int style AlertDialog_AppCompat_Light 0x0
|
|
3564
3666
|
int style AndroidThemeColorAccentYellow 0x0
|
|
@@ -3692,6 +3794,7 @@ int style Base_Theme_MaterialComponents_Light_Dialog_Alert 0x0
|
|
|
3692
3794
|
int style Base_Theme_MaterialComponents_Light_Dialog_Bridge 0x0
|
|
3693
3795
|
int style Base_Theme_MaterialComponents_Light_Dialog_FixedSize 0x0
|
|
3694
3796
|
int style Base_Theme_MaterialComponents_Light_Dialog_MinWidth 0x0
|
|
3797
|
+
int style Base_Translucent 0x0
|
|
3695
3798
|
int style Base_V14_ThemeOverlay_Material3_BottomSheetDialog 0x0
|
|
3696
3799
|
int style Base_V14_ThemeOverlay_MaterialComponents_BottomSheetDialog 0x0
|
|
3697
3800
|
int style Base_V14_ThemeOverlay_MaterialComponents_Dialog 0x0
|
package/android/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
#
|
|
1
|
+
#Fri Dec 09 15:41:43 TRT 2022
|
package/android/build/intermediates/javac/debug/classes/com/netmera/reactnativesdk/RNNetmera.class
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -77,6 +77,7 @@ animator mtrl_fab_hide_motion_spec
|
|
|
77
77
|
animator mtrl_fab_show_motion_spec
|
|
78
78
|
animator mtrl_fab_transformation_sheet_collapse_spec
|
|
79
79
|
animator mtrl_fab_transformation_sheet_expand_spec
|
|
80
|
+
array huawei_module_network_services
|
|
80
81
|
attr SharedValue
|
|
81
82
|
attr SharedValueId
|
|
82
83
|
attr actionBarDivider
|
|
@@ -1350,6 +1351,9 @@ color dim_foreground_disabled_material_dark
|
|
|
1350
1351
|
color dim_foreground_disabled_material_light
|
|
1351
1352
|
color dim_foreground_material_dark
|
|
1352
1353
|
color dim_foreground_material_light
|
|
1354
|
+
color emui_color_gray_1
|
|
1355
|
+
color emui_color_gray_10
|
|
1356
|
+
color emui_color_gray_7
|
|
1353
1357
|
color error_color_material_dark
|
|
1354
1358
|
color error_color_material_light
|
|
1355
1359
|
color fcm_test_color
|
|
@@ -1852,6 +1856,9 @@ color test_mtrl_calendar_day
|
|
|
1852
1856
|
color test_mtrl_calendar_day_selected
|
|
1853
1857
|
color tooltip_background_dark
|
|
1854
1858
|
color tooltip_background_light
|
|
1859
|
+
color upsdk_color_gray_1
|
|
1860
|
+
color upsdk_color_gray_10
|
|
1861
|
+
color upsdk_color_gray_7
|
|
1855
1862
|
dimen abc_action_bar_content_inset_material
|
|
1856
1863
|
dimen abc_action_bar_content_inset_with_nav
|
|
1857
1864
|
dimen abc_action_bar_default_height_material
|
|
@@ -2445,6 +2452,11 @@ dimen tooltip_precise_anchor_threshold
|
|
|
2445
2452
|
dimen tooltip_vertical_padding
|
|
2446
2453
|
dimen tooltip_y_offset_non_touch
|
|
2447
2454
|
dimen tooltip_y_offset_touch
|
|
2455
|
+
dimen upsdk_margin_l
|
|
2456
|
+
dimen upsdk_margin_m
|
|
2457
|
+
dimen upsdk_margin_xs
|
|
2458
|
+
dimen upsdk_master_body_2
|
|
2459
|
+
dimen upsdk_master_subtitle
|
|
2448
2460
|
drawable abc_ab_share_pack_mtrl_alpha
|
|
2449
2461
|
drawable abc_action_bar_item_background_material
|
|
2450
2462
|
drawable abc_btn_borderless_material
|
|
@@ -2639,6 +2651,10 @@ drawable test_custom_background
|
|
|
2639
2651
|
drawable test_level_drawable
|
|
2640
2652
|
drawable tooltip_frame_dark
|
|
2641
2653
|
drawable tooltip_frame_light
|
|
2654
|
+
drawable upsdk_cancel_bg
|
|
2655
|
+
drawable upsdk_cancel_normal
|
|
2656
|
+
drawable upsdk_cancel_pressed_bg
|
|
2657
|
+
drawable upsdk_third_download_bg
|
|
2642
2658
|
id BOTTOM_END
|
|
2643
2659
|
id BOTTOM_START
|
|
2644
2660
|
id NO_DEBUG
|
|
@@ -2687,6 +2703,7 @@ id accessibility_label
|
|
|
2687
2703
|
id accessibility_role
|
|
2688
2704
|
id accessibility_state
|
|
2689
2705
|
id accessibility_value
|
|
2706
|
+
id action
|
|
2690
2707
|
id action0
|
|
2691
2708
|
id actionDown
|
|
2692
2709
|
id actionDownUp
|
|
@@ -2716,10 +2733,12 @@ id adjust_width
|
|
|
2716
2733
|
id alertTitle
|
|
2717
2734
|
id aligned
|
|
2718
2735
|
id allStates
|
|
2736
|
+
id allsize_textview
|
|
2719
2737
|
id animateToEnd
|
|
2720
2738
|
id animateToStart
|
|
2721
2739
|
id antiClockwise
|
|
2722
2740
|
id anticipate
|
|
2741
|
+
id appsize_textview
|
|
2723
2742
|
id arc
|
|
2724
2743
|
id asConfigured
|
|
2725
2744
|
id async
|
|
@@ -2736,7 +2755,9 @@ id bounce
|
|
|
2736
2755
|
id buttonPanel
|
|
2737
2756
|
id callMeasure
|
|
2738
2757
|
id cancel_action
|
|
2758
|
+
id cancel_bg
|
|
2739
2759
|
id cancel_button
|
|
2760
|
+
id cancel_imageview
|
|
2740
2761
|
id carryVelocity
|
|
2741
2762
|
id catalyst_redbox_title
|
|
2742
2763
|
id center
|
|
@@ -2762,6 +2783,8 @@ id constraint
|
|
|
2762
2783
|
id container
|
|
2763
2784
|
id content
|
|
2764
2785
|
id contentPanel
|
|
2786
|
+
id content_layout
|
|
2787
|
+
id content_textview
|
|
2765
2788
|
id contiguous
|
|
2766
2789
|
id continuousVelocity
|
|
2767
2790
|
id coordinator
|
|
@@ -2785,6 +2808,8 @@ id design_menu_item_text
|
|
|
2785
2808
|
id design_navigation_view
|
|
2786
2809
|
id dialog_button
|
|
2787
2810
|
id disjoint
|
|
2811
|
+
id divider
|
|
2812
|
+
id download_info_progress
|
|
2788
2813
|
id dragAnticlockwise
|
|
2789
2814
|
id dragClockwise
|
|
2790
2815
|
id dragDown
|
|
@@ -2800,6 +2825,7 @@ id easeOut
|
|
|
2800
2825
|
id east
|
|
2801
2826
|
id edit_query
|
|
2802
2827
|
id elastic
|
|
2828
|
+
id enable_service_text
|
|
2803
2829
|
id end
|
|
2804
2830
|
id endToStart
|
|
2805
2831
|
id end_padder
|
|
@@ -2831,6 +2857,9 @@ id gone
|
|
|
2831
2857
|
id group_divider
|
|
2832
2858
|
id guideline
|
|
2833
2859
|
id header_title
|
|
2860
|
+
id hms_message_text
|
|
2861
|
+
id hms_progress_bar
|
|
2862
|
+
id hms_progress_text
|
|
2834
2863
|
id home
|
|
2835
2864
|
id honorRequest
|
|
2836
2865
|
id horizontal_only
|
|
@@ -2931,6 +2960,8 @@ id mtrl_picker_text_input_range_start
|
|
|
2931
2960
|
id mtrl_picker_title_text
|
|
2932
2961
|
id mtrl_view_tag_bottom_padding
|
|
2933
2962
|
id multiply
|
|
2963
|
+
id name_layout
|
|
2964
|
+
id name_textview
|
|
2934
2965
|
id navigation_bar_item_active_indicator_view
|
|
2935
2966
|
id navigation_bar_item_icon_container
|
|
2936
2967
|
id navigation_bar_item_icon_view
|
|
@@ -2998,6 +3029,7 @@ id screen
|
|
|
2998
3029
|
id scrollIndicatorDown
|
|
2999
3030
|
id scrollIndicatorUp
|
|
3000
3031
|
id scrollView
|
|
3032
|
+
id scroll_layout
|
|
3001
3033
|
id scrollable
|
|
3002
3034
|
id search_badge
|
|
3003
3035
|
id search_bar
|
|
@@ -3016,6 +3048,7 @@ id sharedValueSet
|
|
|
3016
3048
|
id sharedValueUnset
|
|
3017
3049
|
id shortcut
|
|
3018
3050
|
id sin
|
|
3051
|
+
id size_layout
|
|
3019
3052
|
id skipped
|
|
3020
3053
|
id slide
|
|
3021
3054
|
id snackbar_action
|
|
@@ -3075,6 +3108,9 @@ id textinput_helper_text
|
|
|
3075
3108
|
id textinput_placeholder
|
|
3076
3109
|
id textinput_prefix_text
|
|
3077
3110
|
id textinput_suffix_text
|
|
3111
|
+
id third_app_dl_progress_text
|
|
3112
|
+
id third_app_dl_progressbar
|
|
3113
|
+
id third_app_warn_text
|
|
3078
3114
|
id time
|
|
3079
3115
|
id title
|
|
3080
3116
|
id titleDividerNoCustom
|
|
@@ -3100,6 +3136,8 @@ id unchecked
|
|
|
3100
3136
|
id uniform
|
|
3101
3137
|
id unlabeled
|
|
3102
3138
|
id up
|
|
3139
|
+
id version_layout
|
|
3140
|
+
id version_textview
|
|
3103
3141
|
id vertical_only
|
|
3104
3142
|
id view_offset_helper
|
|
3105
3143
|
id view_tag_instance_handle
|
|
@@ -3211,6 +3249,7 @@ layout abc_search_dropdown_item_icons_2line
|
|
|
3211
3249
|
layout abc_search_view
|
|
3212
3250
|
layout abc_select_dialog_material
|
|
3213
3251
|
layout abc_tooltip
|
|
3252
|
+
layout activity_endisable_service
|
|
3214
3253
|
layout custom_dialog
|
|
3215
3254
|
layout design_bottom_navigation_item
|
|
3216
3255
|
layout design_bottom_sheet_dialog
|
|
@@ -3229,6 +3268,8 @@ layout design_text_input_end_icon
|
|
|
3229
3268
|
layout design_text_input_start_icon
|
|
3230
3269
|
layout dev_loading_view
|
|
3231
3270
|
layout fps_view
|
|
3271
|
+
layout hms_download_progress
|
|
3272
|
+
layout hwpush_trans_activity
|
|
3232
3273
|
layout m3_alert_dialog
|
|
3233
3274
|
layout m3_alert_dialog_actions
|
|
3234
3275
|
layout m3_alert_dialog_title
|
|
@@ -3327,6 +3368,8 @@ layout text_view_with_line_height_from_layout
|
|
|
3327
3368
|
layout text_view_with_line_height_from_style
|
|
3328
3369
|
layout text_view_with_theme_line_height
|
|
3329
3370
|
layout text_view_without_line_height
|
|
3371
|
+
layout upsdk_app_dl_progress_dialog
|
|
3372
|
+
layout upsdk_ota_update_view
|
|
3330
3373
|
menu example_menu
|
|
3331
3374
|
menu example_menu2
|
|
3332
3375
|
plurals mtrl_badge_content_description
|
|
@@ -3370,6 +3413,7 @@ string abc_searchview_description_voice
|
|
|
3370
3413
|
string abc_shareactionprovider_share_with
|
|
3371
3414
|
string abc_shareactionprovider_share_with_application
|
|
3372
3415
|
string abc_toolbar_collapse_description
|
|
3416
|
+
string aimodule_exclude_domain
|
|
3373
3417
|
string alert_description
|
|
3374
3418
|
string androidx_startup
|
|
3375
3419
|
string app_name
|
|
@@ -3439,6 +3483,31 @@ string fcm_fallback_notification_channel_label
|
|
|
3439
3483
|
string fcm_no_args
|
|
3440
3484
|
string header_description
|
|
3441
3485
|
string hide_bottom_view_on_scroll_behavior
|
|
3486
|
+
string hms_abort
|
|
3487
|
+
string hms_abort_message
|
|
3488
|
+
string hms_apk_not_installed_hints
|
|
3489
|
+
string hms_bindfaildlg_message
|
|
3490
|
+
string hms_bindfaildlg_title
|
|
3491
|
+
string hms_cancel
|
|
3492
|
+
string hms_check_failure
|
|
3493
|
+
string hms_checking
|
|
3494
|
+
string hms_confirm
|
|
3495
|
+
string hms_download_failure
|
|
3496
|
+
string hms_download_no_space
|
|
3497
|
+
string hms_download_retry
|
|
3498
|
+
string hms_downloading_loading
|
|
3499
|
+
string hms_install
|
|
3500
|
+
string hms_install_message
|
|
3501
|
+
string hms_is_spoof
|
|
3502
|
+
string hms_push_channel
|
|
3503
|
+
string hms_retry
|
|
3504
|
+
string hms_spoof_hints
|
|
3505
|
+
string hms_update
|
|
3506
|
+
string hms_update_continue
|
|
3507
|
+
string hms_update_message
|
|
3508
|
+
string hms_update_message_new
|
|
3509
|
+
string hms_update_nettype
|
|
3510
|
+
string hms_update_title
|
|
3442
3511
|
string icon_content_description
|
|
3443
3512
|
string image_description
|
|
3444
3513
|
string imagebutton_description
|
|
@@ -3532,21 +3601,31 @@ string netmera_geo_not_available
|
|
|
3532
3601
|
string netmera_geo_too_many_geofences
|
|
3533
3602
|
string netmera_geo_too_many_pending_intents
|
|
3534
3603
|
string netmera_geo_unknown_error
|
|
3604
|
+
string networkkit_httpdns_domain
|
|
3535
3605
|
string nmfcm_geo_not_available
|
|
3536
3606
|
string nmfcm_geo_too_many_geofences
|
|
3537
3607
|
string nmfcm_geo_too_many_pending_intents
|
|
3538
3608
|
string nmfcm_geo_unknown_error
|
|
3609
|
+
string nmhms_geo_not_available
|
|
3610
|
+
string nmhms_geo_too_many_geofences
|
|
3611
|
+
string nmhms_geo_too_many_pending_intents
|
|
3612
|
+
string nmhms_geo_unknown_error
|
|
3539
3613
|
string password_toggle_content_description
|
|
3540
3614
|
string path_password_eye
|
|
3541
3615
|
string path_password_eye_mask_strike_through
|
|
3542
3616
|
string path_password_eye_mask_visible
|
|
3543
3617
|
string path_password_strike_through
|
|
3544
3618
|
string progressbar_description
|
|
3619
|
+
string push_cat_body
|
|
3620
|
+
string push_cat_head
|
|
3545
3621
|
string radiogroup_description
|
|
3546
3622
|
string rn_tab_description
|
|
3547
3623
|
string scrollbar_description
|
|
3548
3624
|
string search_description
|
|
3549
3625
|
string search_menu_title
|
|
3626
|
+
string spec_ip_0
|
|
3627
|
+
string spec_ip_1
|
|
3628
|
+
string spec_ip_2
|
|
3550
3629
|
string spinbutton_description
|
|
3551
3630
|
string state_busy_description
|
|
3552
3631
|
string state_collapsed_description
|
|
@@ -3560,6 +3639,29 @@ string summary_description
|
|
|
3560
3639
|
string tablist_description
|
|
3561
3640
|
string timer_description
|
|
3562
3641
|
string toolbar_description
|
|
3642
|
+
string upsdk_app_download_info_new
|
|
3643
|
+
string upsdk_app_download_installing
|
|
3644
|
+
string upsdk_app_size
|
|
3645
|
+
string upsdk_app_version
|
|
3646
|
+
string upsdk_appstore_install
|
|
3647
|
+
string upsdk_cancel
|
|
3648
|
+
string upsdk_checking_update_prompt
|
|
3649
|
+
string upsdk_choice_update
|
|
3650
|
+
string upsdk_detail
|
|
3651
|
+
string upsdk_getting_message_fail_prompt_toast
|
|
3652
|
+
string upsdk_mobile_dld_warn
|
|
3653
|
+
string upsdk_no_available_network_prompt_toast
|
|
3654
|
+
string upsdk_ota_app_name
|
|
3655
|
+
string upsdk_ota_cancel
|
|
3656
|
+
string upsdk_ota_force_cancel_new
|
|
3657
|
+
string upsdk_ota_notify_updatebtn
|
|
3658
|
+
string upsdk_ota_title
|
|
3659
|
+
string upsdk_storage_utils
|
|
3660
|
+
string upsdk_store_url
|
|
3661
|
+
string upsdk_third_app_dl_cancel_download_prompt_ex
|
|
3662
|
+
string upsdk_third_app_dl_install_failed
|
|
3663
|
+
string upsdk_third_app_dl_sure_cancel_download
|
|
3664
|
+
string upsdk_update_check_no_new_version
|
|
3563
3665
|
style AlertDialog_AppCompat
|
|
3564
3666
|
style AlertDialog_AppCompat_Light
|
|
3565
3667
|
style AndroidThemeColorAccentYellow
|
|
@@ -3693,6 +3795,7 @@ style Base_Theme_MaterialComponents_Light_Dialog_Alert
|
|
|
3693
3795
|
style Base_Theme_MaterialComponents_Light_Dialog_Bridge
|
|
3694
3796
|
style Base_Theme_MaterialComponents_Light_Dialog_FixedSize
|
|
3695
3797
|
style Base_Theme_MaterialComponents_Light_Dialog_MinWidth
|
|
3798
|
+
style Base_Translucent
|
|
3696
3799
|
style Base_V14_ThemeOverlay_Material3_BottomSheetDialog
|
|
3697
3800
|
style Base_V14_ThemeOverlay_MaterialComponents_BottomSheetDialog
|
|
3698
3801
|
style Base_V14_ThemeOverlay_MaterialComponents_Dialog
|
|
Binary file
|
package/android/build.gradle
CHANGED
|
@@ -16,7 +16,8 @@ android {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
dependencies {
|
|
19
|
-
implementation 'com.netmera:nmcore:3.9.
|
|
19
|
+
implementation 'com.netmera:nmcore:3.9.9'
|
|
20
20
|
implementation 'com.netmera:nmfcm:3.9.3'
|
|
21
|
+
implementation 'com.netmera:nmhms:3.9.5'
|
|
21
22
|
implementation 'com.facebook.react:react-native:+'
|
|
22
23
|
}
|
|
@@ -16,7 +16,7 @@ public class RNNetmera {
|
|
|
16
16
|
static void setNetmeraHeaders() {
|
|
17
17
|
ContentValues headerValues = new ContentValues();
|
|
18
18
|
headerValues.put("X-netmera-framework", "react");
|
|
19
|
-
headerValues.put("X-netmera-frameworkV", "1.4.
|
|
19
|
+
headerValues.put("X-netmera-frameworkV", "1.4.7");
|
|
20
20
|
Netmera.setNetmeraHeaders(headerValues);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -13,6 +13,7 @@ public class RNNetmeraConfiguration {
|
|
|
13
13
|
NMPushActionCallbacks nmPushActionCallbacks;
|
|
14
14
|
Context context;
|
|
15
15
|
String baseUrl;
|
|
16
|
+
String huaweiSenderId;
|
|
16
17
|
String apiKey;
|
|
17
18
|
String firebaseSenderId;
|
|
18
19
|
boolean logging;
|
|
@@ -22,6 +23,7 @@ public class RNNetmeraConfiguration {
|
|
|
22
23
|
this.nmPushActionCallbacks = builder.nmPushActionCallbacks;
|
|
23
24
|
this.context = builder.context;
|
|
24
25
|
this.baseUrl = builder.baseUrl;
|
|
26
|
+
this.huaweiSenderId = builder.huaweiSenderId;
|
|
25
27
|
this.apiKey = builder.apiKey;
|
|
26
28
|
this.firebaseSenderId = builder.firebaseSenderId;
|
|
27
29
|
this.logging = builder.logging;
|
|
@@ -39,6 +41,10 @@ public class RNNetmeraConfiguration {
|
|
|
39
41
|
builder.firebaseSenderId(firebaseSenderId);
|
|
40
42
|
}
|
|
41
43
|
|
|
44
|
+
if (huaweiSenderId != null) {
|
|
45
|
+
builder.huaweiSenderId(huaweiSenderId);
|
|
46
|
+
}
|
|
47
|
+
|
|
42
48
|
if (apiKey != null) {
|
|
43
49
|
builder.apiKey(apiKey);
|
|
44
50
|
}
|
|
@@ -62,6 +68,7 @@ public class RNNetmeraConfiguration {
|
|
|
62
68
|
private NMPushActionCallbacks nmPushActionCallbacks;
|
|
63
69
|
private Context context;
|
|
64
70
|
private String baseUrl;
|
|
71
|
+
private String huaweiSenderId;
|
|
65
72
|
private String apiKey;
|
|
66
73
|
private String firebaseSenderId;
|
|
67
74
|
private boolean logging;
|
|
@@ -81,6 +88,11 @@ public class RNNetmeraConfiguration {
|
|
|
81
88
|
return this;
|
|
82
89
|
}
|
|
83
90
|
|
|
91
|
+
public Builder huaweiSenderId(String huaweiSenderId) {
|
|
92
|
+
this.huaweiSenderId = huaweiSenderId;
|
|
93
|
+
return this;
|
|
94
|
+
}
|
|
95
|
+
|
|
84
96
|
public Builder apiKey(String apiKey) {
|
|
85
97
|
this.apiKey = apiKey;
|
|
86
98
|
return this;
|
|
@@ -490,6 +490,10 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
|
|
|
490
490
|
|
|
491
491
|
if (data.containsKey("google.c.sender.id")) {
|
|
492
492
|
Netmera.onNetmeraPushMessageReceived(new com.google.firebase.messaging.RemoteMessage(bundle));
|
|
493
|
+
} else {
|
|
494
|
+
com.huawei.hms.push.RemoteMessage.Builder builder = new com.huawei.hms.push.RemoteMessage.Builder("to");
|
|
495
|
+
builder.setData(data);
|
|
496
|
+
Netmera.onNetmeraPushMessageReceived(builder.build());
|
|
493
497
|
}
|
|
494
498
|
}
|
|
495
499
|
|
|
@@ -24,6 +24,7 @@ import com.facebook.react.bridge.WritableNativeMap;
|
|
|
24
24
|
import com.google.gson.Gson;
|
|
25
25
|
import com.netmera.NetmeraCarouselObject;
|
|
26
26
|
import com.netmera.NetmeraPushObject;
|
|
27
|
+
import com.netmera.NetmeraPushStyle;
|
|
27
28
|
import com.netmera.data.NMCategoryPreference;
|
|
28
29
|
import com.netmera.data.NMInboxStatus;
|
|
29
30
|
import com.netmera.data.NMInboxStatusCount;
|
|
@@ -200,6 +201,9 @@ class RNNetmeraUtil {
|
|
|
200
201
|
|
|
201
202
|
public static WritableMap mapPushObject(NetmeraPushObject pushObject) {
|
|
202
203
|
WritableMap pushObjectMap = Arguments.createMap();
|
|
204
|
+
if (pushObject == null) {
|
|
205
|
+
return pushObjectMap;
|
|
206
|
+
}
|
|
203
207
|
pushObjectMap.putInt("pushType", pushObject.getPushType());
|
|
204
208
|
pushObjectMap.putString("pushId", pushObject.getPushId());
|
|
205
209
|
pushObjectMap.putString("pushInstanceId", pushObject.getPushInstanceId());
|
|
@@ -232,21 +236,28 @@ class RNNetmeraUtil {
|
|
|
232
236
|
pushObjectMap.putString("expireTime", String.valueOf(DateFormat.format("yyyy-MM-dd HH:mm:ss", pushObject.getPopupExpirationTime())));
|
|
233
237
|
}
|
|
234
238
|
|
|
235
|
-
if (pushObject.getWebPageUrl() != null) {
|
|
236
|
-
pushObjectMap.putString("webPage", pushObject.getWebPageUrl());
|
|
237
|
-
}
|
|
238
|
-
|
|
239
239
|
if (pushObject.getInteractiveActions() != null && !pushObject.getInteractiveActions().isEmpty()) {
|
|
240
240
|
pushObjectMap.putString("interactiveActions", new Gson().toJson(pushObject.getInteractiveActions()));
|
|
241
241
|
}
|
|
242
242
|
|
|
243
243
|
/* Push Style */
|
|
244
244
|
if (pushObject.getPushStyle() != null) {
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
245
|
+
NetmeraPushStyle pushStyle = pushObject.getPushStyle();
|
|
246
|
+
if (pushStyle.getContentTitle() != null) {
|
|
247
|
+
pushObjectMap.putString("title", pushStyle.getContentTitle());
|
|
248
|
+
}
|
|
249
|
+
if (pushStyle.getSubText() != null) {
|
|
250
|
+
pushObjectMap.putString("subtitle", pushStyle.getSubText());
|
|
251
|
+
}
|
|
252
|
+
if (pushStyle.getContentText() != null) {
|
|
253
|
+
pushObjectMap.putString("body", pushStyle.getContentText());
|
|
254
|
+
}
|
|
255
|
+
if (pushStyle.getBigPicturePath() != null) {
|
|
256
|
+
pushObjectMap.putString("mediaAttachmentURL", pushStyle.getBigPicturePath());
|
|
257
|
+
}
|
|
258
|
+
if (pushStyle.retrieveCarouselObjects() != null) {
|
|
259
|
+
pushObjectMap.putString("carousel", new Gson().toJson(pushStyle.retrieveCarouselObjects()));
|
|
260
|
+
}
|
|
250
261
|
}
|
|
251
262
|
|
|
252
263
|
if (pushObject.getSendDate() != null) {
|
|
@@ -255,6 +266,10 @@ class RNNetmeraUtil {
|
|
|
255
266
|
|
|
256
267
|
if (pushObject.getPushAction() != null) {
|
|
257
268
|
pushObjectMap.putString("pushAction", new Gson().toJson(pushObject.getPushAction()));
|
|
269
|
+
|
|
270
|
+
if (pushObject.getWebPageUrl() != null) {
|
|
271
|
+
pushObjectMap.putString("webPage", pushObject.getWebPageUrl());
|
|
272
|
+
}
|
|
258
273
|
}
|
|
259
274
|
|
|
260
275
|
return pushObjectMap;
|
package/ios/RNNetmera.m
CHANGED
|
@@ -46,7 +46,7 @@ NSString *const ERROR_MESSAGE_SET_CATEGORY_PREFERENCE = @"Error occurred while s
|
|
|
46
46
|
|
|
47
47
|
+ (void)setNetmeraHeaders {
|
|
48
48
|
[Netmera setFramework:@"react"];
|
|
49
|
-
[Netmera setFrameworkVersion:@"1.4.
|
|
49
|
+
[Netmera setFrameworkVersion:@"1.4.7"];
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
+ (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {
|
package/package.json
CHANGED
package/src/Netmera.js
CHANGED
|
@@ -203,6 +203,14 @@ export default class Netmera {
|
|
|
203
203
|
}
|
|
204
204
|
}
|
|
205
205
|
|
|
206
|
+
static onNetmeraHuaweiPushMessageReceived(from: string, data: Map) {
|
|
207
|
+
data["_nm"] = JSON.stringify(data["_nm"])
|
|
208
|
+
if (Platform.OS === "android") {
|
|
209
|
+
data["from"] = from
|
|
210
|
+
RNNetmera.onNetmeraPushMessageReceived(data)
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
|
|
206
214
|
static onNetmeraNewToken(pushToken: string) {
|
|
207
215
|
if (Platform.OS === "android") {
|
|
208
216
|
RNNetmera.onNetmeraNewToken(pushToken)
|
|
@@ -212,4 +220,4 @@ export default class Netmera {
|
|
|
212
220
|
static isNetmeraRemoteMessage(data: Object): boolean {
|
|
213
221
|
return Platform.OS === "android" && data["_nm"] !== undefined;
|
|
214
222
|
}
|
|
215
|
-
}
|
|
223
|
+
}
|