diff --git a/App.vue b/App.vue index 2aae610..4e9d044 100644 --- a/App.vue +++ b/App.vue @@ -1,32 +1,46 @@ + view { + box-sizing: border-box; + } + \ No newline at end of file diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue index 3304bc0..d3fd858 100644 --- a/components/logistiComptent/logistiCard/logistiBriefCard.vue +++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue @@ -2,7 +2,7 @@ 取货点:  {{goodsInfo.shop_name}} - 收货人:  {{ fuzzyName(goodsInfo.user_name) }} + 收货人:  {{ fuzzyName(goodsInfo.receiver_name) }} @@ -16,10 +16,10 @@ 通知日期:  {{goodsInfo.create_time}} - + 联系电话:  {{goodsInfo.user_phone}} - 收货地址:  {{goodsInfo.user_address}} + color="#FF7C32" size="22">{{goodsInfo.receiver_phone}} + 收货地址:  {{goodsInfo.receiver_address}} 通知日期:  {{goodsInfo.qh_time}} diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue index c8f84fe..b95c2bc 100644 --- a/components/logistiComptent/logistiCard/logistiCard.vue +++ b/components/logistiComptent/logistiCard/logistiCard.vue @@ -21,7 +21,7 @@ 店主姓名 - {{goodsInfo.shop_receiver ||'暂无'}} + {{goodsInfo.shop_user ||'暂无'}} diff --git a/manifest.json b/manifest.json index cacb05e..efed387 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "供销综合平台", "appid" : "__UNI__B5B1EDD", "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", + "versionName" : "1.0.4", + "versionCode" : 105, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -21,7 +21,9 @@ "Payment" : {}, "Barcode" : {}, "Camera" : {}, - "Maps" : {} + "Maps" : {}, + "Push" : {}, + "Geolocation" : {} }, /* 应用发布信息 */ "distribute" : { @@ -115,6 +117,176 @@ } } } + }, + "nativePlugins" : { + "JG-JCore" : { + "JPUSH_APPKEY_IOS" : "5ced5ec5fa7bb86302944f0f", + "JPUSH_CHANNEL_IOS" : "", + "JPUSH_APPKEY_ANDROID" : "5ced5ec5fa7bb86302944f0f", + "JPUSH_CHANNEL_ANDROID" : "", + "__plugin_info__" : { + "name" : "JG-JCore", + "description" : "极光推送JCore插件", + "platforms" : "Android,iOS", + "url" : "", + "android_package_name" : "uni.UNIB5B1EDD", + "ios_bundle_id" : "uni.UNIB5B1EDD", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : { + "JPUSH_APPKEY_IOS" : { + "des" : "[iOS]极光portal配置应用信息时分配的AppKey", + "key" : "JCore:APP_KEY", + "value" : "" + }, + "JPUSH_CHANNEL_IOS" : { + "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", + "key" : "JCore:CHANNEL", + "value" : "" + }, + "JPUSH_APPKEY_ANDROID" : { + "des" : "[Android]极光portal配置应用信息时分配的AppKey", + "key" : "JPUSH_APPKEY", + "value" : "" + }, + "JPUSH_CHANNEL_ANDROID" : { + "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default", + "key" : "JPUSH_CHANNEL", + "value" : "" + } + } + } + }, + "JG-JPush" : { + "JPUSH_ISPRODUCTION_IOS" : "", + "JPUSH_ADVERTISINGID_IOS" : "", + "JPUSH_DEFAULTINITJPUSH_IOS" : "", + "JPUSH_OPPO_APPKEY" : "", + "JPUSH_OPPO_APPID" : "", + "JPUSH_OPPO_APPSECRET" : "", + "JPUSH_VIVO_APPKEY" : "", + "JPUSH_VIVO_APPID" : "", + "JPUSH_MEIZU_APPKEY" : "", + "JPUSH_MEIZU_APPID" : "", + "JPUSH_XIAOMI_APPKEY" : "", + "JPUSH_XIAOMI_APPID" : "", + "JPUSH_HUAWEI_APPID" : "", + "JPUSH_HONOR_APPID" : "", + "JPUSH_GOOGLE_API_KEY" : "", + "JPUSH_GOOGLE_APP_ID" : "", + "JPUSH_GOOGLE_PROJECT_NUMBER" : "", + "JPUSH_GOOGLE_PROJECT_ID" : "", + "JPUSH_GOOGLE_STORAGE_BUCKET" : "", + "__plugin_info__" : { + "name" : "JG-JPush", + "description" : "极光推送Hbuilder插件", + "platforms" : "Android,iOS", + "url" : "", + "android_package_name" : "uni.UNIB5B1EDD", + "ios_bundle_id" : "uni.UNIB5B1EDD", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : { + "JPUSH_ISPRODUCTION_IOS" : { + "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填", + "key" : "JPush:ISPRODUCTION", + "value" : "" + }, + "JPUSH_ADVERTISINGID_IOS" : { + "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", + "key" : "JPush:ADVERTISINGID", + "value" : "" + }, + "JPUSH_DEFAULTINITJPUSH_IOS" : { + "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填", + "key" : "JPush:DEFAULTINITJPUSH", + "value" : "" + }, + "JPUSH_OPPO_APPKEY" : { + "des" : "厂商OPPO-appkey,示例：OP-12345678", + "key" : "OPPO_APPKEY", + "value" : "" + }, + "JPUSH_OPPO_APPID" : { + "des" : "厂商OPPO-appId,示例：OP-12345678", + "key" : "OPPO_APPID", + "value" : "" + }, + "JPUSH_OPPO_APPSECRET" : { + "des" : "厂商OPPO-appSecret,示例：OP-12345678", + "key" : "OPPO_APPSECRET", + "value" : "" + }, + "JPUSH_VIVO_APPKEY" : { + "des" : "厂商VIVO-appkey,示例：12345678", + "key" : "com.vivo.push.api_key", + "value" : "" + }, + "JPUSH_VIVO_APPID" : { + "des" : "厂商VIVO-appId,示例：12345678", + "key" : "com.vivo.push.app_id", + "value" : "" + }, + "JPUSH_MEIZU_APPKEY" : { + "des" : "厂商MEIZU-appKey,示例：MZ-12345678", + "key" : "MEIZU_APPKEY", + "value" : "" + }, + "JPUSH_MEIZU_APPID" : { + "des" : "厂商MEIZU-appId,示例：MZ-12345678", + "key" : "MEIZU_APPID", + "value" : "" + }, + "JPUSH_XIAOMI_APPKEY" : { + "des" : "厂商XIAOMI-appKey,示例：MI-12345678", + "key" : "XIAOMI_APPKEY", + "value" : "" + }, + "JPUSH_XIAOMI_APPID" : { + "des" : "厂商XIAOMI-appId,示例：MI-12345678", + "key" : "XIAOMI_APPID", + "value" : "" + }, + "JPUSH_HUAWEI_APPID" : { + "des" : "厂商HUAWEI-appId,示例：appid=12346578", + "key" : "com.huawei.hms.client.appid", + "value" : "" + }, + "JPUSH_HONOR_APPID" : { + "des" : "厂商HONOR-appId,示例：12346578", + "key" : "com.hihonor.push.app_id", + "value" : "" + }, + "JPUSH_GOOGLE_API_KEY" : { + "des" : "厂商google api_key,示例:g-12346578", + "key" : "google_api_key", + "value" : "" + }, + "JPUSH_GOOGLE_APP_ID" : { + "des" : "厂商google mobilesdk_app_id,示例：g-12346578", + "key" : "google_app_id", + "value" : "" + }, + "JPUSH_GOOGLE_PROJECT_NUMBER" : { + "des" : "厂商google project_number,示例：g-12346578", + "key" : "gcm_defaultSenderId", + "value" : "" + }, + "JPUSH_GOOGLE_PROJECT_ID" : { + "des" : "厂商google project_id ,示例：g-12346578", + "key" : "project_id", + "value" : "" + }, + "JPUSH_GOOGLE_STORAGE_BUCKET" : { + "des" : "厂商google storage_bucket,示例：g-12346578", + "key" : "google_storage_bucket", + "value" : "" + } + } + } + } } }, /* 快应用特有相关 */ diff --git a/nativeplugins/JG-JCore/android/libs/arm64-v8a/libjcore424.so b/nativeplugins/JG-JCore/android/libs/arm64-v8a/libjcore424.so new file mode 100644 index 0000000..d6cee27 Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/arm64-v8a/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/libs/armeabi-v7a/libjcore424.so b/nativeplugins/JG-JCore/android/libs/armeabi-v7a/libjcore424.so new file mode 100644 index 0000000..3f7e0e8 Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/armeabi-v7a/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/libs/armeabi/libjcore424.so b/nativeplugins/JG-JCore/android/libs/armeabi/libjcore424.so new file mode 100644 index 0000000..32f9f5d Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/armeabi/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/libs/jcore-android-4.2.4.jar b/nativeplugins/JG-JCore/android/libs/jcore-android-4.2.4.jar new file mode 100644 index 0000000..f8fd640 Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/jcore-android-4.2.4.jar differ diff --git a/nativeplugins/JG-JCore/android/libs/mips/libjcore424.so b/nativeplugins/JG-JCore/android/libs/mips/libjcore424.so new file mode 100644 index 0000000..29323a1 Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/mips/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/libs/mips64/libjcore424.so b/nativeplugins/JG-JCore/android/libs/mips64/libjcore424.so new file mode 100644 index 0000000..bcf78ba Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/mips64/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/libs/x86/libjcore424.so b/nativeplugins/JG-JCore/android/libs/x86/libjcore424.so new file mode 100644 index 0000000..09e4e6e Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/x86/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/libs/x86_64/libjcore424.so b/nativeplugins/JG-JCore/android/libs/x86_64/libjcore424.so new file mode 100644 index 0000000..f6b64e7 Binary files /dev/null and b/nativeplugins/JG-JCore/android/libs/x86_64/libjcore424.so differ diff --git a/nativeplugins/JG-JCore/android/uniplugin_jcore-release.aar b/nativeplugins/JG-JCore/android/uniplugin_jcore-release.aar new file mode 100644 index 0000000..6e023e9 Binary files /dev/null and b/nativeplugins/JG-JCore/android/uniplugin_jcore-release.aar differ diff --git a/nativeplugins/JG-JCore/ios/JGInforCollectionAuth.h b/nativeplugins/JG-JCore/ios/JGInforCollectionAuth.h new file mode 100644 index 0000000..1a378b8 --- /dev/null +++ b/nativeplugins/JG-JCore/ios/JGInforCollectionAuth.h @@ -0,0 +1,27 @@ +// +// JGInforCollectionAuth.h +// JCore +// +// Created by 豆瓣 on 2021/10/27. +// Copyright © 2021 jiguang. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +/// 合规接口，是否授权极光采集一定的设备信息 +@interface JGInforCollectionAuthItems : NSObject +/// 是否授权，默认YES +@property(nonatomic,assign)BOOL isAuth; +@end + +@interface JGInforCollectionAuth : NSObject + +/// 设备信息采集授权接口（合规接口） +/// 请务必在调用初始化、功能性接口前调用此接口进行合规授权 +/// @param authBlock auth:YES 则极光认为您同意极光采集一定的设备信息 ++(void)JCollectionAuth:(void(^_Nullable)(JGInforCollectionAuthItems *authInfo))authBlock; +@end + +NS_ASSUME_NONNULL_END diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/Headers/JCoreModule.h b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/Headers/JCoreModule.h new file mode 100644 index 0000000..630b42d --- /dev/null +++ b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/Headers/JCoreModule.h @@ -0,0 +1,17 @@ +// +// JCoreModule.h +// UniPluginJCore +// +// Created by huangshuni on 2021/1/21. +// + +#import +#import "DCUniModule.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface JCoreModule : DCUniModule + +@end + +NS_ASSUME_NONNULL_END diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/Info.plist b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/Info.plist new file mode 100644 index 0000000..bec1b75 Binary files /dev/null and b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/Info.plist differ diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/UniPluginJCore b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/UniPluginJCore new file mode 100644 index 0000000..ed03bbf Binary files /dev/null and b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/UniPluginJCore differ diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeDirectory b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeDirectory new file mode 100644 index 0000000..f85a079 Binary files /dev/null and b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeDirectory differ diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeRequirements b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeRequirements new file mode 100644 index 0000000..25365e2 Binary files /dev/null and b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeRequirements differ diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeRequirements-1 b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeRequirements-1 new file mode 100644 index 0000000..7972195 Binary files /dev/null and b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeRequirements-1 differ diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeResources b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeResources new file mode 100644 index 0000000..ec357ae --- /dev/null +++ b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeResources @@ -0,0 +1,117 @@ + + + + + files + + Headers/JCoreModule.h + + 4aMcBALZuuQeh2JQjJqqvSkc2mA= + + Info.plist + + 06+wBVr403G+lX5fr/4efqHMj2A= + + + files2 + + Headers/JCoreModule.h + + hash + + 4aMcBALZuuQeh2JQjJqqvSkc2mA= + + hash2 + + h/0w2CaU3JBhKI3Pp4EiSWqLf/ZY1Ju+5+tBAdowZ5k= + + + + rules + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeSignature b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeSignature new file mode 100644 index 0000000..881600a Binary files /dev/null and b/nativeplugins/JG-JCore/ios/UniPluginJCore.framework/_CodeSignature/CodeSignature differ diff --git a/nativeplugins/JG-JCore/ios/jcore-ios-4.2.0.a b/nativeplugins/JG-JCore/ios/jcore-ios-4.2.0.a new file mode 100644 index 0000000..1dbe1e4 Binary files /dev/null and b/nativeplugins/JG-JCore/ios/jcore-ios-4.2.0.a differ diff --git a/nativeplugins/JG-JCore/package.json b/nativeplugins/JG-JCore/package.json new file mode 100644 index 0000000..11cc985 --- /dev/null +++ b/nativeplugins/JG-JCore/package.json @@ -0,0 +1,61 @@ +{ + "name": "JG-JCore", + "id": "JG-JCore", + "version": "1.1.4", + "description": "极光推送JCore插件", + "_dp_type":"nativeplugin", + "_dp_nativeplugin":{ + "ios": { + "plugins": [ + { + "type": "module", + "name": "JG-JCore", + "class": "JCoreModule" + } + ], + "integrateType": "framework", + "deploymentTarget": "11.0", + "validArchitectures": [ + "arm64" + ], + "parameters": { + "JPUSH_APPKEY_IOS": { + "des": "[iOS]极光portal配置应用信息时分配的AppKey", + "key": "JCore:APP_KEY" + }, + "JPUSH_CHANNEL_IOS": { + "des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default", + "key": "JCore:CHANNEL" + } + } + }, + "android": { + "plugins": [ + { + "type": "module", + "name": "JG-JCore", + "class": "cn.jiguang.uniplugin_jcore.JCoreModule" + } + ], + "integrateType": "aar", + "minSdkVersion": "19", + "permissions": [ + ], + "abis": [ + "armeabi-v7a", + "arm64-v8a", + "x86" + ], + "parameters": { + "JPUSH_APPKEY_ANDROID": { + "des": "[Android]极光portal配置应用信息时分配的AppKey", + "key": "JPUSH_APPKEY" + }, + "JPUSH_CHANNEL_ANDROID":{ + "des": "[Android]用于统计分发渠道，不需要可填默认值developer-default", + "key": "JPUSH_CHANNEL" + } + } + } + } +} diff --git a/nativeplugins/JG-JPush/android/HiPushSDK-7.0.41.301.aar b/nativeplugins/JG-JPush/android/HiPushSDK-7.0.41.301.aar new file mode 100644 index 0000000..47986fe Binary files /dev/null and b/nativeplugins/JG-JPush/android/HiPushSDK-7.0.41.301.aar differ diff --git a/nativeplugins/JG-JPush/android/agconnect-core-1.7.3.302.aar b/nativeplugins/JG-JPush/android/agconnect-core-1.7.3.302.aar new file mode 100644 index 0000000..83fa14d Binary files /dev/null and b/nativeplugins/JG-JPush/android/agconnect-core-1.7.3.302.aar differ diff --git a/nativeplugins/JG-JPush/android/availableupdate-6.9.0.300.aar b/nativeplugins/JG-JPush/android/availableupdate-6.9.0.300.aar new file mode 100644 index 0000000..7538608 Binary files /dev/null and b/nativeplugins/JG-JPush/android/availableupdate-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/base-6.9.0.300.aar b/nativeplugins/JG-JPush/android/base-6.9.0.300.aar new file mode 100644 index 0000000..1ec2942 Binary files /dev/null and b/nativeplugins/JG-JPush/android/base-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/baselegacyapi-6.9.0.300.aar b/nativeplugins/JG-JPush/android/baselegacyapi-6.9.0.300.aar new file mode 100644 index 0000000..b088600 Binary files /dev/null and b/nativeplugins/JG-JPush/android/baselegacyapi-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/com.heytap.msp-push-3.1.0.aar b/nativeplugins/JG-JPush/android/com.heytap.msp-push-3.1.0.aar new file mode 100644 index 0000000..48940ff Binary files /dev/null and b/nativeplugins/JG-JPush/android/com.heytap.msp-push-3.1.0.aar differ diff --git a/nativeplugins/JG-JPush/android/device-6.9.0.300.aar b/nativeplugins/JG-JPush/android/device-6.9.0.300.aar new file mode 100644 index 0000000..8c34c26 Binary files /dev/null and b/nativeplugins/JG-JPush/android/device-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-common-20.3.1.aar b/nativeplugins/JG-JPush/android/firebase-common-20.3.1.aar new file mode 100644 index 0000000..686c95b Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-common-20.3.1.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-components-17.1.0.aar b/nativeplugins/JG-JPush/android/firebase-components-17.1.0.aar new file mode 100644 index 0000000..2614cbf Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-components-17.1.0.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-datatransport-18.1.7.aar b/nativeplugins/JG-JPush/android/firebase-datatransport-18.1.7.aar new file mode 100644 index 0000000..9cec5f0 Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-datatransport-18.1.7.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-encoders-json-18.0.0.aar b/nativeplugins/JG-JPush/android/firebase-encoders-json-18.0.0.aar new file mode 100644 index 0000000..0f56bd6 Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-encoders-json-18.0.0.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-iid-interop-17.1.0.aar b/nativeplugins/JG-JPush/android/firebase-iid-interop-17.1.0.aar new file mode 100644 index 0000000..87ae9f9 Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-iid-interop-17.1.0.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-installations-17.1.3.aar b/nativeplugins/JG-JPush/android/firebase-installations-17.1.3.aar new file mode 100644 index 0000000..e5b18ca Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-installations-17.1.3.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-installations-interop-17.1.0.aar b/nativeplugins/JG-JPush/android/firebase-installations-interop-17.1.0.aar new file mode 100644 index 0000000..d75eb8d Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-installations-interop-17.1.0.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-measurement-connector-19.0.0.aar b/nativeplugins/JG-JPush/android/firebase-measurement-connector-19.0.0.aar new file mode 100644 index 0000000..f52ffc1 Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-measurement-connector-19.0.0.aar differ diff --git a/nativeplugins/JG-JPush/android/firebase-messaging-23.1.2.aar b/nativeplugins/JG-JPush/android/firebase-messaging-23.1.2.aar new file mode 100644 index 0000000..edfea02 Binary files /dev/null and b/nativeplugins/JG-JPush/android/firebase-messaging-23.1.2.aar differ diff --git a/nativeplugins/JG-JPush/android/hatool-6.9.0.300.aar b/nativeplugins/JG-JPush/android/hatool-6.9.0.300.aar new file mode 100644 index 0000000..f54c658 Binary files /dev/null and b/nativeplugins/JG-JPush/android/hatool-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/libs/MiPush_SDK_Client_5_7_8-C.jar b/nativeplugins/JG-JPush/android/libs/MiPush_SDK_Client_5_7_8-C.jar new file mode 100644 index 0000000..f2d1596 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/MiPush_SDK_Client_5_7_8-C.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/commons-codec-1.6.jar b/nativeplugins/JG-JPush/android/libs/commons-codec-1.6.jar new file mode 100644 index 0000000..ee1bc49 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/commons-codec-1.6.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/error_prone_annotations-2.9.0.jar b/nativeplugins/JG-JPush/android/libs/error_prone_annotations-2.9.0.jar new file mode 100644 index 0000000..4dcc17d Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/error_prone_annotations-2.9.0.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/firebase-annotations-16.2.0.jar b/nativeplugins/JG-JPush/android/libs/firebase-annotations-16.2.0.jar new file mode 100644 index 0000000..2eccdae Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/firebase-annotations-16.2.0.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/firebase-encoders-17.0.0.jar b/nativeplugins/JG-JPush/android/libs/firebase-encoders-17.0.0.jar new file mode 100644 index 0000000..1849ad8 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/firebase-encoders-17.0.0.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/firebase-encoders-proto-16.0.0.jar b/nativeplugins/JG-JPush/android/libs/firebase-encoders-proto-16.0.0.jar new file mode 100644 index 0000000..7a7e32c Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/firebase-encoders-proto-16.0.0.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/javax.inject-1.jar b/nativeplugins/JG-JPush/android/libs/javax.inject-1.jar new file mode 100644 index 0000000..b2a9d0b Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/javax.inject-1.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-5.0.4.jar new file mode 100644 index 0000000..81fd9e1 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-fcm-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-fcm-v5.0.4.jar new file mode 100644 index 0000000..3e20948 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-fcm-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-honor-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-honor-v5.0.4.jar new file mode 100644 index 0000000..5ce7376 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-honor-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-huawei-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-huawei-v5.0.4.jar new file mode 100644 index 0000000..5249b2f Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-huawei-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-meizu-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-meizu-v5.0.4.jar new file mode 100644 index 0000000..f3163c2 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-meizu-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-oppo-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-oppo-v5.0.4.jar new file mode 100644 index 0000000..ca6b330 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-oppo-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-vivo-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-vivo-v5.0.4.jar new file mode 100644 index 0000000..6957388 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-vivo-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-xiaomi-v5.0.4.jar b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-xiaomi-v5.0.4.jar new file mode 100644 index 0000000..699cd46 Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/jpush-android-plugin-xiaomi-v5.0.4.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/meizu-push-4.2.3.jar b/nativeplugins/JG-JPush/android/libs/meizu-push-4.2.3.jar new file mode 100644 index 0000000..e3fae1a Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/meizu-push-4.2.3.jar differ diff --git a/nativeplugins/JG-JPush/android/libs/tasks-1.5.2.206.jar b/nativeplugins/JG-JPush/android/libs/tasks-1.5.2.206.jar new file mode 100644 index 0000000..a9d88fa Binary files /dev/null and b/nativeplugins/JG-JPush/android/libs/tasks-1.5.2.206.jar differ diff --git a/nativeplugins/JG-JPush/android/log-6.9.0.300.aar b/nativeplugins/JG-JPush/android/log-6.9.0.300.aar new file mode 100644 index 0000000..9ef6645 Binary files /dev/null and b/nativeplugins/JG-JPush/android/log-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/network-common-6.0.2.300.aar b/nativeplugins/JG-JPush/android/network-common-6.0.2.300.aar new file mode 100644 index 0000000..d014894 Binary files /dev/null and b/nativeplugins/JG-JPush/android/network-common-6.0.2.300.aar differ diff --git a/nativeplugins/JG-JPush/android/network-framework-compat-6.0.2.300.aar b/nativeplugins/JG-JPush/android/network-framework-compat-6.0.2.300.aar new file mode 100644 index 0000000..5f43c2d Binary files /dev/null and b/nativeplugins/JG-JPush/android/network-framework-compat-6.0.2.300.aar differ diff --git a/nativeplugins/JG-JPush/android/network-grs-6.0.2.300.aar b/nativeplugins/JG-JPush/android/network-grs-6.0.2.300.aar new file mode 100644 index 0000000..b986aaf Binary files /dev/null and b/nativeplugins/JG-JPush/android/network-grs-6.0.2.300.aar differ diff --git a/nativeplugins/JG-JPush/android/opendevice-6.11.0.300.aar b/nativeplugins/JG-JPush/android/opendevice-6.11.0.300.aar new file mode 100644 index 0000000..e03d158 Binary files /dev/null and b/nativeplugins/JG-JPush/android/opendevice-6.11.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/play-services-base-18.0.1.aar b/nativeplugins/JG-JPush/android/play-services-base-18.0.1.aar new file mode 100644 index 0000000..e20a3b8 Binary files /dev/null and b/nativeplugins/JG-JPush/android/play-services-base-18.0.1.aar differ diff --git a/nativeplugins/JG-JPush/android/play-services-basement-18.1.0.aar b/nativeplugins/JG-JPush/android/play-services-basement-18.1.0.aar new file mode 100644 index 0000000..03811c0 Binary files /dev/null and b/nativeplugins/JG-JPush/android/play-services-basement-18.1.0.aar differ diff --git a/nativeplugins/JG-JPush/android/play-services-cloud-messaging-17.0.1.aar b/nativeplugins/JG-JPush/android/play-services-cloud-messaging-17.0.1.aar new file mode 100644 index 0000000..1a3adc8 Binary files /dev/null and b/nativeplugins/JG-JPush/android/play-services-cloud-messaging-17.0.1.aar differ diff --git a/nativeplugins/JG-JPush/android/play-services-stats-17.0.2.aar b/nativeplugins/JG-JPush/android/play-services-stats-17.0.2.aar new file mode 100644 index 0000000..0f542d3 Binary files /dev/null and b/nativeplugins/JG-JPush/android/play-services-stats-17.0.2.aar differ diff --git a/nativeplugins/JG-JPush/android/play-services-tasks-18.0.2.aar b/nativeplugins/JG-JPush/android/play-services-tasks-18.0.2.aar new file mode 100644 index 0000000..a334eeb Binary files /dev/null and b/nativeplugins/JG-JPush/android/play-services-tasks-18.0.2.aar differ diff --git a/nativeplugins/JG-JPush/android/push-6.11.0.300.aar b/nativeplugins/JG-JPush/android/push-6.11.0.300.aar new file mode 100644 index 0000000..03fd5af Binary files /dev/null and b/nativeplugins/JG-JPush/android/push-6.11.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/push_sdk_v3.0.0.4_484.aar b/nativeplugins/JG-JPush/android/push_sdk_v3.0.0.4_484.aar new file mode 100644 index 0000000..f278999 Binary files /dev/null and b/nativeplugins/JG-JPush/android/push_sdk_v3.0.0.4_484.aar differ diff --git a/nativeplugins/JG-JPush/android/security-base-1.2.0.307.aar b/nativeplugins/JG-JPush/android/security-base-1.2.0.307.aar new file mode 100644 index 0000000..86d39b4 Binary files /dev/null and b/nativeplugins/JG-JPush/android/security-base-1.2.0.307.aar differ diff --git a/nativeplugins/JG-JPush/android/security-encrypt-1.2.0.307.aar b/nativeplugins/JG-JPush/android/security-encrypt-1.2.0.307.aar new file mode 100644 index 0000000..74c5070 Binary files /dev/null and b/nativeplugins/JG-JPush/android/security-encrypt-1.2.0.307.aar differ diff --git a/nativeplugins/JG-JPush/android/security-ssl-1.2.0.307.aar b/nativeplugins/JG-JPush/android/security-ssl-1.2.0.307.aar new file mode 100644 index 0000000..329311a Binary files /dev/null and b/nativeplugins/JG-JPush/android/security-ssl-1.2.0.307.aar differ diff --git a/nativeplugins/JG-JPush/android/stats-6.9.0.300.aar b/nativeplugins/JG-JPush/android/stats-6.9.0.300.aar new file mode 100644 index 0000000..82a1998 Binary files /dev/null and b/nativeplugins/JG-JPush/android/stats-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/transport-api-3.0.0.aar b/nativeplugins/JG-JPush/android/transport-api-3.0.0.aar new file mode 100644 index 0000000..ac1340f Binary files /dev/null and b/nativeplugins/JG-JPush/android/transport-api-3.0.0.aar differ diff --git a/nativeplugins/JG-JPush/android/transport-backend-cct-3.1.8.aar b/nativeplugins/JG-JPush/android/transport-backend-cct-3.1.8.aar new file mode 100644 index 0000000..258b3ce Binary files /dev/null and b/nativeplugins/JG-JPush/android/transport-backend-cct-3.1.8.aar differ diff --git a/nativeplugins/JG-JPush/android/transport-runtime-3.1.8.aar b/nativeplugins/JG-JPush/android/transport-runtime-3.1.8.aar new file mode 100644 index 0000000..2d7850d Binary files /dev/null and b/nativeplugins/JG-JPush/android/transport-runtime-3.1.8.aar differ diff --git a/nativeplugins/JG-JPush/android/ui-6.9.0.300.aar b/nativeplugins/JG-JPush/android/ui-6.9.0.300.aar new file mode 100644 index 0000000..78b491b Binary files /dev/null and b/nativeplugins/JG-JPush/android/ui-6.9.0.300.aar differ diff --git a/nativeplugins/JG-JPush/android/uniplugin_jpush-release.aar b/nativeplugins/JG-JPush/android/uniplugin_jpush-release.aar new file mode 100644 index 0000000..3636889 Binary files /dev/null and b/nativeplugins/JG-JPush/android/uniplugin_jpush-release.aar differ diff --git a/nativeplugins/JG-JPush/ios/JPUSHService.h b/nativeplugins/JG-JPush/ios/JPUSHService.h new file mode 100644 index 0000000..5f01bb0 --- /dev/null +++ b/nativeplugins/JG-JPush/ios/JPUSHService.h @@ -0,0 +1,939 @@ +/* + * | | | | \ \ / / | | | | / _______| + * | |____| | \ \/ / | |____| | / / + * | |____| | \ / | |____| | | | _____ + * | | | | / \ | | | | | | |____ | + * | | | | / /\ \ | | | | \ \______| | + * | | | | /_/ \_\ | | | | \_________| + * + * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved. + */ + +#define JPUSH_VERSION_NUMBER 5.0.0 + +#import + +@class CLRegion; +@class UILocalNotification; +@class CLLocation; +@class UNNotificationCategory; +@class UNNotificationSettings; +@class UNNotificationRequest; +@class UNNotification; +@class UIView; +@protocol JPUSHRegisterDelegate; +@protocol JPUSHGeofenceDelegate; +@protocol JPUSHNotiInMessageDelegate; +@protocol JPUSHInAppMessageDelegate; + +typedef void (^JPUSHTagsOperationCompletion)(NSInteger iResCode, NSSet *iTags, NSInteger seq); +typedef void (^JPUSHTagValidOperationCompletion)(NSInteger iResCode, NSSet *iTags, NSInteger seq, BOOL isBind); +typedef void (^JPUSHAliasOperationCompletion)(NSInteger iResCode, NSString *iAlias, NSInteger seq); +typedef void (^JPUSHPropertiesOperationCompletion)(NSInteger iResCode, NSDictionary *properties, NSInteger seq); +typedef void (^JPUSHLiveActivityTokenCompletion)(NSInteger iResCode, NSString *iLiveActivityId, NSData *pushToken, NSInteger seq); + +extern NSString *const kJPFNetworkIsConnectingNotification; // 正在连接中 +extern NSString *const kJPFNetworkDidSetupNotification; // 建立连接 +extern NSString *const kJPFNetworkDidCloseNotification; // 关闭连接 +extern NSString *const kJPFNetworkDidRegisterNotification; // 注册成功 +extern NSString *const kJPFNetworkFailedRegisterNotification; //注册失败 +extern NSString *const kJPFNetworkDidLoginNotification; // 登录成功 +extern NSString *const kJPFNetworkDidReceiveMessageNotification; // 收到消息(非APNS) +extern NSString *const kJPFServiceErrorNotification; // 错误提示 + +typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { + JPAuthorizationOptionNone = 0, // the application may not present any UI upon a notification being received + JPAuthorizationOptionBadge = (1 << 0), // the application may badge its icon upon a notification being received + JPAuthorizationOptionSound = (1 << 1), // the application may play a sound upon a notification being received + JPAuthorizationOptionAlert = (1 << 2), // the application may display an alert upon a notification being received + JPAuthorizationOptionCarPlay = (1 << 3), // The ability to display notifications in a CarPlay environment. + JPAuthorizationOptionCriticalAlert NS_AVAILABLE_IOS(12.0) = (1 << 4) , //The ability to play sounds for critical alerts. + JPAuthorizationOptionProvidesAppNotificationSettings NS_AVAILABLE_IOS(12.0) = (1 << 5) , //An option indicating the system should display a button for in-app notification settings. + JPAuthorizationOptionProvisional NS_AVAILABLE_IOS(12.0) = (1 << 6) , //The ability to post noninterrupting notifications provisionally to the Notification Center. + JPAuthorizationOptionAnnouncement NS_AVAILABLE_IOS(13.0) = (1 << 7) , //The ability for Siri to automatically read out messages over AirPods. +}; + +typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) { + JPAuthorizationNotDetermined = 0, // The user has not yet made a choice regarding whether the application may post user notifications. + JPAuthorizationStatusDenied, // The application is not authorized to post user notifications. + JPAuthorizationStatusAuthorized, // The application is authorized to post user notifications. + JPAuthorizationStatusProvisional NS_AVAILABLE_IOS(12.0), // The application is authorized to post non-interruptive user notifications. +}; + +/*! + * 通知注册实体类 + */ +@interface JPUSHRegisterEntity : NSObject + +/*! + * 支持的类型 + * badge,sound,alert + */ +@property (nonatomic, assign) NSInteger types; +/*! + * 注入的类别 + * iOS10 UNNotificationCategory + * iOS8-iOS9 UIUserNotificationCategory + */ +@property (nonatomic, strong) NSSet *categories; +@end + +/*! + * 进行删除、查找推送实体类 + */ +@interface JPushNotificationIdentifier : NSObject + +@property (nonatomic, copy) NSArray *identifiers; // 推送的标识数组 +@property (nonatomic, copy) UILocalNotification *notificationObj NS_DEPRECATED_IOS(4_0, 10_0); // iOS10以下可以传UILocalNotification对象数据，iOS10以上无效 +@property (nonatomic, assign) BOOL delivered NS_AVAILABLE_IOS(10_0); // 在通知中心显示的或待推送的标志，默认为NO，YES表示在通知中心显示的，NO表示待推送的 +@property (nonatomic, copy) void (^findCompletionHandler)(NSArray *results); // 用于查询回调，调用[findNotification:]方法前必须设置，results为返回相应对象数组，iOS10以下返回UILocalNotification对象数组；iOS10以上根据delivered传入值返回UNNotification或UNNotificationRequest对象数组（delivered传入YES，则返回UNNotification对象数组，否则返回UNNotificationRequest对象数组） + +@end + +/*! + * 推送通知声音实体类 + * iOS10以上有效 + */ +@interface JPushNotificationSound : NSObject +@property (nonatomic, copy) NSString *soundName; //普通通知铃声 +@property (nonatomic, copy) NSString *criticalSoundName NS_AVAILABLE_IOS(12.0); //警告通知铃声 +@property (nonatomic, assign) float criticalSoundVolume NS_AVAILABLE_IOS(12.0); //警告通知铃声音量，有效值在0~1之间，默认为1 +@end + + +/*! + * 推送内容实体类 + */ +@interface JPushNotificationContent : NSObject + +@property (nonatomic, copy) NSString *title; // 推送标题 +@property (nonatomic, copy) NSString *subtitle; // 推送副标题 +@property (nonatomic, copy) NSString *body; // 推送内容 +@property (nonatomic, copy) NSNumber *badge; // 角标的数字。如果不需要改变角标传@(-1) +@property (nonatomic, copy) NSString *action NS_DEPRECATED_IOS(8_0, 10_0); // 弹框的按钮显示的内容（IOS 8默认为"打开", 其他默认为"启动",iOS10以上无效） +@property (nonatomic, copy) NSString *categoryIdentifier; // 行为分类标识 +@property (nonatomic, copy) NSDictionary *userInfo; // 本地推送时可以设置userInfo来增加附加信息，远程推送时设置的payload推送内容作为此userInfo +@property (nonatomic, copy) NSString *sound; // 声音名称，不设置则为默认声音 +@property (nonatomic, copy) JPushNotificationSound *soundSetting NS_AVAILABLE_IOS(10.0); //推送声音实体 +@property (nonatomic, copy) NSArray *attachments NS_AVAILABLE_IOS(10_0); // 附件，iOS10以上有效，需要传入UNNotificationAttachment对象数组类型 +@property (nonatomic, copy) NSString *threadIdentifier NS_AVAILABLE_IOS(10_0); // 线程或与推送请求相关对话的标识，iOS10以上有效，可用来对推送进行分组 +@property (nonatomic, copy) NSString *launchImageName NS_AVAILABLE_IOS(10_0); // 启动图片名，iOS10以上有效，从推送启动时将会用到 +@property (nonatomic, copy) NSString *summaryArgument NS_AVAILABLE_IOS(12.0); //插入到通知摘要中的部分参数。iOS12以上有效。 +@property (nonatomic, assign) NSUInteger summaryArgumentCount NS_AVAILABLE_IOS(12.0); //插入到通知摘要中的项目数。iOS12以上有效。 +@property (nonatomic, copy) NSString *targetContentIdentifier NS_AVAILABLE_IOS(13.0); // An identifier for the content of the notification used by the system to customize the scene to be activated when tapping on a notification. +//iOS15以上的新增属性 interruptionLevel为枚举UNNotificationInterruptionLevel +// The interruption level determines the degree of interruption associated with the notification +@property (nonatomic, assign) NSUInteger interruptionLevel NS_AVAILABLE_IOS(15.0); +// Relevance score determines the sorting for the notification across app notifications. The expected range is between 0.0f and 1.0f. +@property (nonatomic, assign) double relevanceScore NS_AVAILABLE_IOS(15.0); +// iOS16以上的新增属性 +@property (nonatomic, copy) NSString *filterCriteria NS_AVAILABLE_IOS(16.0); // default nil + +@end + + +/*! + * 推送触发方式实体类 + * 注：dateComponents、timeInterval、region在iOS10以上可选择其中一个参数传入有效值，如果同时传入值会根据优先级I、II、III使其中一种触发方式生效，fireDate为iOS10以下根据时间触发时须传入的参数 + */ +@interface JPushNotificationTrigger : NSObject + +@property (nonatomic, assign) BOOL repeat; // 设置是否重复，默认为NO +@property (nonatomic, copy) NSDate *fireDate NS_DEPRECATED_IOS(2_0, 10_0); // 用来设置触发推送的时间，iOS10以上无效 +@property (nonatomic, copy) CLRegion *region NS_AVAILABLE_IOS(8_0); // 用来设置触发推送的位置，iOS8以上有效，iOS10以上优先级为I，应用需要有允许使用定位的授权 +@property (nonatomic, copy) NSDateComponents *dateComponents NS_AVAILABLE_IOS(10_0); // 用来设置触发推送的日期时间，iOS10以上有效，优先级为II +@property (nonatomic, assign) NSTimeInterval timeInterval NS_AVAILABLE_IOS(10_0); // 用来设置触发推送的时间，iOS10以上有效，优先级为III + +@end + +/*! + * 注册或更新推送实体类 + */ +@interface JPushNotificationRequest : NSObject + +@property (nonatomic, copy) NSString *requestIdentifier; // 推送请求标识 +@property (nonatomic, copy) JPushNotificationContent *content; // 设置推送的具体内容 +@property (nonatomic, copy) JPushNotificationTrigger *trigger; // 设置推送的触发方式 +@property (nonatomic, copy) void (^completionHandler)(id result); // 注册或更新推送成功回调，iOS10以上成功则result为UNNotificationRequest对象，失败则result为nil;iOS10以下成功result为UILocalNotification对象，失败则result为nil + +@end + + +/*! + * 应用内消息内容实体 + */ +@interface JPushInAppMessage : NSObject + +@property (nonatomic, copy) NSString *mesageId; // 消息id +@property (nonatomic, copy) NSString *title; // 标题 +@property (nonatomic, copy) NSString *content; // 内容 +@property (nonatomic, strong) NSArray *target; // 目标页面 +@property (nonatomic, copy) NSString *clickAction; // 跳转地址 +@property (nonatomic, strong) NSDictionary *extras; // 附加字段 + +@end + +/*! + * JPush 核心头文件 + */ +@interface JPUSHService : NSObject + + +///---------------------------------------------------- +/// @name Setup 启动相关 +///---------------------------------------------------- + + +/*! + * @abstract 启动SDK + * + * @param launchingOption 启动参数. + * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识. + * @param channel 发布渠道. 可选. + * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES. + * App 证书环境取决于profile provision的配置，此处建议与证书环境保持一致. + * + * @discussion 提供SDK启动必须的参数, 来启动 SDK. + * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作. + */ ++ (void)setupWithOption:(NSDictionary *)launchingOption + appKey:(NSString *)appKey + channel:(NSString *)channel + apsForProduction:(BOOL)isProduction; + +/*! + * @abstract 启动SDK + * + * @param launchingOption 启动参数. + * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识. + * @param channel 发布渠道. 可选. + * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES. + * App 证书环境取决于profile provision的配置，此处建议与证书环境保持一致. + * @param advertisingId 广告标识符（IDFA） 如果不需要使用IDFA，传nil. + * + * @discussion 提供SDK启动必须的参数, 来启动 SDK. + * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作. + */ ++ (void)setupWithOption:(NSDictionary *)launchingOption + appKey:(NSString *)appKey + channel:(NSString *)channel + apsForProduction:(BOOL)isProduction + advertisingIdentifier:(NSString *)advertisingId; + + +///---------------------------------------------------- +/// @name APNs about 通知相关 +///---------------------------------------------------- + +/*! + * @abstract 注册要处理的远程通知类型 + * + * @param types 通知类型 + * @param categories 类别组 + * + */ ++ (void)registerForRemoteNotificationTypes:(NSUInteger)types + categories:(NSSet *)categories; +/*! + * @abstract 新版本的注册方法（兼容iOS10） + * + * @param config 注册通知配置 + * @param delegate 代理 + * + */ ++ (void)registerForRemoteNotificationConfig:(JPUSHRegisterEntity *)config delegate:(id)delegate; + + ++ (void)registerDeviceToken:(NSData *)deviceToken; + +/*! + * @abstract 注册liveActivity并上报其pushToken + * 在pushToken有变化的时候同步调用该接口。 + * 在liveActivity结束的时候，请同步调用该接口，pushToken传nil + * + * @param liveActivityId 标识某一个liveActivity + * @param pushToken 对应该liveActivity的pushToken，如有更新，请及时调用该方法更新pushToken + * @param completion 响应回调 + * @param seq 请求序列号 + */ ++ (void)registerLiveActivity:(NSString *)liveActivityId + pushToken:(NSData * _Nullable)pushToken + completion:(JPUSHLiveActivityTokenCompletion _Nullable )completion + seq:(NSInteger)seq; + +/*! + * @abstract 处理收到的 APNs 消息 + */ ++ (void)handleRemoteNotification:(NSDictionary *)remoteInfo; + +/*! + * @abstract 向极光服务器提交Token + * + * @param voipToken 推送使用的Voip Token + */ ++ (void)registerVoipToken:(NSData *)voipToken; + + +/*! + * @abstract 处理收到的 Voip 消息 + * + * @param remoteInfo 下发的 Voip 内容 + */ ++ (void)handleVoipNotification:(NSDictionary *)remoteInfo; + + +/*! +* @abstract 检测通知授权状态 +* @param completion 授权结果通过status值返回，详见JPAuthorizationStatus +*/ ++ (void)requestNotificationAuthorization:(void (^)(JPAuthorizationStatus status))completion; + +/*! +* @abstract 跳转至系统设置页面，iOS8及以上有效 +*/ ++ (void)openSettingsForNotification:(void (^)(BOOL success))completionHandler NS_AVAILABLE_IOS(8_0); + +/*! + * Tags操作接口 + * 支持增加/覆盖/删除/清空/查询操作 + * 详情请参考文档：https://docs.jiguang.cn/jpush/client/iOS/ios_api/） + */ + +/** + 增加tags + + @param tags 需要增加的tags集合 + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)addTags:(NSSet *)tags + completion:(JPUSHTagsOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 覆盖tags + 调用该接口会覆盖用户所有的tags + + @param tags 需要设置的tags集合 + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)setTags:(NSSet *)tags + completion:(JPUSHTagsOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 删除指定tags + + @param tags 需要删除的tags集合 + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)deleteTags:(NSSet *)tags + completion:(JPUSHTagsOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 清空所有tags + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)cleanTags:(JPUSHTagsOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 查询全部tags + + @param completion 响应回调，请在回调中获取查询结果 + @param seq 请求序列号 + */ ++ (void)getAllTags:(JPUSHTagsOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 验证tag是否绑定 + + @param completion 响应回调，回调中查看是否绑定 + @param seq 请求序列号 + */ ++ (void)validTag:(NSString *)tag + completion:(JPUSHTagValidOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 设置Alias + + @param alias 需要设置的alias + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)setAlias:(NSString *)alias + completion:(JPUSHAliasOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 删除alias + + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)deleteAlias:(JPUSHAliasOperationCompletion)completion + seq:(NSInteger)seq; + +/** + 查询当前alias + + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)getAlias:(JPUSHAliasOperationCompletion)completion + seq:(NSInteger)seq; + + +/*! + * @abstract 过滤掉无效的 tags + * + * @discussion 如果 tags 数量超过限制数量, 则返回靠前的有效的 tags. + * 建议设置 tags 前用此接口校验. SDK 内部也会基于此接口来做过滤. + */ ++ (NSSet *)filterValidTags:(NSSet *)tags; + + +/*! + * Property操作接口 + * 支持增加/删除/清空操作 + * 详情请参考文档：https://docs.jiguang.cn/jpush/client/iOS/ios_api/） + */ + +/** + 新增/更新用户属性 + + 如果某个用户属性之前已经存在了，则会更新；不存在，则会新增 + + @param properties 需要新增或者更新的的用户属性内容，类型为NSDictionary； + Key 为用户属性名称，类型必须是 NSString 类型；Value为用户属性值，只支持 NSString、NSNumber、NSDate类型，如果属性为BOOL类型，传值时请转成NSNumber类型 + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)setProperties:(NSDictionary *)properties + completion:(JPUSHPropertiesOperationCompletion)completion + seq:(NSInteger)seq; + + +/** + 删除指定属性 + + @param keys 需要删除的属性名称集合 + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)deleteProperties:(NSSet *)keys + completion:(JPUSHPropertiesOperationCompletion)completion + seq:(NSInteger)seq; + + +/** + 清空所有属性 + @param completion 响应回调 + @param seq 请求序列号 + */ ++ (void)cleanProperties:(JPUSHPropertiesOperationCompletion)completion + seq:(NSInteger)seq; + + +/*! + * 应用内消息接口 + * 使用应用内消息需要配置以下两个接口。请在进入页面和离开页面的时候相应地配置。以下两个接口请配套调用。 + */ + +/** + 进入页面 + + 请与 + (void)pageLeave:(NSString *)pageName; 方法配套使用 + + @param pageName 页面名 + @discussion 使用应用内消息功能，需要配置pageEnterTo:和pageLeave:函数。 + */ ++ (void)pageEnterTo:(NSString *)pageName; + + +/** + 离开页面 + + 请与 + (void)pageEnterTo:(NSString *)pageName;方法配套使用 + + @param pageName 页面名 + @discussion 使用应用内消息功能，需要配置pageEnterTo:和pageLeave:函数。 + */ ++ (void)pageLeave:(NSString *)pageName; + + +/*! +* @abstract 设置应用内消息的代理 +* +* @discussion 遵守JPUSHInAppMessageDelegate的代理对象 +* +*/ ++ (void)setInAppMessageDelegate:(id)inAppMessageDelegate; + + +///---------------------------------------------------- +/// @name Stats 统计功能 +///---------------------------------------------------- + +/*! + * @abstract 开始记录页面停留 + * + * @param pageName 页面名称 + * @discussion JCore 1.1.8 版本后，如需统计页面流，请使用 JAnalytics + */ ++ (void)startLogPageView:(NSString *)pageName __attribute__((deprecated("JCore 1.1.8 版本已过期"))); + +/*! + * @abstract 停止记录页面停留 + * + * @param pageName 页面 + * @discussion JCore 1.1.8 版本后，如需统计页面流，请使用 JAnalytics + */ ++ (void)stopLogPageView:(NSString *)pageName __attribute__((deprecated("JCore 1.1.8 版本已过期"))); + +/*! + * @abstract 直接上报在页面的停留时间 + * + * @param pageName 页面 + * @param seconds 停留的秒数 + * @discussion JCore 1.1.8 版本后，如需统计页面流，请使用 JAnalytics + */ ++ (void)beginLogPageView:(NSString *)pageName duration:(int)seconds __attribute__((deprecated("JCore 1.1.8 版本已过期"))); + +/*! + * @abstract 开启Crash日志收集 + * + * @discussion 默认是关闭状态. + */ ++ (void)crashLogON; + +/*! + * @abstract 地理位置上报 + * + * @param latitude 纬度. + * @param longitude 经度. + * + */ ++ (void)setLatitude:(double)latitude longitude:(double)longitude; + +/*! + * @abstract 地理位置上报 + * + * @param location 直接传递 CLLocation * 型的地理信息 + * + * @discussion 需要链接 CoreLocation.framework 并且 #import + */ ++ (void)setLocation:(CLLocation *)location; + +/** + 设置地理围栏的最大个数 + 默认值为 10 ，iOS系统默认地理围栏最大个数为20 + @param count 个数 count + */ ++ (void)setGeofeneceMaxCount:(NSInteger)count; + +/** + 设置地理围栏'圈内'类型的检测周期 + 默认15分钟检测一次 + */ ++ (void)setGeofenecePeriodForInside:(NSInteger)seconds; + +/** + 注册地理围栏的代理 + + @param delegate 代理 + @param launchOptions app启动完成是收到的字段参数 + */ ++ (void)registerLbsGeofenceDelegate:(id)delegate withLaunchOptions:(NSDictionary *)launchOptions; + +/** + 删除地理围栏 + + @param geofenceId 地理围栏id + */ ++ (void)removeGeofenceWithIdentifier:(NSString *)geofenceId; + +///---------------------------------------------------- +/// @name Local Notification 本地通知 +///---------------------------------------------------- +/*! + * @abstract 注册或更新推送 (支持iOS10，并兼容iOS10以下版本) + * + * JPush 2.1.9新接口 + * @param request JPushNotificationRequest类型，设置推送的属性，设置已有推送的request.requestIdentifier即更新已有的推送，否则为注册新推送，更新推送仅仅在iOS10以上有效，结果通过request.completionHandler返回 + * @discussion 旧的注册本地推送接口被废弃，使用此接口可以替换 + * + */ ++ (void)addNotification:(JPushNotificationRequest *)request; + +/*! + * @abstract 移除推送 (支持iOS10，并兼容iOS10以下版本) + * + * JPush 2.1.9新接口 + * @param identifier JPushNotificationIdentifier类型，iOS10以上identifier设置为nil，则移除所有在通知中心显示推送和待推送请求，也可以通过设置identifier.delivered和identifier.identifiers来移除相应在通知中心显示推送或待推送请求，identifier.identifiers如果设置为nil或空数组则移除相应标志下所有在通知中心显示推送或待推送请求；iOS10以下identifier设置为nil，则移除所有推送，identifier.delivered属性无效，另外可以通过identifier.notificationObj传入特定推送对象来移除此推送。 + * @discussion 旧的所有删除推送接口被废弃，使用此接口可以替换 + * + */ ++ (void)removeNotification:(JPushNotificationIdentifier *)identifier; + +/*! + * @abstract 查找推送 (支持iOS10，并兼容iOS10以下版本) + * + * JPush 2.1.9新接口 + * @param identifier JPushNotificationIdentifier类型，iOS10以上可以通过设置identifier.delivered和identifier.identifiers来查找相应在通知中心显示推送或待推送请求，identifier.identifiers如果设置为nil或空数组则返回相应标志下所有在通知中心显示推送或待推送请求；iOS10以下identifier.delivered属性无效，identifier.identifiers如果设置nil或空数组则返回所有未触发的推送。须要设置identifier.findCompletionHandler回调才能得到查找结果，通过(NSArray *results)返回相应对象数组。 + * @discussion 旧的查找推送接口被废弃，使用此接口可以替换 + * + */ ++ (void)findNotification:(JPushNotificationIdentifier *)identifier; + +/*! + * @abstract 本地推送，最多支持64个 + * + * @param fireDate 本地推送触发的时间 + * @param alertBody 本地推送需要显示的内容 + * @param badge 角标的数字。如果不需要改变角标传-1 + * @param alertAction 弹框的按钮显示的内容（IOS 8默认为"打开", 其他默认为"启动"） + * @param notificationKey 本地推送标示符 + * @param userInfo 自定义参数，可以用来标识推送和增加附加信息 + * @param soundName 自定义通知声音，设置为nil为默认声音 + * + * @discussion 最多支持 64 个定义，此方法被[addNotification:]方法取代 + */ ++ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate + alertBody:(NSString *)alertBody + badge:(int)badge + alertAction:(NSString *)alertAction + identifierKey:(NSString *)notificationKey + userInfo:(NSDictionary *)userInfo + soundName:(NSString *)soundName __attribute__((deprecated("JPush 2.1.9 版本已过期"))); + +/*! + * @abstract 本地推送 (支持 iOS8 新参数) + * + * IOS8新参数 + * @param region 自定义参数 + * @param regionTriggersOnce 自定义参数 + * @param category 自定义参数 + * @discussion 此方法被[addNotification:]方法取代 + */ ++ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate + alertBody:(NSString *)alertBody + badge:(int)badge + alertAction:(NSString *)alertAction + identifierKey:(NSString *)notificationKey + userInfo:(NSDictionary *)userInfo + soundName:(NSString *)soundName + region:(CLRegion *)region + regionTriggersOnce:(BOOL)regionTriggersOnce + category:(NSString *)category NS_AVAILABLE_IOS(8_0) __attribute__((deprecated("JPush 2.1.9 版本已过期"))); + +/*! + * @abstract 前台展示本地推送 + * + * @param notification 本地推送对象 + * @param notificationKey 需要前台显示的本地推送通知的标示符 + * + * @discussion 默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。--iOS10以下还可继续使用，iOS10以上在[UNUserNotificationCenterDelegate willPresentNotification:withCompletionHandler:]方法中调用completionHandler(UNNotificationPresentationOptionSound | UNNotificationPresentationOptionAlert);即可 + */ ++ (void)showLocalNotificationAtFront:(UILocalNotification *)notification + identifierKey:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期"))); +/*! + * @abstract 删除本地推送定义 + * + * @param notificationKey 本地推送标示符 + * @discussion 此方法被[removeNotification:]方法取代 + */ ++ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期"))); + +/*! + * @abstract 删除本地推送定义 + * @discussion 此方法被[removeNotification:]方法取代 + */ ++ (void)deleteLocalNotification:(UILocalNotification *)localNotification __attribute__((deprecated("JPush 2.1.9 版本已过期"))); + +/*! + * @abstract 获取指定通知 + * + * @param notificationKey 本地推送标示符 + * @return 本地推送对象数组, [array count]为0时表示没找到 + * @discussion 此方法被[findNotification:]方法取代 + */ ++ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey __attribute__((deprecated("JPush 2.1.9 版本已过期"))); + +/*! + * @abstract 清除所有本地推送对象 + * @discussion 此方法被[removeNotification:]方法取代 + */ ++ (void)clearAllLocalNotifications __attribute__((deprecated("JPush 2.1.9 版本已过期"))); + + +///---------------------------------------------------- +/// @name Server badge 服务器端 badge 功能 +///---------------------------------------------------- + +/*! + * @abstract 设置角标(到服务器) + * + * @param value 新的值. 会覆盖服务器上保存的值(这个用户) + * + * @discussion 本接口不会改变应用本地的角标值. + * 本地仍须调用 UIApplication:setApplicationIconBadgeNumber 函数来设置脚标. + * + * 本接口用于配合 JPush 提供的服务器端角标功能. + * 该功能解决的问题是, 服务器端推送 APNs 时, 并不知道客户端原来已经存在的角标是多少, 指定一个固定的数字不太合理. + * + * JPush 服务器端脚标功能提供: + * + * - 通过本 API 把当前客户端(当前这个用户的) 的实际 badge 设置到服务器端保存起来; + * - 调用服务器端 API 发 APNs 时(通常这个调用是批量针对大量用户), + * 使用 "+1" 的语义, 来表达需要基于目标用户实际的 badge 值(保存的) +1 来下发通知时带上新的 badge 值; + */ ++ (BOOL)setBadge:(NSInteger)value; + +/*! + * @abstract 重置脚标(为0) + * + * @discussion 相当于 [setBadge:0] 的效果. + * 参考 [JPUSHService setBadge:] 说明来理解其作用. + */ ++ (void)resetBadge; + +///---------------------------------------------------- +/// @name Other Feature 其他功能 +///---------------------------------------------------- + +/*! + * @abstract 设置手机号码(到服务器) + * + * @param mobileNumber 手机号码. 会与用户信息一一对应。可为空，为空则清除号码 + * @param completion 响应回调。成功则error为空，失败则error带有错误码及错误信息 + * + * @discussion 设置手机号码后，可实现“推送不到短信到”的通知方式，提高推送达到率。结果信息通过completion异步返回，也可将completion设置为nil不处理结果信息。 + * + */ ++ (void)setMobileNumber:(NSString *)mobileNumber completion:(void (^)(NSError *error))completion; + +///---------------------------------------------------- +/// @name Logs and others 日志与其他 +///---------------------------------------------------- + +/*! + * @abstract JPush标识此设备的 registrationID + * + * @discussion SDK注册成功后, 调用此接口获取到 registrationID 才能够获取到. + * + * JPush 支持根据 registrationID 来进行推送. + * 如果你需要此功能, 应该通过此接口获取到 registrationID 后, 上报到你自己的服务器端, 并保存下来. + * registrationIDCompletionHandler:是新增的获取registrationID的方法，需要在block中获取registrationID,resCode为返回码,模拟器调用此接口resCode返回1011,registrationID返回nil. + * 更多的理解请参考 JPush 的文档网站. + */ ++ (NSString *)registrationID; + ++ (void)registrationIDCompletionHandler:(void(^)(int resCode,NSString *registrationID))completionHandler; + +/*! + * @abstract 打开日志级别到 Debug + * + * @discussion JMessage iOS 的日志系统参考 Android 设计了级别. + * 从低到高是: Verbose, Debug, Info, Warning, Error. + * 对日志级别的进一步理解, 请参考 Android 相关的说明. + * + * SDK 默认开启的日志级别为: Info. 只显示必要的信息, 不打印调试日志. + * + * 请在SDK启动后调用本接口，调用本接口可打开日志级别为: Debug, 打印调试日志. + */ ++ (void)setDebugMode; + +/*! + * @abstract 关闭日志 + * + * @discussion 关于日志级别的说明, 参考 [JPUSHService setDebugMode] + * + * 虽说是关闭日志, 但还是会打印 Warning, Error 日志. 这二种日志级别, 在程序运行正常时, 不应有打印输出. + * + * 建议在发布的版本里, 调用此接口, 关闭掉日志打印. + */ ++ (void)setLogOFF; + +/*! + * @abstract 设置SDK地理位置权限开关 + * + * @discussion 关闭地理位置之后，SDK地理围栏的相关功能将受到影响，默认是开启。 + * + */ ++ (void)setLocationEanable:(BOOL)isEanble; + +/*! + * @abstract 设置PUSH开关 + * + * @discussion 关闭PUSH之后，将接收不到极光通知推送、自定义消息推送、liveActivity消息推送，默认是开启。 + * + */ ++ (void)setPushEnable:(BOOL)isEnable completion:(void (^)(NSInteger iResCode))completion; + + +/*! +* @abstract 设置应用内提醒消息的代理 +* +* @discussion 遵守JPushNotiInMessageDelegate的代理对象 +* +*/ ++ (void)setNotiInMessageDelegate:(id)notiInMessageDelegate; + + + +///---------------------------------------------------- +///********************下列方法已过期******************** +///**************请使用新版tag/alias操作接口************** +///---------------------------------------------------- +/// @name Tag alias setting 设置别名与标签 +///---------------------------------------------------- + +/*! + * 下面的接口是可选的 + * 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：https://docs.jiguang.cn/jpush/client/iOS/ios_api/） + * setTags:alias:fetchCompletionHandle:是新的设置标签别名的方法，不再需要显示声明回调函数，只需要在block里面处理设置结果即可. + * WARN: 使用block时需要注意循环引用问题 + */ ++ (void) setTags:(NSSet *)tags + alias:(NSString *)alias +callbackSelector:(SEL)cbSelector + target:(id)theTarget __attribute__((deprecated("JPush 2.1.1 版本已过期"))); ++ (void) setTags:(NSSet *)tags + alias:(NSString *)alias +callbackSelector:(SEL)cbSelector + object:(id)theTarget __attribute__((deprecated("JPush 3.0.6 版本已过期"))); ++ (void) setTags:(NSSet *)tags +callbackSelector:(SEL)cbSelector + object:(id)theTarget __attribute__((deprecated("JPush 3.0.6 版本已过期"))); ++ (void)setTags:(NSSet *)tags + alias:(NSString *)alias +fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler __attribute__((deprecated("JPush 3.0.6 版本已过期"))); ++ (void) setTags:(NSSet *)tags +aliasInbackground:(NSString *)alias __attribute__((deprecated("JPush 3.0.6 版本已过期"))); ++ (void)setAlias:(NSString *)alias +callbackSelector:(SEL)cbSelector + object:(id)theTarget __attribute__((deprecated("JPush 3.0.6 版本已过期"))); + +@end + +@class UNUserNotificationCenter; +@class UNNotificationResponse; + +@protocol JPUSHRegisterDelegate + +/* + * @brief handle UserNotifications.framework [willPresentNotification:withCompletionHandler:] + * @param center [UNUserNotificationCenter currentNotificationCenter] 新特性用户通知中心 + * @param notification 前台得到的的通知对象 + * @param completionHandler 该callback中的options 请使用UNNotificationPresentationOptions + */ +- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger options))completionHandler; +/* + * @brief handle UserNotifications.framework [didReceiveNotificationResponse:withCompletionHandler:] + * @param center [UNUserNotificationCenter currentNotificationCenter] 新特性用户通知中心 + * @param response 通知响应对象 + * @param completionHandler + */ +- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler; + +/* + * @brief handle UserNotifications.framework [openSettingsForNotification:] + * @param center [UNUserNotificationCenter currentNotificationCenter] 新特性用户通知中心 + * @param notification 当前管理的通知对象 + */ +- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center openSettingsForNotification:(UNNotification *)notification NS_AVAILABLE_IOS(12.0); + +/** + * 监测通知授权状态返回的结果 + * @param status 授权通知状态，详见JPAuthorizationStatus + * @param info 更多信息，预留参数 + */ +- (void)jpushNotificationAuthorization:(JPAuthorizationStatus)status withInfo:(NSDictionary *)info; + +@end + +@protocol JPUSHGeofenceDelegate +/** + 触发地理围栏 + @param geofence 地理围栏触发时返回的信息 + @param error 错误信息 + */ +- (void)jpushGeofenceRegion:(NSDictionary *)geofence + error:(NSError *)error; + +/** + 拉取地理围栏列表的回调 + + @param geofenceList 地理围栏列表 + */ +- (void)jpushCallbackGeofenceReceived:(NSArray *)geofenceList; + +/** + 进入地理围栏区域 + + @param geofenceId 地理围栏id + @param userInfo 地理围栏触发时返回的信息 + @param error 错误信息 + */ +- (void)jpushGeofenceIdentifer:(NSString *)geofenceId didEnterRegion:(NSDictionary *)userInfo error:(NSError *)error __attribute__((deprecated("JPush 3.6.0 版本已过期"))); + +/** + 离开地理围栏区域 + + @param geofenceId 地理围栏id + @param userInfo 地理围栏触发时返回的信息 + @param error 错误信息 + */ +- (void)jpushGeofenceIdentifer:(NSString *)geofenceId didExitRegion:(NSDictionary *)userInfo error:(NSError *)error __attribute__((deprecated("JPush 3.6.0 版本已过期"))); + +@end + + +@protocol JPUSHNotiInMessageDelegate + +/** + 应用内提醒消息展示的回调 + + @param content 应用内提醒消息的内容 + + */ +- (void)jPushNotiInMessageDidShowWithContent:(NSDictionary *)content; + +/** + 应用内提醒消息点击的回调 + + @param content 应用内提醒消息的内容 + + */ +- (void)jPushNotiInMessageDidClickWithContent:(NSDictionary *)content; + +@end + + +@protocol JPUSHInAppMessageDelegate + +/** + 应用内消息展示的回调 + + @param inAppMessage 应用内消息的内容 + + */ +- (void)jPushInAppMessageDidShow:(JPushInAppMessage *)inAppMessage; + +/** + 应用内消息点击的回调 + + @param inAppMessage 应用内消息的内容 + + */ +- (void)jPushInAppMessageDidClick:(JPushInAppMessage *)inAppMessage; + +@end + diff --git a/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/Headers/JPushModule.h b/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/Headers/JPushModule.h new file mode 100644 index 0000000..ad03617 --- /dev/null +++ b/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/Headers/JPushModule.h @@ -0,0 +1,17 @@ +// +// JPushModule.h +// UniPluginJPush +// +// Created by huangshuni on 2021/1/12. +// + +#import +#import "DCUniModule.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface JPushModule : DCUniModule + +@end + +NS_ASSUME_NONNULL_END diff --git a/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/Info.plist b/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/Info.plist new file mode 100644 index 0000000..ef1d39a Binary files /dev/null and b/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/Info.plist differ diff --git a/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/UniPluginJPush b/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/UniPluginJPush new file mode 100644 index 0000000..fa63113 Binary files /dev/null and b/nativeplugins/JG-JPush/ios/UniPluginJPush.framework/UniPluginJPush differ diff --git a/nativeplugins/JG-JPush/ios/jpush-ios-5.0.0.a b/nativeplugins/JG-JPush/ios/jpush-ios-5.0.0.a new file mode 100644 index 0000000..5699118 Binary files /dev/null and b/nativeplugins/JG-JPush/ios/jpush-ios-5.0.0.a differ diff --git a/nativeplugins/JG-JPush/package.json b/nativeplugins/JG-JPush/package.json new file mode 100644 index 0000000..b24e368 --- /dev/null +++ b/nativeplugins/JG-JPush/package.json @@ -0,0 +1,165 @@ +{ + "name": "JG-JPush", + "id": "JG-JPush", + "version": "1.1.9", + "description": "极光推送Hbuilder插件", + "_dp_type":"nativeplugin", + "_dp_nativeplugin":{ + "ios": { + "deploymentTarget": "11.0", + "validArchitectures": [ + "arm64" + ], + "plugins": [{ + "type": "module", + "name": "JG-JPush", + "class": "JPushModule" + }], + "hooksClass": "JPushProxy", + "integrateType": "framework", + "frameworks": [ + "CFNetwork.framework", + "CoreFoundation.framework", + "CoreTelephony.framework", + "SystemConfiguration.framework", + "CoreGraphics.framework", + "Foundation.framework", + "UIKit.framework", + "Security.framework", + "libz.tbd", + "AdSupport.framework", + "UserNotifications.framework", + "libresolv.tbd", + "WebKit.framework", + "AppTrackingTransparency.framework", + "StoreKit.framework" + ], + "resources": [ + + ], + "capabilities": { + "entitlements": { + "aps-environment":"development" + } + }, + "privacies": [ + "NSLocationAlwaysAndWhenInUseUsageDescription", + "NSLocationAlwaysUsageDescription", + "NSLocationWhenInUseUsageDescription" + ], + "parameters": { + "JPUSH_ISPRODUCTION_IOS": { + "des": "[iOS]是否是生产环境，是填true，不是填false或者不填", + "key": "JPush:ISPRODUCTION" + }, + "JPUSH_ADVERTISINGID_IOS": { + "des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", + "key": "JPush:ADVERTISINGID" + }, + "JPUSH_DEFAULTINITJPUSH_IOS": { + "des": "[iOS]是否默认初始化，是填true，不是填false或者不填", + "key": "JPush:DEFAULTINITJPUSH" + } + } + }, + "android": { + "plugins": [ + { + "type": "module", + "name": "JG-JPush", + "class": "cn.jiguang.uniplugin_jpush.JPushModule" + } + ], + "integrateType": "aar", + "minSdkVersion": "19", + "permissions": [ + "${applicationId}.permission.JPUSH_MESSAGE", + "android.permission.INTERNET", + "android.permission.ACCESS_NETWORK_STATE", + "android.permission.POST_NOTIFICATIONS", + "com.huawei.android.launcher.permission.CHANGE_BADGE", + "com.vivo.notification.permission.BADGE_ICON", + "com.hihonor.android.launcher.permission.CHANGE_BADGE", + "android.permission.VIBRATE", + "android.permission.ACCESS_COARSE_LOCATION", + "android.permission.ACCESS_FINE_LOCATION", + "android.permission.ACCESS_BACKGROUND_LOCATION", + "android.permission.READ_PHONE_STATE", + "android.permission.QUERY_ALL_PACKAGES", + "android.permission.GET_TASKS", + "android.permission.ACCESS_WIFI_STATE", + "android.permission.WRITE_EXTERNAL_STORAGE", + "android.permission.READ_EXTERNAL_STORAGE", + "${applicationId}.permission.MIPUSH_RECEIVE", + "com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE", + "com.heytap.mcs.permission.RECIEVE_MCS_MESSAGE" + ], + "parameters": { + "JPUSH_OPPO_APPKEY": { + "des": "厂商OPPO-appkey,示例：OP-12345678", + "key": "OPPO_APPKEY" + }, + "JPUSH_OPPO_APPID":{ + "des": "厂商OPPO-appId,示例：OP-12345678", + "key": "OPPO_APPID" + }, + "JPUSH_OPPO_APPSECRET":{ + "des": "厂商OPPO-appSecret,示例：OP-12345678", + "key": "OPPO_APPSECRET" + }, + "JPUSH_VIVO_APPKEY":{ + "des": "厂商VIVO-appkey,示例：12345678", + "key": "com.vivo.push.api_key" + }, + "JPUSH_VIVO_APPID":{ + "des": "厂商VIVO-appId,示例：12345678", + "key": "com.vivo.push.app_id" + }, + "JPUSH_MEIZU_APPKEY":{ + "des": "厂商MEIZU-appKey,示例：MZ-12345678", + "key": "MEIZU_APPKEY" + }, + "JPUSH_MEIZU_APPID":{ + "des": "厂商MEIZU-appId,示例：MZ-12345678", + "key": "MEIZU_APPID" + }, + "JPUSH_XIAOMI_APPKEY":{ + "des": "厂商XIAOMI-appKey,示例：MI-12345678", + "key": "XIAOMI_APPKEY" + }, + "JPUSH_XIAOMI_APPID":{ + "des": "厂商XIAOMI-appId,示例：MI-12345678", + "key": "XIAOMI_APPID" + }, + "JPUSH_HUAWEI_APPID":{ + "des": "厂商HUAWEI-appId,示例：appid=12346578", + "key": "com.huawei.hms.client.appid" + }, + "JPUSH_HONOR_APPID" : { + "des" : "厂商HONOR-appId,示例：12346578", + "key" : "com.hihonor.push.app_id" + }, + "JPUSH_GOOGLE_API_KEY" : { + "des" : "厂商google api_key,示例:g-12346578", + "key" : "google_api_key" + }, + "JPUSH_GOOGLE_APP_ID" : { + "des" : "厂商google mobilesdk_app_id,示例：g-12346578", + "key" : "google_app_id" + }, + "JPUSH_GOOGLE_PROJECT_NUMBER" : { + "des" : "厂商google project_number,示例：g-12346578", + "key" : "gcm_defaultSenderId" + }, + "JPUSH_GOOGLE_PROJECT_ID" : { + "des" : "厂商google project_id ,示例：g-12346578", + "key" : "project_id" + }, + "JPUSH_GOOGLE_STORAGE_BUCKET" : { + "des" : "厂商google storage_bucket,示例：g-12346578", + "key" : "google_storage_bucket" + } + } + } + } +} diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue index ed612dd..2f2763b 100644 --- a/pages/logistics/deliveryDetil.vue +++ b/pages/logistics/deliveryDetil.vue @@ -107,7 +107,7 @@ showLoading: true, showPop: false, goodsDetil: undefined, - scale: 15, + scale: 17, nowAddress: "无", markers: [ // 商家 @@ -125,10 +125,8 @@ iconPath: '../../static/img/logistics/QS.png', //显示的图标 } ], - polyline: [] - } }, methods: { @@ -158,11 +156,9 @@ that.markers[1].latitude = res.latitude that.markers[1].longitude = res.longitude that.getDriverLine() - } }); //#endif - }, // 唤起高德 @@ -318,7 +314,7 @@ } .map { - height: 35vh; + height: 40vh; border-radius: 2vw; overflow: hidden; diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue index 4eacf81..ebfa8b5 100644 --- a/pages/logistics/index.vue +++ b/pages/logistics/index.vue @@ -7,7 +7,6 @@ - @@ -53,6 +52,11 @@ } }, methods: { + go() { + uni.navigateTo({ + url: "/pages/logistics/te" + }) + }, sectionChange(index) { this.curNow = index.index; diff --git a/pages/logistics/te.vue b/pages/logistics/te.vue index e99960a..95a9419 100644 --- a/pages/logistics/te.vue +++ b/pages/logistics/te.vue @@ -1,10 +1,11 @@