Skip to content

P
PhoneManager
Commit 86e200c3 authored by shenyong's avatar shenyong
Browse files
Options

fix bugs

parent 06466b26
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 13 deletions
PhoneManager.xcodeproj/project.pbxproj
View file @ 86e200c3
...@@ -377,6 +377,7 @@ ...@@ -377,6 +377,7 @@
04BD7A3E2DA3B8F100A24C4B /* Embed ExtensionKit Extensions */, 04BD7A3E2DA3B8F100A24C4B /* Embed ExtensionKit Extensions */,
75241895C9BA1036299CA526 /* [CP] Copy Pods Resources */, 75241895C9BA1036299CA526 /* [CP] Copy Pods Resources */,
0436B1F42DE061E30075159B /* Embed Frameworks */, 0436B1F42DE061E30075159B /* Embed Frameworks */,
04E86D9F2DE0F96F008269AC /* ShellScript */,
); );
buildRules = ( buildRules = (
); );
...@@ -478,6 +479,23 @@ ...@@ -478,6 +479,23 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
04E86D9F2DE0F96F008269AC /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\n\n# 修复FBAudienceNetwork框架的代码签名标识符问题\n# 解决签名标识符与Bundle Identifier不匹配的问题\n\n# 框架路径配置\nFRAMEWORK_NAME=\"FBAudienceNetwork.framework\"\nFRAMEWORK_DIR=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/${FRAMEWORK_NAME}\"\nINFO_PLIST=\"${FRAMEWORK_DIR}/Info.plist\"\nFRAMEWORK_BINARY=\"${FRAMEWORK_DIR}/${FRAMEWORK_NAME%.*}\"\n\n# 检查文件是否存在\nif [ ! -f \"$INFO_PLIST\" ]; then\n echo \"警告: 未找到${FRAMEWORK_NAME}的Info.plist文件，跳过修复步骤\"\n exit 0\nfi\n\nif [ ! -f \"$FRAMEWORK_BINARY\" ]; then\n echo \"警告: 未找到${FRAMEWORK_NAME}的二进制文件，跳过修复步骤\"\n exit 0\nfi\n\necho \"开始修复${FRAMEWORK_NAME}的代码签名标识符问题...\"\n\n# 设置正确的Bundle Identifier\n# 使用Facebook官方推荐的格式\nCORRECT_BUNDLE_IDENTIFIER=\"com.facebook.${FRAMEWORK_NAME%.*}\"\n\n# 修改Info.plist中的CFBundleIdentifier\necho \"设置CFBundleIdentifier为: $CORRECT_BUNDLE_IDENTIFIER\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleIdentifier $CORRECT_BUNDLE_IDENTIFIER\" \"$INFO_PLIST\"\n\n# 确保Info.plist包含CFBundleVersion\nCURRENT_VERSION=$(/usr/libexec/PlistBuddy -c \"Print CFBundleShortVersionString\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\" 2>/dev/null)\nif [ -z \"$CURRENT_VERSION\" ]; then\n CURRENT_VERSION=\"1.0.0\"\nfi\necho \"设置CFBundleVersion为: $CURRENT_VERSION\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $CURRENT_VERSION\" \"$INFO_PLIST\"\n\n# 创建临时entitlements文件\nENTITLEMENTS_FILE=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORK_NAME%.*}.entitlements\"\necho \"创建entitlements文件: $ENTITLEMENTS_FILE\"\n\ncat > \"$ENTITLEMENTS_FILE\" << EOF\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n <key>application-identifier</key>\n <string>\\$(AppIdentifierPrefix)$CORRECT_BUNDLE_IDENTIFIER</string>\n <key>com.apple.developer.team-identifier</key>\n <string>$DEVELOPMENT_TEAM</string>\n</dict>\n</plist>\nEOF\n\n# 重新签名框架\necho \"使用正确的标识符重新签名 ${FRAMEWORK_NAME}...\"\ncodesign --force --sign \"$EXPANDED_CODE_SIGN_IDENTITY\" --entitlements \"$ENTITLEMENTS_FILE\" \"$FRAMEWORK_BINARY\"\n\n# 验证签名\necho \"验证签名状态:\"\ncodesign -dv \"$FRAMEWORK_BINARY\"\n\necho \"${FRAMEWORK_NAME}代码签名标识符修复完成!\"\n";
};
594FD43819933850E07C4C9C /* [CP] Check Pods Manifest.lock */ = { 594FD43819933850E07C4C9C /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -798,7 +816,7 @@ ...@@ -798,7 +816,7 @@
CODE_SIGN_ENTITLEMENTS = PhoneManager/PhoneManager.entitlements; CODE_SIGN_ENTITLEMENTS = PhoneManager/PhoneManager.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 6K23946NQ5; DEVELOPMENT_TEAM = 6K23946NQ5;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = PhoneManager/Info.plist; INFOPLIST_FILE = PhoneManager/Info.plist;
...@@ -847,7 +865,7 @@ ...@@ -847,7 +865,7 @@
CODE_SIGN_ENTITLEMENTS = PhoneManager/PhoneManager.entitlements; CODE_SIGN_ENTITLEMENTS = PhoneManager/PhoneManager.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 6K23946NQ5; DEVELOPMENT_TEAM = 6K23946NQ5;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = PhoneManager/Info.plist; INFOPLIST_FILE = PhoneManager/Info.plist;
......
PhoneManager/Class/Manager/APIReport/APIReportManager.swift
View file @ 86e200c3
...@@ -68,12 +68,13 @@ struct APIReportManager{ ...@@ -68,12 +68,13 @@ struct APIReportManager{
} }
private func getbpBody() ->[String:String]{ private func getbpBody() ->[String:String]{
var DEBUG = true // var DEBUG = true
#if DEBUG // #if DEBUG
DEBUG = true // DEBUG = true
#else // #else
DEBUG = false // DEBUG = false
#endif // #endif
let DEBUG = false
let body = [ let body = [
"\(bundleId)_3": "\(Device.current)", //手机型号 "\(bundleId)_3": "\(Device.current)", //手机型号
"\(bundleId)_4": "Apple", // 手机厂商 "\(bundleId)_4": "Apple", // 手机厂商
......
PhoneManager/Class/Page/Advertisement/Manager/AdvManager.swift
View file @ 86e200c3
...@@ -23,12 +23,12 @@ enum AdvertisementType { ...@@ -23,12 +23,12 @@ enum AdvertisementType {
class AdvManager : NSObject, FullScreenContentDelegate { class AdvManager : NSObject, FullScreenContentDelegate {
// fixme:上线前更改 // fixme:上线前更改
// private static let REWARDED_INTERSTITIALAD_KEY : String = "ca-app-pub-3480207748580737/4276457203" private static let REWARDED_INTERSTITIALAD_KEY : String = "ca-app-pub-3480207748580737/4276457203"
// private static let INTERSTITIALAD_KEY : String = "ca-app-pub-3480207748580737/5836950888" private static let INTERSTITIALAD_KEY : String = "ca-app-pub-3480207748580737/5836950888"
// info.plist: ca-app-pub-3480207748580737~4236262472 // info.plist: ca-app-pub-3480207748580737~4236262472
private static let REWARDED_INTERSTITIALAD_KEY : String = "ca-app-pub-3940256099942544/6978759866" // private static let REWARDED_INTERSTITIALAD_KEY : String = "ca-app-pub-3940256099942544/6978759866"
private static let INTERSTITIALAD_KEY : String = "ca-app-pub-3940256099942544/4411468910" // private static let INTERSTITIALAD_KEY : String = "ca-app-pub-3940256099942544/4411468910"
static let shared : AdvManager = AdvManager() static let shared : AdvManager = AdvManager()
......
PhoneManager/Info.plist
View file @ 86e200c3
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>com.photomanagerapp.task</string>
</array>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -14,7 +18,7 @@ ...@@ -14,7 +18,7 @@
</dict> </dict>
</array> </array>
<key>GADApplicationIdentifier</key> <key>GADApplicationIdentifier</key>
<string>ca-app-pub-3940256099942544~1458002511</string> <string>ca-app-pub-3480207748580737~4236262472</string>
<key>GIDClientID</key> <key>GIDClientID</key>
<string>684306808588-cl093f79dogls1a608bh8oclk3ia0rig.apps.googleusercontent.com</string> <string>684306808588-cl093f79dogls1a608bh8oclk3ia0rig.apps.googleusercontent.com</string>
<key>LSApplicationQueriesSchemes</key> <key>LSApplicationQueriesSchemes</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment