Skip to content

P
PhoneManager
Commit 0c678b4e authored by shenyong's avatar shenyong
Browse files
Options

2.2.6 新增facekbook

parent 83414e4a
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 6 deletions
PhoneManager.xcodeproj/project.pbxproj
View file @ 0c678b4e
......@@ -10,6 +10,8 @@
042EF7462DD4A3F90028DE2C /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 042EF7452DD4A3F90028DE2C /* Kingfisher */; };
046463832DDF5A48008C852D /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 046463822DDF5A48008C852D /* FirebaseAnalytics */; };
046463852DDF5A48008C852D /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = 046463842DDF5A48008C852D /* FirebaseCore */; };
04762C652E1F5C0900381F9C /* FacebookCore in Frameworks */ = {isa = PBXBuildFile; productRef = 04762C642E1F5C0900381F9C /* FacebookCore */; };
04762C672E1F5C0F00381F9C /* FacebookBasics in Frameworks */ = {isa = PBXBuildFile; productRef = 04762C662E1F5C0F00381F9C /* FacebookBasics */; };
0496DEF32D9E3F58005B2834 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04BD915D2D9D68AD00055CEB /* WidgetKit.framework */; };
0496DEF42D9E3F58005B2834 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04BD915F2D9D68AD00055CEB /* SwiftUI.framework */; };
0496DEFF2D9E3F59005B2834 /* widgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 0496DEF22D9E3F57005B2834 /* widgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
......@@ -232,10 +234,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
04762C652E1F5C0900381F9C /* FacebookCore in Frameworks */,
04C299E62DDE026D0054D76C /* AppTrackingTransparency.framework in Frameworks */,
04BBB4E62DC0748F00D7E3AB /* StoreKit.framework in Frameworks */,
04C299E42DDE025D0054D76C /* AdServices.framework in Frameworks */,
04C299E22DDE02530054D76C /* AdSupport.framework in Frameworks */,
04762C672E1F5C0F00381F9C /* FacebookBasics in Frameworks */,
042EF7462DD4A3F90028DE2C /* Kingfisher in Frameworks */,
3A00E856852A8783E544CD7D /* Pods_PhoneManager.framework in Frameworks */,
046463852DDF5A48008C852D /* FirebaseCore in Frameworks */,
......@@ -433,6 +437,7 @@
042EF7442DD4A3780028DE2C /* XCRemoteSwiftPackageReference "Kingfisher" */,
04CA06602DDDB3F8009A15E3 /* XCRemoteSwiftPackageReference "keychain-swift" */,
046463812DDF5A1F008C852D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
04762C632E1F5BF600381F9C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = EB388E5C2D8A61A800629B0D /* Products */;
......@@ -830,7 +835,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.5;
MARKETING_VERSION = 2.2.6;
PRODUCT_BUNDLE_IDENTIFIER = com.app.phonemanager;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -878,7 +883,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.5;
MARKETING_VERSION = 2.2.6;
PRODUCT_BUNDLE_IDENTIFIER = com.app.phonemanager;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -1081,6 +1086,14 @@
minimumVersion = 11.14.0;
};
};
04762C632E1F5BF600381F9C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/facebook/facebook-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 14.1.0;
};
};
04CA06602DDDB3F8009A15E3 /* XCRemoteSwiftPackageReference "keychain-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/evgenyneu/keychain-swift.git";
......@@ -1115,6 +1128,16 @@
package = 046463812DDF5A1F008C852D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCore;
};
04762C642E1F5C0900381F9C /* FacebookCore */ = {
isa = XCSwiftPackageProductDependency;
package = 04762C632E1F5BF600381F9C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */;
productName = FacebookCore;
};
04762C662E1F5C0F00381F9C /* FacebookBasics */ = {
isa = XCSwiftPackageProductDependency;
package = 04762C632E1F5BF600381F9C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */;
productName = FacebookBasics;
};
04CA06612DDDB40E009A15E3 /* KeychainSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 04CA06602DDDB3F8009A15E3 /* XCRemoteSwiftPackageReference "keychain-swift" */;
......
PhoneManager.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file @ 0c678b4e
{
"originHash" : "adb191961c40e5f91d7183a69d699ffc93b7484a9bff6bcd805acc4dafe394ba",
"originHash" : "86066c3a194320876591f7adc3a5347774aa98f48bff9fc0440ef924801fdeb6",
"pins" : [
{
"identity" : "abseil-cpp-binary",
......@@ -28,6 +28,15 @@
"version" : "1.7.6"
}
},
{
"identity" : "facebook-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/facebook/facebook-ios-sdk",
"state" : {
"revision" : "c19607d535864533523d1f437c84035e5fb101cf",
"version" : "14.1.0"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
......
PhoneManager/AppDelegate.swift
View file @ 0c678b4e
......@@ -13,6 +13,7 @@ import UserMessagingPlatform
import GoogleSignIn
import AdjustSdk
import FirebaseCore
import FacebookCore
@main
class AppDelegate: UIResponder, UIApplicationDelegate {
......@@ -20,6 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
UIViewController.swizzleViewDidAppear()
setupDefault()
......@@ -89,9 +91,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
PMLoadingHUD.share.config()
UNUserNotificationCenter.current().delegate = self
ApplicationDelegate.shared.application(
application,
didFinishLaunchingWithOptions: launchOptions
)
return true
}
func applicationWillTerminate(_ application: UIApplication) {
// 保存单利中所有垃圾桶的数据
saveDataToTrashDB(data: Singleton.shared.trashData)
......@@ -229,7 +239,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
open url: URL,
options: [UIApplication.OpenURLOptionsKey: Any] = [:]
) -> Bool {
ApplicationDelegate.shared.application(
app,
open: url,
sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String,
annotation: options[UIApplication.OpenURLOptionsKey.annotation]
)
return GIDSignIn.sharedInstance.handle(url)
}
func convertToSwiftDictionary(_ nsDict: NSDictionary) -> [String: Any] {
......
PhoneManager/AppDelegateEx.swift
View file @ 0c678b4e
......@@ -96,6 +96,10 @@ extension AppDelegate:AdjustDelegate{
Print("归因变化上报",pram)
APIReportManager.shared.startReport(type: .source_atrribute,ext: pram)
}
func configFackBook(){
}
}
......
PhoneManager/Class/Manager/ADManager/ADManager.swift
View file @ 0c678b4e
......@@ -56,8 +56,8 @@ class ADManager : NSObject, FullScreenContentDelegate {
/// 记录插屏上次展示广告的时间
private var interstitiallastAdShowTime: Date?
private var currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "2.2.5"
var onlineVersion = "2.2.5"
private var currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "2.2.6"
var onlineVersion = "2.2.6"
/// 默认每日免费删除次数
......@@ -639,7 +639,7 @@ extension ADManager{
}
func dealVersionShowAD() -> Bool {
let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "2.2.5"
let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "2.2.6"
// 将版本号按点号分割成数组
let currentComponents = currentVersion.components(separatedBy: ".")
......
PhoneManager/Info.plist
View file @ 0c678b4e
......@@ -13,7 +13,9 @@
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>com.app.phonemanager</string>
<string>com.googleusercontent.apps.684306808588-cl093f79dogls1a608bh8oclk3ia0rig</string>
<string>fb1215366190026100</string>
</array>
</dict>
</array>
......@@ -21,6 +23,12 @@
<string>ca-app-pub-3480207748580737~4236262472</string>
<key>GIDClientID</key>
<string>684306808588-cl093f79dogls1a608bh8oclk3ia0rig.apps.googleusercontent.com</string>
<key>FacebookAppID</key>
<string>1215366190026100</string>
<key>FacebookClientToken</key>
<string>827d6264bbcaeda36ad90f13b38ae23d</string>
<key>FacebookDisplayName</key>
<string>PhoneManager</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
......
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