diff --git a/10 b/10 new file mode 100644 index 0000000..6e8734e --- /dev/null +++ b/10 @@ -0,0 +1,12 @@ + +changed 1 package, and audited 42 packages in 5s + +7 packages are looking for funding + run `npm fund` for details + +3 high severity vulnerabilities + +Some issues need review, and may require choosing +a different dependency. + +Run `npm audit` for details. diff --git a/App.vue b/App.vue index 7f7df70..fdc509f 100644 --- a/App.vue +++ b/App.vue @@ -8,6 +8,7 @@ import NIM from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK"; import { V2NIMConst } from "nim-web-sdk-ng/dist/esm/nim"; + import { customRedirectTo, customReLaunch, @@ -23,19 +24,51 @@ import BASE_URL from "@/utils/config.js" // #ifdef APP-PLUS /** 推送插件 */ const nimPushPlugin = uni.requireNativePlugin("NIMUniPlugin-PluginModule"); +console.log("nimPushPlugin1111"); +console.log(nimPushPlugin); /** 音视频通话插件 */ -const nimCallKit = (uni.$UIKitCallKit = - uni.requireNativePlugin("netease-CallKit")); +// const nimCallKit = (uni.$UIKitCallKit = +// uni.requireNativePlugin("netease-CallKit")); // #endif - +const app = getApp() let startByNotificationId = ""; + export default { + globalData: { + plAd: true + }, onLaunch() { + // #ifdef APP-PLUS /** 关闭启动画面，锁定竖屏 */ - plus.navigator.closeSplashscreen(); - plus.screen.lockOrientation("portrait-primary"); + try { + plus.navigator.closeSplashscreen(); + plus.screen.lockOrientation("portrait-primary"); + } catch (error) { + + } + // 点击通知栏推送监听 + + nimPushPlugin.addOpenNotificationListener((res) => { + console.log("推送监听"); + console.log("res",res); + if (typeof res === 'object') { + + console.log("=====addOpenNotificationListener success:", JSON.stringify(res)) + uni.redirectTo({ + url: `/pages_app/patientMsg/patientMsg?from=push`, + success: () => { + app.globalData.plAd=false; + }, + fail: (err) => { + console.log("跳转失败", err); + } + }); + } else { + console.log("=====addOpenNotificationListener unexpected:", res) + } + }); // #endif // uni-app客户端获取push客户端标记，代码可以实现在App.vue中 @@ -142,19 +175,7 @@ export default { console.log("onShow"); uni?.$UIKitNIM?.V2NIMSettingService?.setAppBackground(false); - // 点击通知栏推送监听 - nimPushPlugin.addOpenNotificationListener((res) => { - console.log("推送监听"); - console.log("res",res); - if (typeof res == "object" && res?.sessionId && res?.sessionType) { - // 当前登录账号id 具体获取根据您的业务逻辑调整 - const imOptions = uni.getStorageSync(STORAGE_KEY); - // 会话类型 - const type = res?.sessionType; - // 拼装会话ID - startByNotificationId = `${imOptions.account}|${type}|${res?.sessionId}`; - } - }); + // #endif }, onHide() { @@ -250,21 +271,23 @@ export default { nim.V2NIMConversationIdUtil.parseConversationTargetId( conversationId ); - + const PACKAGE_NAME = 'cn.shangyu.gdxzExpert'; + let sessionId=conversationType == 1 + ? uni.$UIKitStore.userStore.myUserInfo.accountId + : targetId; // 设置离线强推，厂商相关推送在此处配置 // 具体参考文档 https://doc.yunxin.163.com/messaging2/guide/zc4MTg5MDY?platform=client#%E7%AC%AC%E4%B8%80%E6%AD%A5%E4%B8%8A%E4%BC%A0%E6%8E%A8%E9%80%81%E8%AF%81%E4%B9%A6 const pushPayload = JSON.stringify({ - pushTitle: "测试推送", // 必填，推送消息标题 + //pushTitle: "测试推送", // 必填，推送消息标题 notify_effect: "2", //可选项，预定义通知栏消息的点击行为。1：通知栏点击后打开app的Launcher Activity，2：通知栏点击后打开app的任一Activity（开发者还需要传入intent_uri），3：通知栏点击后打开网页（开发者还需要传入web_uri） - intent_uri: - "intent:#Intent;action=com.netease.nimlib.uniapp.push.NotificationClickActivity;component=com.netease.nim.demo/com.netease.nimlib.uniapp.push.NotificationClickActivity;launchFlags=0x04000000;i.sessionType=0;S.sessionId=cs1;end", //可选项，打开当前app的任一组件。 + intent_uri: `intent:#Intent;action=com.netease.nimlib.uniapp.push.NotificationClickActivity;component=${PACKAGE_NAME}/com.netease.nimlib.uniapp.push.NotificationClickActivity;launchFlags=0x04000000;i.sessionType=${conversationType};S.sessionId=${sessionId};end`, hwField: { click_action: { //必填，消息点击行为 type: 1, //必填，消息点击行为类型，取值如下：1：打开应用自定义页面 2：点击后打开特定URL 3：点击后打开应用 // 自定义页面中intent的实现，请参见指定intent参数​。当type为1时，字段intent和action至少二选一。scheme方式和指定activity方式都可以 intent: - "intent:#Intent;action=com.netease.nimlib.uniapp.push.NotificationClickActivity;component=com.netease.nim.demo/com.netease.nimlib.uniapp.push.NotificationClickActivity;launchFlags=0x04000000;i.sessionType=0;S.sessionId=cs1;end", + `intent:#Intent;action=com.netease.nimlib.uniapp.push.NotificationClickActivity;component=${PACKAGE_NAME}/com.netease.nimlib.uniapp.push.NotificationClickActivity;launchFlags=0x04000000;i.sessionType=${conversationType};S.sessionId=${sessionId};end` }, androidConfig: { category: "IM", //可选项，标识消息类型，用于标识高优先级透传场景，详见官方文档 AndroidConfig.category @@ -277,14 +300,14 @@ export default { //必填，消息点击行为 type: 1, //必填，消息点击行为类型，取值如下：1：打开应用自定义页面 2：点击后打开特定URL 3：点击后打开应用 //自定义页面中intent的实现，请参见指定intent参数。当type为1时，字段intent和action至少二选一。 - intent: "", + intent: `intent://com.honor.push/deeplink?#Intent;scheme=pushscheme;launchFlags=0x04000000;i.sessionType=${conversationType};S.sessionId=${sessionId};end`, }, importance: "NORMAL", //可选项，Android通知消息分类，决定用户设备消息通知行为，取值如下：LOW：资讯营销类消息 NORMAL：服务与通讯类消息 }, }, vivoField: { skipType: "4", //必填，点击跳转类型 1：打开APP首页 2：打开链接 3：自定义 4:打开app内指定页面，默认为1 - skipContent: "", + skipContent: `intent:#Intent;action=com.netease.nimlib.uniapp.push.NotificationClickActivity;component=${PACKAGE_NAME}/com.netease.nimlib.uniapp.push.NotificationClickActivity;launchFlags=0x04000000;i.sessionType=${conversationType};S.sessionId=${sessionId};end`, classification: "1", //可选项，消息类型 0：运营类消息，1：系统类消息。默认为0 category: "IM", // 可选项，二级分类 }, @@ -293,16 +316,19 @@ export default { category: "IM", //可选项，通道类别名 notify_level: 2, //通知栏消息提醒等级，1-通知栏；2-通知栏+锁屏；16-通知栏+锁屏+横幅+震动+铃声 click_action_type: "1", //点击通知栏后触发的动作类型。0（默认0.启动应用；1.跳转指定应用内页（action标签名）；2.跳转网页；4.跳转指定应用内页（全路径类名）；5.跳转Intent scheme URL: "", - click_action_activity: "", - action_parameters: "", + click_action_activity: "com.netease.nimlib.uniapp.push.NotificationClickActivity", + action_parameters: JSON.stringify({ + sessionType: conversationType, + sessionId: sessionId, + }), }, fcmFieldV1: { message: { android: { priority: "", data: { - sessionType: "0", - sessionId: "cs1", + sessionType: conversationType, + sessionId: sessionId, }, notification: { click_action: "", @@ -312,10 +338,7 @@ export default { }, // IOS apns - sessionId: - conversationType == 1 - ? uni.$UIKitStore.userStore.myUserInfo.accountId - : targetId, + sessionId:sessionId, sessionType: conversationType, }); @@ -340,37 +363,37 @@ export default { /** 注册推送 实际根据您在推送厂商申请的证书进行配置，具体参考文档 https://doc.yunxin.163.com/messaging2/guide/zc4MTg5MDY?platform=client#%E7%AC%AC%E4%B8%80%E6%AD%A5%E4%B8%8A%E4%BC%A0%E6%8E%A8%E9%80%81%E8%AF%81%E4%B9%A6 */ nim.V2NIMSettingService.setOfflinePushConfig(nimPushPlugin, { - // miPush: { - // appId: "", - // appKey: "", - // certificateName: "", - // }, - // hwPush: { - // appId: "", - // certificateName: "", - // }, - // oppoPush: { - // appId: "", - // appKey: "", - // certificateName: "", - // secret: "", - // }, - vivoPush: { - appId: "100034326", - appKey: "e789634c1f76c8f184b1def1101ce824", - certificateName: "Expert_vivo_Push", + miPush: { + appId: "2882303761517470793", + appKey: "5431747048793", + certificateName: "Expert_Mi_Push", + }, + hwPush: { + appId: "10526652", + certificateName: "Expert_Hw_push_f", + }, + oppoPush: { + appId: "3364888", + appKey: "75D5Vqsg63wok0S0w4SKog0w8", + certificateName: "Expert_Op_Push", + secret: "416a4f5eF822ddcB73B627Cc310636D7", + }, + vivoPush: { + // appId: "100034326", + // appKey: "e789634c1f76c8f184b1def1101ce824", + certificateName: "Expert_Vi_Push", + }, + fcmPush: { + certificateName: "FCM_PUSH_CERT", + }, + mzPush: { + appId: "111", + appKey: "111", + certificateName: "MEIZU_PUSH_CERT", + }, + apns: { + certificateName: "专家端Pro", }, - // fcmPush: { - // certificateName: "", - // }, - // mzPush: { - // appId: "", - // appKey: "", - // certificateName: "", - // }, - // apns: { - // certificateName: "", - // }, }); // #endif @@ -438,13 +461,13 @@ export default { logout() { uni.removeStorageSync(STORAGE_KEY); try { - nimCallKit.logout({}, (ret) => { - if (ret.code != 200) { - console.log("音视频通话插件退出失败"); - } else { - console.log("音视频通话插件退出成功"); - } - }); + // nimCallKit.logout({}, (ret) => { + // if (ret.code != 200) { + // console.log("音视频通话插件退出失败"); + // } else { + // console.log("音视频通话插件退出成功"); + // } + // }); } catch (error) { console.log("音视频通话插件退出失败", error); } diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index 54db3e4..b1cce73 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -70,7 +70,7 @@ activeColor: '#007aff', badge: 0, showRedDot: false, - pagePath: '/pages/index/index' + pagePath: '/pages/index/index?from=push' }, { icon: classroom, diff --git a/manifest.json b/manifest.json index 6c111c2..864559d 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__89F511F", "description" : "", "versionName" : "4.1.5", - "versionCode" : 415, + "versionCode" : 100, "transformPx" : false, "app-plus" : { /* 5+App特有相关 */ @@ -46,7 +46,8 @@ "", "" ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "minSdkVersion" : 21 }, "ios" : { "dSYMs" : false, @@ -59,8 +60,7 @@ "appid" : "wxbf3658f5e674667c", "appsecret" : "c4505a04a9910c65efea8e11ffc93f92", "UniversalLinks" : "https://doc.igandan.com/gdxzExpert/" - }, - "univerify" : {} + } }, "payment" : { "weixin" : { @@ -77,23 +77,7 @@ } }, "speech" : {}, - "push" : { - "unipush" : { - "version" : "2", - "offline" : false, - "hms" : {}, - "oppo" : {}, - "vivo" : {}, - "mi" : {}, - "meizu" : {}, - "honor" : {}, - "icons" : { - "small" : { - "xxhdpi" : "D:/uniapp/专家版图标/72.png" - } - } - } - } + "push" : {} }, "splashscreen" : { "androidStyle" : "common", @@ -126,7 +110,7 @@ "NIMUniPlugin" : { "PUSH_VIVO_APPID" : "100034326", "PUSH_VIVO_APPKEY" : "e789634c1f76c8f184b1def1101ce824", - "PUSH_HONOR_APPID" : "", + "PUSH_HONOR_APPID" : "900782424", "__plugin_info__" : { "name" : "NIMUniPlugin", "description" : "uni消息推送插件", @@ -155,20 +139,6 @@ } } } - }, - "netease-CallKit" : { - "__plugin_info__" : { - "name" : "netease-CallKit", - "description" : "网易云信音视频通话插件", - "platforms" : "Android,iOS", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } } } }, diff --git a/nativeplugins/NIMUniPlugin/android/assets/agconnect-services.json b/nativeplugins/NIMUniPlugin/android/assets/agconnect-services.json index 8ae47bf..008f9df 100644 --- a/nativeplugins/NIMUniPlugin/android/assets/agconnect-services.json +++ b/nativeplugins/NIMUniPlugin/android/assets/agconnect-services.json @@ -1,3 +1 @@ -{ - "comments": "请将此文件替换为华为开发者后台的配置文件" -} \ No newline at end of file +{"agcgw":{"url":"connect-drcn.dbankcloud.cn","backurl":"connect-drcn.hispace.hicloud.com","websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn","websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com"},"agcgw_all":{"SG":"connect-dra.dbankcloud.cn","SG_back":"connect-dra.hispace.hicloud.com","CN":"connect-drcn.dbankcloud.cn","CN_back":"connect-drcn.hispace.hicloud.com","RU":"connect-drru.hispace.dbankcloud.ru","RU_back":"connect-drru.hispace.dbankcloud.cn","DE":"connect-dre.dbankcloud.cn","DE_back":"connect-dre.hispace.hicloud.com"},"websocketgw_all":{"SG":"connect-ws-dra.hispace.dbankcloud.cn","SG_back":"connect-ws-dra.hispace.dbankcloud.com","CN":"connect-ws-drcn.hispace.dbankcloud.cn","CN_back":"connect-ws-drcn.hispace.dbankcloud.com","RU":"connect-ws-drru.hispace.dbankcloud.ru","RU_back":"connect-ws-drru.hispace.dbankcloud.cn","DE":"connect-ws-dre.hispace.dbankcloud.cn","DE_back":"connect-ws-dre.hispace.dbankcloud.com"},"client":{"cp_id":"890086000102014306","product_id":"9105163812218585677","client_id":"178572405214545024","client_secret":"B90774CD63B8A6AB5C2C587DC9D7C4C666EF53A19DBA70C4D549C6302ED6CFBE","project_id":"9105163812218585677","app_id":"10526652","api_key":"CV58Raxnpwbfazn6iLPkESUy7KoiUzZ5iTv8lFg/WuexwYZceAK6F9BjRf0HVmT+039dGKt5yecdkRdQ4FCHsmLZ1Zvh","package_name":"cn.shangyu.gdxzExpert"},"oauth_client":{"client_id":"10526652","client_type":1},"app_info":{"app_id":"10526652","package_name":"cn.shangyu.gdxzExpert"},"service":{"analytics":{"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn","collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn","collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn","collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com","collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn","resource_id":"p1","channel_id":""},"ml":{"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"},"cloudstorage":{"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg":"https://ops-dra.agcstorage.link","storage_url_de":"https://ops-dre.agcstorage.link","storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia","storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu","storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn"},"search":{"url":"https://search-drcn.cloud.huawei.com"},"edukit":{"edu_url":"edukit.cloud.huawei.com.cn","dh_url":"edukit.cloud.huawei.com.cn"}},"region":"CN","configuration_version":"3.0","appInfos":[{"package_name":"cn.shangyu.gdxzExpert","client":{"app_id":"10526652"},"app_info":{"package_name":"cn.shangyu.gdxzExpert","app_id":"10526652"},"oauth_client":{"client_type":1,"client_id":"10526652"}}]} \ No newline at end of file diff --git a/nativeplugins/NIMUniPlugin/android/assets/mcs-services.json b/nativeplugins/NIMUniPlugin/android/assets/mcs-services.json index 5746d33..58a3074 100644 --- a/nativeplugins/NIMUniPlugin/android/assets/mcs-services.json +++ b/nativeplugins/NIMUniPlugin/android/assets/mcs-services.json @@ -1,6 +1,6 @@ { - "developer_id":"YOUR_HONOR_DEVELOPER_ID", - "app_id":"YOUR_HONOR_APP_ID", - "package_name":"YOUR_HONOR_PACKAGE_ID", + "developer_id":"109999967097", + "app_id":"900782424", + "package_name":"cn.shangyu.gdxzExpert", "version":"1.0" } \ No newline at end of file diff --git a/nativeplugins/NIMUniPlugin/android/com.heytap.msp_3.4.0.aar b/nativeplugins/NIMUniPlugin/android/com.heytap.msp_3.4.0.aar deleted file mode 100644 index dcc1723..0000000 Binary files a/nativeplugins/NIMUniPlugin/android/com.heytap.msp_3.4.0.aar and /dev/null differ diff --git a/nativeplugins/NIMUniPlugin/android/com.heytap.msp_3.5.1.aar b/nativeplugins/NIMUniPlugin/android/com.heytap.msp_3.5.1.aar new file mode 100644 index 0000000..c70cc38 Binary files /dev/null and b/nativeplugins/NIMUniPlugin/android/com.heytap.msp_3.5.1.aar differ diff --git a/nativeplugins/NIMUniPlugin/android/nim-uni-plugin.aar b/nativeplugins/NIMUniPlugin/android/nim-uni-plugin.aar index be202fc..99c75d4 100644 Binary files a/nativeplugins/NIMUniPlugin/android/nim-uni-plugin.aar and b/nativeplugins/NIMUniPlugin/android/nim-uni-plugin.aar differ diff --git a/nativeplugins/NIMUniPlugin/package.json b/nativeplugins/NIMUniPlugin/package.json index c662ac5..064003d 100644 --- a/nativeplugins/NIMUniPlugin/package.json +++ b/nativeplugins/NIMUniPlugin/package.json @@ -1,9 +1,9 @@ { "name": "NIMUniPlugin", "id": "NIMUniPlugin", - "version": "1.1.1", - "git": "589334b", - "buildAt": "4/26/2024, 10:00:33 AM", + "version": "1.1.3", + "git": "3ff8678", + "buildAt": "7/21/2025, 10:17:00 AM", "description": "uni消息推送插件", "_dp_type": "nativeplugin", "_dp_nativeplugin": { diff --git a/nativeplugins/netease-Callkit/android/neteaseCallKit-release.aar b/nativeplugins/netease-Callkit/android/neteaseCallKit-release.aar deleted file mode 100644 index cca5873..0000000 Binary files a/nativeplugins/netease-Callkit/android/neteaseCallKit-release.aar and /dev/null differ diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/CocoaLumberjack b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/CocoaLumberjack deleted file mode 100644 index 4ba633a..0000000 Binary files a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/CocoaLumberjack and /dev/null differ diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CLIColor.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CLIColor.h deleted file mode 100644 index 8766b54..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CLIColor.h +++ /dev/null @@ -1,54 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -#if TARGET_OS_OSX - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * This class represents an NSColor replacement for CLI projects that don't link with AppKit - **/ -@interface CLIColor : NSObject - -/** - * Convenience method for creating a `CLIColor` instance from RGBA params - * - * @param red red channel, between 0 and 1 - * @param green green channel, between 0 and 1 - * @param blue blue channel, between 0 and 1 - * @param alpha alpha channel, between 0 and 1 - */ -+ (instancetype)colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha; - -/** - * Get the RGBA components from a `CLIColor` - * - * @param red red channel, between 0 and 1 - * @param green green channel, between 0 and 1 - * @param blue blue channel, between 0 and 1 - * @param alpha alpha channel, between 0 and 1 - */ -- (void)getRed:(nullable CGFloat *)red green:(nullable CGFloat *)green blue:(nullable CGFloat *)blue alpha:(nullable CGFloat *)alpha NS_SWIFT_NAME(get(red:green:blue:alpha:)); - -@end - -NS_ASSUME_NONNULL_END - -#endif diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CocoaLumberjack-umbrella.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CocoaLumberjack-umbrella.h deleted file mode 100644 index 8c503ef..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CocoaLumberjack-umbrella.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - -#import "CLIColor.h" -#import "DDAbstractDatabaseLogger.h" -#import "DDASLLogCapture.h" -#import "DDASLLogger.h" -#import "DDAssertMacros.h" -#import "DDContextFilterLogFormatter+Deprecated.h" -#import "DDContextFilterLogFormatter.h" -#import "DDDispatchQueueLogFormatter.h" -#import "DDFileLogger+Buffering.h" -#import "DDFileLogger.h" -#import "DDLog+LOGV.h" -#import "DDLog.h" -#import "DDLoggerNames.h" -#import "DDLogMacros.h" -#import "DDMultiFormatter.h" -#import "DDOSLogger.h" -#import "DDTTYLogger.h" -#import "CocoaLumberjack.h" -#import "DDLegacyMacros.h" - -FOUNDATION_EXPORT double CocoaLumberjackVersionNumber; -FOUNDATION_EXPORT const unsigned char CocoaLumberjackVersionString[]; - diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CocoaLumberjack.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CocoaLumberjack.h deleted file mode 100644 index baf01d7..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/CocoaLumberjack.h +++ /dev/null @@ -1,104 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -/** - * Welcome to CocoaLumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/CocoaLumberjack/CocoaLumberjack - * - * If you're new to the project you may wish to read "Getting Started" at: - * Documentation/GettingStarted.md - * - * Otherwise, here is a quick refresher. - * There are three steps to using the macros: - * - * Step 1: - * Import the header in your implementation or prefix file: - * - * #import - * - * Step 2: - * Define your logging level in your implementation file: - * - * // Log levels: off, error, warn, info, verbose - * static const DDLogLevel ddLogLevel = DDLogLevelVerbose; - * - * Step 2 [3rd party frameworks]: - * - * Define your LOG_LEVEL_DEF to a different variable/function than ddLogLevel: - * - * // #undef LOG_LEVEL_DEF // Undefine first only if needed - * #define LOG_LEVEL_DEF myLibLogLevel - * - * Define your logging level in your implementation file: - * - * // Log levels: off, error, warn, info, verbose - * static const DDLogLevel myLibLogLevel = DDLogLevelVerbose; - * - * Step 3: - * Replace your NSLog statements with DDLog statements according to the severity of the message. - * - * NSLog(@"Fatal error, no dohickey found!"); -> DDLogError(@"Fatal error, no dohickey found!"); - * - * DDLog works exactly the same as NSLog. - * This means you can pass it multiple variables just like NSLog. - **/ - -#import - -//! Project version number for CocoaLumberjack. -FOUNDATION_EXPORT double CocoaLumberjackVersionNumber; - -//! Project version string for CocoaLumberjack. -FOUNDATION_EXPORT const unsigned char CocoaLumberjackVersionString[]; - -// Disable legacy macros -#ifndef DD_LEGACY_MACROS - #define DD_LEGACY_MACROS 0 -#endif - -// Core -#import - -// Main macros -#import -#import - -// Capture ASL -#import - -// Loggers -#import - -#import -#import -#import -#import - -// Extensions -#import -#import -#import -#import -#import - -// CLI -#import - -// etc -#import -#import -#import diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDASLLogCapture.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDASLLogCapture.h deleted file mode 100644 index 6890754..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDASLLogCapture.h +++ /dev/null @@ -1,46 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -@protocol DDLogger; - -NS_ASSUME_NONNULL_BEGIN - -/** - * This class provides the ability to capture the ASL (Apple System Logs) - */ -API_DEPRECATED("Use DDOSLogger instead", macosx(10.4,10.12), ios(2.0,10.0), watchos(2.0,3.0), tvos(9.0,10.0)) -@interface DDASLLogCapture : NSObject - -/** - * Start capturing logs - */ -+ (void)start; - -/** - * Stop capturing logs - */ -+ (void)stop; - -/** - * The current capture level. - * @note Default log level: DDLogLevelVerbose (i.e. capture all ASL messages). - */ -@property (class) DDLogLevel captureLevel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDASLLogger.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDASLLogger.h deleted file mode 100644 index 2024423..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDASLLogger.h +++ /dev/null @@ -1,63 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -// Disable legacy macros -#ifndef DD_LEGACY_MACROS - #define DD_LEGACY_MACROS 0 -#endif - -#import - -NS_ASSUME_NONNULL_BEGIN - -// Custom key set on messages sent to ASL -extern const char* const kDDASLKeyDDLog; - -// Value set for kDDASLKeyDDLog -extern const char* const kDDASLDDLogValue; - -/** - * This class provides a logger for the Apple System Log facility. - * - * As described in the "Getting Started" page, - * the traditional NSLog() function directs its output to two places: - * - * - Apple System Log - * - StdErr (if stderr is a TTY) so log statements show up in Xcode console - * - * To duplicate NSLog() functionality you can simply add this logger and a tty logger. - * However, if you instead choose to use file logging (for faster performance), - * you may choose to use a file logger and a tty logger. - **/ -API_DEPRECATED("Use DDOSLogger instead", macosx(10.4,10.12), ios(2.0,10.0), watchos(2.0,3.0), tvos(9.0,10.0)) -@interface DDASLLogger : DDAbstractLogger - -/** - * Singleton method - * - * @return the shared instance - */ -@property (nonatomic, class, readonly, strong) DDASLLogger *sharedInstance; - -// Inherited from DDAbstractLogger - -// - (id )logFormatter; -// - (void)setLogFormatter:(id )formatter; - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDAbstractDatabaseLogger.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDAbstractDatabaseLogger.h deleted file mode 100644 index 3013758..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDAbstractDatabaseLogger.h +++ /dev/null @@ -1,127 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -// Disable legacy macros -#ifndef DD_LEGACY_MACROS - #define DD_LEGACY_MACROS 0 -#endif - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * This class provides an abstract implementation of a database logger. - * - * That is, it provides the base implementation for a database logger to build atop of. - * All that is needed for a concrete database logger is to extend this class - * and override the methods in the implementation file that are prefixed with "db_". - **/ -@interface DDAbstractDatabaseLogger : DDAbstractLogger { - -@protected - NSUInteger _saveThreshold; - NSTimeInterval _saveInterval; - NSTimeInterval _maxAge; - NSTimeInterval _deleteInterval; - BOOL _deleteOnEverySave; - - NSInteger _saveTimerSuspended; - NSUInteger _unsavedCount; - dispatch_time_t _unsavedTime; - dispatch_source_t _saveTimer; - dispatch_time_t _lastDeleteTime; - dispatch_source_t _deleteTimer; -} - -/** - * Specifies how often to save the data to disk. - * Since saving is an expensive operation (disk io) it is not done after every log statement. - * These properties allow you to configure how/when the logger saves to disk. - * - * A save is done when either (whichever happens first): - * - * - The number of unsaved log entries reaches saveThreshold - * - The amount of time since the oldest unsaved log entry was created reaches saveInterval - * - * You can optionally disable the saveThreshold by setting it to zero. - * If you disable the saveThreshold you are entirely dependent on the saveInterval. - * - * You can optionally disable the saveInterval by setting it to zero (or a negative value). - * If you disable the saveInterval you are entirely dependent on the saveThreshold. - * - * It's not wise to disable both saveThreshold and saveInterval. - * - * The default saveThreshold is 500. - * The default saveInterval is 60 seconds. - **/ -@property (assign, readwrite) NSUInteger saveThreshold; - -/** - * See the description for the `saveThreshold` property - */ -@property (assign, readwrite) NSTimeInterval saveInterval; - -/** - * It is likely you don't want the log entries to persist forever. - * Doing so would allow the database to grow infinitely large over time. - * - * The maxAge property provides a way to specify how old a log statement can get - * before it should get deleted from the database. - * - * The deleteInterval specifies how often to sweep for old log entries. - * Since deleting is an expensive operation (disk io) is is done on a fixed interval. - * - * An alternative to the deleteInterval is the deleteOnEverySave option. - * This specifies that old log entries should be deleted during every save operation. - * - * You can optionally disable the maxAge by setting it to zero (or a negative value). - * If you disable the maxAge then old log statements are not deleted. - * - * You can optionally disable the deleteInterval by setting it to zero (or a negative value). - * - * If you disable both deleteInterval and deleteOnEverySave then old log statements are not deleted. - * - * It's not wise to enable both deleteInterval and deleteOnEverySave. - * - * The default maxAge is 7 days. - * The default deleteInterval is 5 minutes. - * The default deleteOnEverySave is NO. - **/ -@property (assign, readwrite) NSTimeInterval maxAge; - -/** - * See the description for the `maxAge` property - */ -@property (assign, readwrite) NSTimeInterval deleteInterval; - -/** - * See the description for the `maxAge` property - */ -@property (assign, readwrite) BOOL deleteOnEverySave; - -/** - * Forces a save of any pending log entries (flushes log entries to disk). - **/ -- (void)savePendingLogEntries; - -/** - * Removes any log entries that are older than maxAge. - **/ -- (void)deleteOldLogEntries; - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDAssertMacros.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDAssertMacros.h deleted file mode 100644 index 8427576..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDAssertMacros.h +++ /dev/null @@ -1,30 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -/** - * NSAssert replacement that will output a log message even when assertions are disabled. - **/ -#define DDAssert(condition, frmt, ...) \ - if (!(condition)) { \ - NSString *description = [NSString stringWithFormat:frmt, ## __VA_ARGS__]; \ - DDLogError(@"%@", description); \ - NSAssert(NO, @"%@", description); \ - } -#define DDAssertCondition(condition) DDAssert(condition, @"Condition not satisfied: %s", #condition) - -/** - * Analog to `DDAssertionFailure` from DDAssert.swift for use in Objective C - */ -#define DDAssertionFailure(frmt, ...) DDAssert(NO, frmt, ##__VA_ARGS__) diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDContextFilterLogFormatter+Deprecated.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDContextFilterLogFormatter+Deprecated.h deleted file mode 100644 index 614b9ad..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDContextFilterLogFormatter+Deprecated.h +++ /dev/null @@ -1,119 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * This class provides a log formatter that filters log statements from a logging context not on the whitelist. - * @deprecated Use DDContextAllowlistFilterLogFormatter instead. - * - * A log formatter can be added to any logger to format and/or filter its output. - * You can learn more about log formatters here: - * Documentation/CustomFormatters.md - * - * You can learn more about logging context's here: - * Documentation/CustomContext.md - * - * But here's a quick overview / refresher: - * - * Every log statement has a logging context. - * These come from the underlying logging macros defined in DDLog.h. - * The default logging context is zero. - * You can define multiple logging context's for use in your application. - * For example, logically separate parts of your app each have a different logging context. - * Also 3rd party frameworks that make use of Lumberjack generally use their own dedicated logging context. - **/ -__attribute__((deprecated("Use DDContextAllowlistFilterLogFormatter instead"))) -typedef DDContextAllowlistFilterLogFormatter DDContextWhitelistFilterLogFormatter; - -@interface DDContextAllowlistFilterLogFormatter (Deprecated) - -/** - * Add a context to the whitelist - * @deprecated Use -addToAllowlist: instead. - * - * @param loggingContext the context - */ -- (void)addToWhitelist:(NSInteger)loggingContext __attribute__((deprecated("Use -addToAllowlist: instead"))); - -/** - * Remove context from whitelist - * @deprecated Use -removeFromAllowlist: instead. - * - * @param loggingContext the context - */ -- (void)removeFromWhitelist:(NSInteger)loggingContext __attribute__((deprecated("Use -removeFromAllowlist: instead"))); - -/** - * Return the whitelist - * @deprecated Use allowlist instead. - */ -@property (nonatomic, readonly, copy) NSArray *whitelist __attribute__((deprecated("Use allowlist instead"))); - -/** - * Check if a context is on the whitelist - * @deprecated Use -isOnAllowlist: instead. - * - * @param loggingContext the context - */ -- (BOOL)isOnWhitelist:(NSInteger)loggingContext __attribute__((deprecated("Use -isOnAllowlist: instead"))); - -@end - - -/** - * This class provides a log formatter that filters log statements from a logging context on the blacklist. - * @deprecated Use DDContextDenylistFilterLogFormatter instead. - **/ -__attribute__((deprecated("Use DDContextDenylistFilterLogFormatter instead"))) -typedef DDContextDenylistFilterLogFormatter DDContextBlacklistFilterLogFormatter; - -@interface DDContextDenylistFilterLogFormatter (Deprecated) - -/** - * Add a context to the blacklist - * @deprecated Use -addToDenylist: instead. - * - * @param loggingContext the context - */ -- (void)addToBlacklist:(NSInteger)loggingContext __attribute__((deprecated("Use -addToDenylist: instead"))); - -/** - * Remove context from blacklist - * @deprecated Use -removeFromDenylist: instead. - * - * @param loggingContext the context - */ -- (void)removeFromBlacklist:(NSInteger)loggingContext __attribute__((deprecated("Use -removeFromDenylist: instead"))); - -/** - * Return the blacklist - * @deprecated Use denylist instead. - */ -@property (readonly, copy) NSArray *blacklist __attribute__((deprecated("Use denylist instead"))); - -/** - * Check if a context is on the blacklist - * @deprecated Use -isOnDenylist: instead. - * - * @param loggingContext the context - */ -- (BOOL)isOnBlacklist:(NSInteger)loggingContext __attribute__((deprecated("Use -isOnDenylist: instead"))); - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDContextFilterLogFormatter.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDContextFilterLogFormatter.h deleted file mode 100644 index 5e01578..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDContextFilterLogFormatter.h +++ /dev/null @@ -1,117 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -// Disable legacy macros -#ifndef DD_LEGACY_MACROS - #define DD_LEGACY_MACROS 0 -#endif - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * This class provides a log formatter that filters log statements from a logging context not on the allowlist. - * - * A log formatter can be added to any logger to format and/or filter its output. - * You can learn more about log formatters here: - * Documentation/CustomFormatters.md - * - * You can learn more about logging context's here: - * Documentation/CustomContext.md - * - * But here's a quick overview / refresher: - * - * Every log statement has a logging context. - * These come from the underlying logging macros defined in DDLog.h. - * The default logging context is zero. - * You can define multiple logging context's for use in your application. - * For example, logically separate parts of your app each have a different logging context. - * Also 3rd party frameworks that make use of Lumberjack generally use their own dedicated logging context. - **/ -@interface DDContextAllowlistFilterLogFormatter : NSObject - -/** - * Designated default initializer - */ -- (instancetype)init NS_DESIGNATED_INITIALIZER; - -/** - * Add a context to the allowlist - * - * @param loggingContext the context - */ -- (void)addToAllowlist:(NSInteger)loggingContext; - -/** - * Remove context from allowlist - * - * @param loggingContext the context - */ -- (void)removeFromAllowlist:(NSInteger)loggingContext; - -/** - * Return the allowlist - */ -@property (nonatomic, readonly, copy) NSArray *allowlist; - -/** - * Check if a context is on the allowlist - * - * @param loggingContext the context - */ -- (BOOL)isOnAllowlist:(NSInteger)loggingContext; - -@end - - -/** - * This class provides a log formatter that filters log statements from a logging context on the denylist. - **/ -@interface DDContextDenylistFilterLogFormatter : NSObject - -- (instancetype)init NS_DESIGNATED_INITIALIZER; - -/** - * Add a context to the denylist - * - * @param loggingContext the context - */ -- (void)addToDenylist:(NSInteger)loggingContext; - -/** - * Remove context from denylist - * - * @param loggingContext the context - */ -- (void)removeFromDenylist:(NSInteger)loggingContext; - -/** - * Return the denylist - */ -@property (readonly, copy) NSArray *denylist; - -/** - * Check if a context is on the denylist - * - * @param loggingContext the context - */ -- (BOOL)isOnDenylist:(NSInteger)loggingContext; - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDDispatchQueueLogFormatter.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDDispatchQueueLogFormatter.h deleted file mode 100644 index 42899b3..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDDispatchQueueLogFormatter.h +++ /dev/null @@ -1,223 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -// Disable legacy macros -#ifndef DD_LEGACY_MACROS - #define DD_LEGACY_MACROS 0 -#endif - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * Log formatter mode - */ -__attribute__((deprecated("DDDispatchQueueLogFormatter is always shareable"))) -typedef NS_ENUM(NSUInteger, DDDispatchQueueLogFormatterMode){ - /** - * This is the default option, means the formatter can be reused between multiple loggers and therefore is thread-safe. - * There is, of course, a performance cost for the thread-safety - */ - DDDispatchQueueLogFormatterModeShareble = 0, - /** - * If the formatter will only be used by a single logger, then the thread-safety can be removed - * @note: there is an assert checking if the formatter is added to multiple loggers and the mode is non-shareble - */ - DDDispatchQueueLogFormatterModeNonShareble, -}; - -/** - * Quality of Service names. - * - * Since macOS 10.10 and iOS 8.0, pthreads, dispatch queues and NSOperations express their - * scheduling priority by using an abstract classification called Quality of Service (QOS). - * - * This formatter will add a representation of this QOS in the log message by using those - * string constants. - * For example: - * - * `2011-10-17 20:21:45.435 AppName[19928:5207 (QOS:DF)] Your log message here` - * - * Where QOS is one of: - * `- UI = User Interactive` - * `- IN = User Initiated` - * `- DF = Default` - * `- UT = Utility` - * `- BG = Background` - * `- UN = Unspecified` - * - * Note: QOS will be absent in the log messages if running on OS versions that don't support it. - **/ -typedef NSString * DDQualityOfServiceName NS_STRING_ENUM; - -FOUNDATION_EXPORT DDQualityOfServiceName const DDQualityOfServiceUserInteractive NS_SWIFT_NAME(DDQualityOfServiceName.userInteractive) API_AVAILABLE(macos(10.10), ios(8.0)); -FOUNDATION_EXPORT DDQualityOfServiceName const DDQualityOfServiceUserInitiated NS_SWIFT_NAME(DDQualityOfServiceName.userInitiated) API_AVAILABLE(macos(10.10), ios(8.0)); -FOUNDATION_EXPORT DDQualityOfServiceName const DDQualityOfServiceDefault NS_SWIFT_NAME(DDQualityOfServiceName.default) API_AVAILABLE(macos(10.10), ios(8.0)); -FOUNDATION_EXPORT DDQualityOfServiceName const DDQualityOfServiceUtility NS_SWIFT_NAME(DDQualityOfServiceName.utility) API_AVAILABLE(macos(10.10), ios(8.0)); -FOUNDATION_EXPORT DDQualityOfServiceName const DDQualityOfServiceBackground NS_SWIFT_NAME(DDQualityOfServiceName.background) API_AVAILABLE(macos(10.10), ios(8.0)); -FOUNDATION_EXPORT DDQualityOfServiceName const DDQualityOfServiceUnspecified NS_SWIFT_NAME(DDQualityOfServiceName.unspecified) API_AVAILABLE(macos(10.10), ios(8.0)); - -/** - * This class provides a log formatter that prints the dispatch_queue label instead of the mach_thread_id. - * - * A log formatter can be added to any logger to format and/or filter its output. - * You can learn more about log formatters here: - * Documentation/CustomFormatters.md - * - * A typical `NSLog` (or `DDTTYLogger`) prints detailed info as `[:]`. - * For example: - * - * `2011-10-17 20:21:45.435 AppName[19928:5207] Your log message here` - * - * Where: - * `- 19928 = process id` - * `- 5207 = thread id (mach_thread_id printed in hex)` - * - * When using grand central dispatch (GCD), this information is less useful. - * This is because a single serial dispatch queue may be run on any thread from an internally managed thread pool. - * For example: - * - * `2011-10-17 20:32:31.111 AppName[19954:4d07] Message from my_serial_dispatch_queue` - * `2011-10-17 20:32:31.112 AppName[19954:5207] Message from my_serial_dispatch_queue` - * `2011-10-17 20:32:31.113 AppName[19954:2c55] Message from my_serial_dispatch_queue` - * - * This formatter allows you to replace the standard `[box:info]` with the dispatch_queue name. - * For example: - * - * `2011-10-17 20:32:31.111 AppName[img-scaling] Message from my_serial_dispatch_queue` - * `2011-10-17 20:32:31.112 AppName[img-scaling] Message from my_serial_dispatch_queue` - * `2011-10-17 20:32:31.113 AppName[img-scaling] Message from my_serial_dispatch_queue` - * - * If the dispatch_queue doesn't have a set name, then it falls back to the thread name. - * If the current thread doesn't have a set name, then it falls back to the mach_thread_id in hex (like normal). - * - * Note: If manually creating your own background threads (via `NSThread/alloc/init` or `NSThread/detachNeThread`), - * you can use `[[NSThread currentThread] setName:(NSString *)]`. - **/ -@interface DDDispatchQueueLogFormatter : NSObject - -/** - * Standard init method. - * Configure using properties as desired. - **/ -- (instancetype)init NS_DESIGNATED_INITIALIZER; - -/** - * Initializer with ability to set the queue mode - * - * @param mode choose between DDDispatchQueueLogFormatterModeShareble and DDDispatchQueueLogFormatterModeNonShareble, depending if the formatter is shared between several loggers or not - */ -- (instancetype)initWithMode:(DDDispatchQueueLogFormatterMode)mode __attribute__((deprecated("DDDispatchQueueLogFormatter is always shareable"))); - -/** - * The minQueueLength restricts the minimum size of the [detail box]. - * If the minQueueLength is set to 0, there is no restriction. - * - * For example, say a dispatch_queue has a label of "diskIO": - * - * If the minQueueLength is 0: [diskIO] - * If the minQueueLength is 4: [diskIO] - * If the minQueueLength is 5: [diskIO] - * If the minQueueLength is 6: [diskIO] - * If the minQueueLength is 7: [diskIO ] - * If the minQueueLength is 8: [diskIO ] - * - * The default minQueueLength is 0 (no minimum, so [detail box] won't be padded). - * - * If you want every [detail box] to have the exact same width, - * set both minQueueLength and maxQueueLength to the same value. - **/ -@property (assign, atomic) NSUInteger minQueueLength; - -/** - * The maxQueueLength restricts the number of characters that will be inside the [detail box]. - * If the maxQueueLength is 0, there is no restriction. - * - * For example, say a dispatch_queue has a label of "diskIO": - * - * If the maxQueueLength is 0: [diskIO] - * If the maxQueueLength is 4: [disk] - * If the maxQueueLength is 5: [diskI] - * If the maxQueueLength is 6: [diskIO] - * If the maxQueueLength is 7: [diskIO] - * If the maxQueueLength is 8: [diskIO] - * - * The default maxQueueLength is 0 (no maximum, so [detail box] won't be truncated). - * - * If you want every [detail box] to have the exact same width, - * set both minQueueLength and maxQueueLength to the same value. - **/ -@property (assign, atomic) NSUInteger maxQueueLength; - -/** - * Sometimes queue labels have long names like "com.apple.main-queue", - * but you'd prefer something shorter like simply "main". - * - * This method allows you to set such preferred replacements. - * The above example is set by default. - * - * To remove/undo a previous replacement, invoke this method with nil for the 'shortLabel' parameter. - **/ -- (nullable NSString *)replacementStringForQueueLabel:(NSString *)longLabel; - -/** - * See the `replacementStringForQueueLabel:` description - */ -- (void)setReplacementString:(nullable NSString *)shortLabel forQueueLabel:(NSString *)longLabel; - -@end - -/** - * Category on `DDDispatchQueueLogFormatter` to make method declarations easier to extend/modify - **/ -@interface DDDispatchQueueLogFormatter (OverridableMethods) - -/** - * Date formatter default configuration - */ -- (void)configureDateFormatter:(NSDateFormatter *)dateFormatter; - -/** - * Formatter method to transfrom from date to string - */ -- (NSString *)stringFromDate:(NSDate *)date; - -/** - * Method to compute the queue thread label - */ -- (NSString *)queueThreadLabelForLogMessage:(DDLogMessage *)logMessage; - -@end - -#pragma mark - DDAtomicCountable - -__attribute__((deprecated("DDAtomicCountable is useless since DDDispatchQueueLogFormatter is always shareable now"))) -@protocol DDAtomicCountable - -- (instancetype)initWithDefaultValue:(int32_t)defaultValue; -- (int32_t)increment; -- (int32_t)decrement; -- (int32_t)value; - -@end - -__attribute__((deprecated("DDAtomicCountable is deprecated"))) -@interface DDAtomicCounter: NSObject -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDFileLogger+Buffering.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDFileLogger+Buffering.h deleted file mode 100644 index f20eead..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDFileLogger+Buffering.h +++ /dev/null @@ -1,27 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface DDFileLogger (Buffering) - -- (instancetype)wrapWithBuffer; -- (instancetype)unwrapFromBuffer; - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDFileLogger.h b/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDFileLogger.h deleted file mode 100644 index bc53edb..0000000 --- a/nativeplugins/netease-Callkit/ios/CocoaLumberjack.framework/Headers/DDFileLogger.h +++ /dev/null @@ -1,530 +0,0 @@ -// Software License Agreement (BSD License) -// -// Copyright (c) 2010-2021, Deusty, LLC -// All rights reserved. -// -// Redistribution and use of this software in source and binary forms, -// with or without modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Neither the name of Deusty nor the names of its contributors may be used -// to endorse or promote products derived from this software without specific -// prior written permission of Deusty, LLC. - -// Disable legacy macros -#ifndef DD_LEGACY_MACROS - #define DD_LEGACY_MACROS 0 -#endif - -#import - -@class DDLogFileInfo; - -NS_ASSUME_NONNULL_BEGIN - -/** - * This class provides a logger to write log statements to a file. - **/ - - -// Default configuration and safety/sanity values. -// -// maximumFileSize -> kDDDefaultLogMaxFileSize -// rollingFrequency -> kDDDefaultLogRollingFrequency -// maximumNumberOfLogFiles -> kDDDefaultLogMaxNumLogFiles -// logFilesDiskQuota -> kDDDefaultLogFilesDiskQuota -// -// You should carefully consider the proper configuration values for your application. - -extern unsigned long long const kDDDefaultLogMaxFileSize; -extern NSTimeInterval const kDDDefaultLogRollingFrequency; -extern NSUInteger const kDDDefaultLogMaxNumLogFiles; -extern unsigned long long const kDDDefaultLogFilesDiskQuota; - - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * The LogFileManager protocol is designed to allow you to control all aspects of your log files. - * - * The primary purpose of this is to allow you to do something with the log files after they have been rolled. - * Perhaps you want to compress them to save disk space. - * Perhaps you want to upload them to an FTP server. - * Perhaps you want to run some analytics on the file. - * - * A default LogFileManager is, of course, provided. - * The default LogFileManager simply deletes old log files according to the maximumNumberOfLogFiles property. - * - * This protocol provides various methods to fetch the list of log files. - * - * There are two variants: sorted and unsorted. - * If sorting is not necessary, the unsorted variant is obviously faster. - * The sorted variant will return an array sorted by when the log files were created, - * with the most recently created log file at index 0, and the oldest log file at the end of the array. - * - * You can fetch only the log file paths (full path including name), log file names (name only), - * or an array of `DDLogFileInfo` objects. - * The `DDLogFileInfo` class is documented below, and provides a handy wrapper that - * gives you easy access to various file attributes such as the creation date or the file size. - */ -@protocol DDLogFileManager -@required - -// Public properties - -/** - * The maximum number of archived log files to keep on disk. - * For example, if this property is set to 3, - * then the LogFileManager will only keep 3 archived log files (plus the current active log file) on disk. - * Once the active log file is rolled/archived, then the oldest of the existing 3 rolled/archived log files is deleted. - * - * You may optionally disable this option by setting it to zero. - **/ -@property (readwrite, assign, atomic) NSUInteger maximumNumberOfLogFiles; - -/** - * The maximum space that logs can take. On rolling logfile all old log files that exceed logFilesDiskQuota will - * be deleted. - * - * You may optionally disable this option by setting it to zero. - **/ -@property (readwrite, assign, atomic) unsigned long long logFilesDiskQuota; - -// Public methods - -/** - * Returns the logs directory (path) - */ -@property (nonatomic, readonly, copy) NSString *logsDirectory; - -/** - * Returns an array of `NSString` objects, - * each of which is the filePath to an existing log file on disk. - **/ -@property (nonatomic, readonly, strong) NSArray *unsortedLogFilePaths; - -/** - * Returns an array of `NSString` objects, - * each of which is the fileName of an existing log file on disk. - **/ -@property (nonatomic, readonly, strong) NSArray *unsortedLogFileNames; - -/** - * Returns an array of `DDLogFileInfo` objects, - * each representing an existing log file on disk, - * and containing important information about the log file such as it's modification date and size. - **/ -@property (nonatomic, readonly, strong) NSArray *unsortedLogFileInfos; - -/** - * Just like the `unsortedLogFilePaths` method, but sorts the array. - * The items in the array are sorted by creation date. - * The first item in the array will be the most recently created log file. - **/ -@property (nonatomic, readonly, strong) NSArray *sortedLogFilePaths; - -/** - * Just like the `unsortedLogFileNames` method, but sorts the array. - * The items in the array are sorted by creation date. - * The first item in the array will be the most recently created log file. - **/ -@property (nonatomic, readonly, strong) NSArray *sortedLogFileNames; - -/** - * Just like the `unsortedLogFileInfos` method, but sorts the array. - * The items in the array are sorted by creation date. - * The first item in the array will be the most recently created log file. - **/ -@property (nonatomic, readonly, strong) NSArray *sortedLogFileInfos; - -// Private methods (only to be used by DDFileLogger) - -/** - * Generates a new unique log file path, and creates the corresponding log file. - * This method is executed directly on the file logger's internal queue. - * The file has to exist by the time the method returns. - **/ -- (nullable NSString *)createNewLogFileWithError:(NSError **)error; - -@optional - -// Private methods (only to be used by DDFileLogger) -/** - * Creates a new log file ignoring any errors. Deprecated in favor of `-createNewLogFileWithError:`. - * Will only be called if `-createNewLogFileWithError:` is not implemented. - **/ -- (nullable NSString *)createNewLogFile __attribute__((deprecated("Use -createNewLogFileWithError:"))) NS_SWIFT_UNAVAILABLE("Use -createNewLogFileWithError:"); - -// Notifications from DDFileLogger - -/// Called when a log file was archived. Executed on global queue with default priority. -/// @param logFilePath The path to the log file that was archived. -/// @param wasRolled Whether or not the archiving happend after rolling the log file. -- (void)didArchiveLogFile:(NSString *)logFilePath wasRolled:(BOOL)wasRolled NS_SWIFT_NAME(didArchiveLogFile(atPath:wasRolled:)); - -// Deprecated APIs -/** - * Called when a log file was archived. Executed on global queue with default priority. - */ -- (void)didArchiveLogFile:(NSString *)logFilePath NS_SWIFT_NAME(didArchiveLogFile(atPath:)) __attribute__((deprecated("Use -didArchiveLogFile:wasRolled:"))); - -/** - * Called when the roll action was executed and the log was archived. - * Executed on global queue with default priority. - */ -- (void)didRollAndArchiveLogFile:(NSString *)logFilePath NS_SWIFT_NAME(didRollAndArchiveLogFile(atPath:)) __attribute__((deprecated("Use -didArchiveLogFile:wasRolled:"))); - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Default log file manager. - * - * All log files are placed inside the logsDirectory. - * If a specific logsDirectory isn't specified, the default directory is used. - * On Mac, this is in `~/Library/Logs/`. - * On iPhone, this is in `~/Library/Caches/Logs`. - * - * Log files are named `"