Skip to content

P
PhoneManager
Commit 8c1d49c2 authored by CZ1004's avatar CZ1004
Browse files
Options

Merge branch 'dev_main' into dev_zhaoqian 

* dev_main:
  1
  广告收入上报
  ui 调整
  ui 调整
parents 5976d431 9779b105
Show whitespace changes
Inline Side-by-side
Showing with 1132 additions and 205 deletions
PhoneManager.xcodeproj/project.pbxproj
View file @ 8c1d49c2
......@@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */
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 */; };
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, ); }; };
......@@ -210,8 +212,10 @@
04C299E22DDE02530054D76C /* AdSupport.framework in Frameworks */,
042EF7462DD4A3F90028DE2C /* Kingfisher in Frameworks */,
3A00E856852A8783E544CD7D /* Pods_PhoneManager.framework in Frameworks */,
046463852DDF5A48008C852D /* FirebaseCore in Frameworks */,
04CA06622DDDB40E009A15E3 /* KeychainSwift in Frameworks */,
04EC294B2DD33B480049739A /* GoogleSignIn in Frameworks */,
046463832DDF5A48008C852D /* FirebaseAnalytics in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -402,6 +406,7 @@
04EC26182DD33B070049739A /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
042EF7442DD4A3780028DE2C /* XCRemoteSwiftPackageReference "Kingfisher" */,
04CA06602DDDB3F8009A15E3 /* XCRemoteSwiftPackageReference "keychain-swift" */,
046463812DDF5A1F008C852D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = EB388E5C2D8A61A800629B0D /* Products */;
......@@ -1027,6 +1032,14 @@
minimumVersion = 8.3.2;
};
};
046463812DDF5A1F008C852D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 11.13.0;
};
};
04CA06602DDDB3F8009A15E3 /* XCRemoteSwiftPackageReference "keychain-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/evgenyneu/keychain-swift.git";
......@@ -1051,6 +1064,16 @@
package = 042EF7442DD4A3780028DE2C /* XCRemoteSwiftPackageReference "Kingfisher" */;
productName = Kingfisher;
};
046463822DDF5A48008C852D /* FirebaseAnalytics */ = {
isa = XCSwiftPackageProductDependency;
package = 046463812DDF5A1F008C852D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAnalytics;
};
046463842DDF5A48008C852D /* FirebaseCore */ = {
isa = XCSwiftPackageProductDependency;
package = 046463812DDF5A1F008C852D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCore;
};
04CA06612DDDB40E009A15E3 /* KeychainSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 04CA06602DDDB3F8009A15E3 /* XCRemoteSwiftPackageReference "keychain-swift" */;
......
PhoneManager.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file @ 8c1d49c2
{
"originHash" : "de1a4dc6f64c5ce471b3f7c477ef76458170ad953fc5100955926b1f2889707a",
"originHash" : "adb191961c40e5f91d7183a69d699ffc93b7484a9bff6bcd805acc4dafe394ba",
"pins" : [
{
"identity" : "abseil-cpp-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
"version" : "1.2024072200.0"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
......@@ -19,6 +28,33 @@
"version" : "1.7.6"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "3663b1aa6c7a1bed67ee80fd09dc6d0f9c3bb660",
"version" : "11.13.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "543071966b3fb6613a2fc5c6e7112d1e998184a7",
"version" : "11.13.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
"version" : "10.1.0"
}
},
{
"identity" : "googlesignin-ios",
"kind" : "remoteSourceControl",
......@@ -37,6 +73,15 @@
"version" : "8.1.0"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "cc0001a0cf963aa40501d9c2b181e7fc9fd8ec71",
"version" : "1.69.0"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
......@@ -55,6 +100,15 @@
"version" : "4.1.1"
}
},
{
"identity" : "interop-ios-for-google-sdks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
"state" : {
"revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
"version" : "101.0.0"
}
},
{
"identity" : "keychain-swift",
"kind" : "remoteSourceControl",
......@@ -73,6 +127,24 @@
"version" : "8.3.2"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
}
},
{
"identity" : "promises",
"kind" : "remoteSourceControl",
......@@ -81,6 +153,15 @@
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "d72aed98f8253ec1aa9ea1141e28150f408cf17f",
"version" : "1.29.0"
}
}
],
"version" : 3
......
PhoneManager/AppDelegate.swift
View file @ 8c1d49c2
......@@ -12,7 +12,7 @@ import GoogleMobileAds
import UserMessagingPlatform
import GoogleSignIn
import AdjustSdk
import FirebaseCore
@main
class AppDelegate: UIResponder, UIApplicationDelegate {
......@@ -40,6 +40,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
widgetAppgourp.share.PushWidgetData(battery: Int(battery), storage: Int(storage))
//初始化adjust
let yourAppToken = "6mouvwgw7ksg"
......@@ -68,6 +69,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// 初始化广告SDK
AdvManager.shared.initAdertisementSDK()
FirebaseApp.configure()
PMEmailManager.shareManager.restore()
SettingConfiguration.share.initData()
HapticManager.share.setupHapticEngine()
......@@ -79,26 +81,26 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
Adjust.attribution { attribution in
// Print("获取归因数据11",attribution?.jsonResponse)
Print("获取当前归因信息",attribution as Any)
// if let dic = attribution?.jsonResponse{
// let pram = self.convertToSwiftDictionary(dic as NSDictionary)
// APIReportManager.shared.startReport(type: .source_atrribute,ext: pram)
// }
// let pram = [
// "trackerToken":attribution?.trackerToken ?? "",
// "trackerName":attribution?.trackerName ?? "",
// "tracker_token":attribution?.trackerToken ?? "",
// "tracker_name":attribution?.trackerName ?? "",
// "network":attribution?.network ?? "",
// "campaign":attribution?.campaign ?? "",
// "adgroup":attribution?.adgroup ?? "",
// "creative":attribution?.creative ?? "",
// "clickLabel":attribution?.clickLabel ?? "",
// "costType":attribution?.costType ?? "",
// "costAmount":attribution?.costAmount ?? "",
// "costCurrency":attribution?.costCurrency ?? "",
// "click_label":attribution?.clickLabel ?? "",
// "cost_type":attribution?.costType ?? "",
// "cost_amount":attribution?.costAmount ?? "",
// "cost_currency":attribution?.costCurrency ?? "0"
// ]
// let dic = attribution.jso
Print("获取当前归因信息",attribution?.jsonResponse as Any)
//APIReportManager.shared.startReport(type: .source_atrribute,ext: pram)
// Print("归因字典",pram)
// Print("归因json",attribution?.jsonResponse)
}
PMLoadingHUD.share.config()
......@@ -225,5 +227,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return GIDSignIn.sharedInstance.handle(url)
}
func convertToSwiftDictionary(_ nsDict: NSDictionary) -> [String: Any] {
return nsDict as? [String: Any] ?? [:]
}
}
PhoneManager/AppDelegateEx.swift
View file @ 8c1d49c2
......@@ -62,8 +62,11 @@ extension AppDelegate:AdjustDelegate{
func adjustAttributionChanged(_ attribution: ADJAttribution?) {
guard let attribution = attribution else { return }
// 可以将这些数据上报给自己的服务器或者做其他处理
print("归因变化数据：", attribution.jsonResponse)
Print("归因变化数据",attribution.jsonResponse as Any)
if let dic = attribution.jsonResponse{
let pram = self.convertToSwiftDictionary(dic as NSDictionary)
APIReportManager.shared.startReport(type: .source_atrribute,ext: pram)
}
}
}
PhoneManager/Assets.xcassets/Home/Frame 1.imageset/Contents.json
View file @ 8c1d49c2
{
"images" : [
{
"filename" : "Frame.png",
"idiom" : "universal",
"scale" : "1x"
},
......
PhoneManager/Assets.xcassets/Home/pm-home-Frame-del.imageset/Contents.json 0 → 100644
View file @ 8c1d49c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pm-home-Frame-del@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pm-home-Frame-del@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
PhoneManager/Assets.xcassets/Home/重复项说明-icon-未选中.imageset/Contents.json
View file @ 8c1d49c2
{
"images" : [
{
"filename" : "重复项说明-icon-未选中.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "重复项说明-icon-未选中@2x.png",
"filename" : "Frame@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "重复项说明-icon-未选中@3x.png",
"filename" : "Frame@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
PhoneManager/Class/Manager/IAPManager/IAPManager.swift
View file @ 8c1d49c2
......@@ -114,11 +114,7 @@ class IAPManager: NSObject {
// 是否热启动
var isHotLaunch:Bool = false
// 订阅状态
var subscriptionType:SubscriptionType = .none{
didSet{
isSubscribed = subscriptionType != .none
}
}
var subscriptionType:SubscriptionType = .none
func config(){}
......
PhoneManager/Class/Page/Advertisement/Manager/AdvManager.swift
View file @ 8c1d49c2
......@@ -10,6 +10,7 @@ import GoogleMobileAds
import UserMessagingPlatform
import AppTrackingTransparency
import AdSupport
import AppLovinSDK
enum AdvertisementType {
case rewardedInterstitialType
......@@ -20,8 +21,8 @@ enum AdvertisementType {
class AdvManager : NSObject, FullScreenContentDelegate {
// fixme:上线前更改
// 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 REWARDED_INTERSTITIALAD_KEY : String = "ca-app-pub-3480207748580737/4276457203"
// private static let INTERSTITIALAD_KEY : String = "ca-app-pub-3480207748580737/5836950888"
// info.plist: ca-app-pub-3480207748580737~4236262472
private static let REWARDED_INTERSTITIALAD_KEY : String = "ca-app-pub-3940256099942544/6978759866"
......@@ -94,14 +95,26 @@ class AdvManager : NSObject, FullScreenContentDelegate {
/// 初始化SDK
func initAdertisementSDK() {
// Initialize the Google Mobile Ads SDK.
MobileAds.shared.start()
// Request an ad.
ALPrivacySettings.setDoNotSell(true)
MobileAds.shared.start { status in
let adapterStatuses = status.adapterStatusesByClassName
for adapter in adapterStatuses {
let adapterStatus = adapter.value
NSLog("Adapter Name: %@, Description: %@, Latency: %f", adapter.key,
adapterStatus.description, adapterStatus.latency)
}
Task {
// 同时load两个广告内容
await self.loadInterstitial()
await self.loadRewardedInterstitialAd()
}
// 隐私设置
ALPrivacySettings.setHasUserConsent(true)
}
}
/// 获取激励插页广告
......@@ -112,6 +125,26 @@ class AdvManager : NSObject, FullScreenContentDelegate {
rewardedInterstitialAd = try await RewardedInterstitialAd.load(
with: AdvManager.REWARDED_INTERSTITIALAD_KEY, request: Request())
rewardedInterstitialAd?.fullScreenContentDelegate = self
rewardedInterstitialAd?.paidEventHandler = {[weak self] value in
guard let weakSelf = self else { return }
print("激励广告价值回调",value)
let valueMicros = value.value
let currencyCode = value.currencyCode
let precision = value.precision
// 获取基础广告信息
var pram = weakSelf.loadedAdNetworkResponseInfo(ad: weakSelf.rewardedInterstitialAd)
// // 添加价值相关信息到 pram 字典中
pram["valueMicros"] = "\(valueMicros)"
pram["currencyCode"] = currencyCode
pram["precision"] = "\(precision.rawValue)"
print("广告价值和来源", pram)
// 使用 APIReportManager 上报广告价值
APIReportManager().startReport(type: .ad_price, ext: pram)
}
APIReportManager.shared.startReport(
type: .ad_pull,
ext: ["ad_type":"rewardAd",
......@@ -140,6 +173,26 @@ class AdvManager : NSObject, FullScreenContentDelegate {
interstitial = try await InterstitialAd.load(
with: AdvManager.INTERSTITIALAD_KEY, request: Request())
interstitial?.fullScreenContentDelegate = self
interstitial?.paidEventHandler = {[weak self] value in
guard let weakSelf = self else { return }
print("插屏广告价值回调",value)
let valueMicros = value.value
let currencyCode = value.currencyCode
let precision = value.precision
// 获取基础广告信息
var pram = weakSelf.loadedAdNetworkResponseInfo(ad: weakSelf.interstitial)
// // 添加价值相关信息到 pram 字典中
pram["valueMicros"] = "\(valueMicros)"
pram["currencyCode"] = currencyCode
pram["precision"] = "\(precision.rawValue)"
print("广告价值和来源", pram)
// 使用 APIReportManager 上报广告价值
APIReportManager().startReport(type: .ad_price, ext: pram)
}
APIReportManager.shared.startReport(
type: .ad_pull,
ext: ["ad_type":"interAd",
......@@ -296,7 +349,7 @@ class AdvManager : NSObject, FullScreenContentDelegate {
extension AdvManager{
func loadedAdNetworkResponseInfo(ad: FullScreenPresentingAd) ->[String:String]{
func loadedAdNetworkResponseInfo(ad: FullScreenPresentingAd?) ->[String:String]{
var adNetworkName = ""
var adSourceName = ""
......@@ -314,6 +367,7 @@ extension AdvManager{
adSourceInstanceID = rewardedAd.responseInfo.loadedAdNetworkResponseInfo?.adSourceInstanceID ?? "unknown"
} else if let interstitialAd = ad as? InterstitialAd {
adNetworkName = interstitialAd.responseInfo.loadedAdNetworkResponseInfo?.adNetworkClassName ?? "unknown"
adSourceName = interstitialAd.responseInfo.loadedAdNetworkResponseInfo?.adSourceName ?? "unknown"
adSourceID = interstitialAd.responseInfo.loadedAdNetworkResponseInfo?.adSourceID ?? "unknown"
......@@ -322,22 +376,24 @@ extension AdvManager{
adSourceInstanceID = interstitialAd.responseInfo.loadedAdNetworkResponseInfo?.adSourceInstanceID ?? "unknown"
}
var ad_type = "interAd"
if let _ = ad as? RewardedInterstitialAd{
ad_type = "rewardAd"
}
let pram = [
"ad_type": ad_type,
var pram = [
"from":currentVCName,
"networkname":adNetworkName,
"source":adSourceName,
"adSourceName":adSourceName,
"adSourceInstanceName":adSourceInstanceName,
"adSourceID":adSourceID,
"adSourceId":adSourceID,
"adNetworkClassName":adNetworkClassName,
"adSourceInstanceID":adSourceInstanceID
"adSourceInstanceId":adSourceInstanceID,
]
if let rewardAd = ad as? RewardedInterstitialAd{
pram["ad_type"] = "rewardAd"
pram["adUnitId"] = rewardAd.adUnitID
}else if let interstitial = ad as? InterstitialAd{
pram["ad_type"] = "interAd"
pram["adUnitId"] = interstitial.adUnitID
}
return pram
}
}
......
PhoneManager/Class/Page/Compress/View/CompressCustomHeaderView.swift
View file @ 8c1d49c2
......@@ -41,7 +41,7 @@ class CompressCustomHeaderView: UICollectionReusableView{
lazy var filterButton : UIButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "Frame 1"), for: .normal)
button.setTitle("The largest", for: .normal)
button.setTitle("largest", for: .normal)
button.layer.cornerRadius = 14
button.clipsToBounds = true
button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)
......
PhoneManager/Class/Page/Home/Controller/HomePhotosDetailViewController.swift
View file @ 8c1d49c2
......@@ -126,7 +126,7 @@ class HomePhotosDetailViewController : BaseViewController {
lazy var trashSubView : TrashSubView = {
let view = TrashSubView()
view.backgroundColor = .white
view.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
view.isHidden = true
return view
}()
......
PhoneManager/Class/Page/Home/Controller/HomeVideoDetailController.swift
View file @ 8c1d49c2
......@@ -101,7 +101,7 @@ class HomeVideoDetailController :BaseViewController {
lazy var trashSubView : TrashSubView = {
let view = TrashSubView()
view.backgroundColor = .white
view.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
view.tipLabel.text = "The video in the trash can"
view.isHidden = true
return view
......
PhoneManager/Class/Page/Home/Controller/HomeViewController.swift
View file @ 8c1d49c2
......@@ -251,7 +251,7 @@ class HomeViewController:BaseViewController {
DispatchQueue.main.async {
if !IAPManager.share.showYearPage{
HomePayViewController.show {
NotificationManager().configNotifications()
// NotificationManager().configNotifications()
}
}
}
......@@ -291,7 +291,7 @@ class HomeViewController:BaseViewController {
Singleton.shared.startCountdown {}
if !isShowCharge {
NotificationManager().configNotifications()
// NotificationManager().configNotifications()
return
}
......
PhoneManager/Class/Page/Home/Controller/PhotoRemoveViewController.swift
View file @ 8c1d49c2
......@@ -78,7 +78,7 @@ class PhotoRemoveViewController: BaseViewController {
lazy var trashSubView : TrashSubView = {
let view = TrashSubView()
view.backgroundColor = .white
view.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
view.isHidden = true
return view
}()
......@@ -163,7 +163,7 @@ class PhotoRemoveViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
self.view.backgroundColor = .white//UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
formatter.dateStyle = .medium
formatter.timeStyle = .none
......
PhoneManager/Class/Page/Home/View/HomeInfoView.swift
View file @ 8c1d49c2
......@@ -62,7 +62,7 @@ class HomeInfoView :UIView {
lazy var deleteView:HomeInfoDeleteView = {
let cH:CGFloat = 48 + 2 * marginLR + safeHeight
let cH:CGFloat = 45 + 2 * marginLR + safeHeight
let sview:HomeInfoDeleteView = HomeInfoDeleteView(frame: CGRect(x: 0, y: height - cH, width: width, height: cH))
......@@ -438,7 +438,7 @@ extension HomeInfoView:UITableViewDataSource,UITableViewDelegate {
let models = ids?[indexPath.row]
return ((models?.count ?? 0) > 2 ? 190 : 214) + 8
return ((models?.count ?? 0) > 2 ? 205 : 229) + 8
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
......@@ -519,7 +519,7 @@ class HomeInfoTitleView:UIView {
let sview:UILabel = UILabel()
sview.font = .systemFont(ofSize: 20, weight: .bold)
sview.font = .systemFont(ofSize: 22, weight: .bold)
sview.textColor = UIColor.colorWithHex(hexStr: black3Color)
sview.x = 15
sview.y = 14
......@@ -545,7 +545,7 @@ class HomeInfoTitleView:UIView {
lazy var filterButton : UIButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "Frame 1"), for: .normal)
button.setTitle("The largest", for: .normal)
button.setTitle("largest", for: .normal)
button.layer.cornerRadius = 14
button.clipsToBounds = true
button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)
......@@ -601,7 +601,7 @@ class HomeInfoTitleView:UIView {
let attributedString2 = NSMutableAttributedString(string: fullText, attributes: [
.font: UIFont.systemFont(ofSize: 14),
.font: UIFont.systemFont(ofSize: 14,weight: .semibold),
.foregroundColor: UIColor.colorWithHex(hexStr: "#666666")
])
......@@ -649,15 +649,16 @@ class HomeInfoDeleteView:UIView {
let sview:UIButton = UIButton()
sview.titleLabel?.font = .systemFont(ofSize: 16, weight: .bold)
sview.titleLabel?.font = .systemFont(ofSize: 16, weight: .semibold)
sview.addTarget(self, action: #selector(deleteBtnClick), for: .touchUpInside)
sview.backgroundColor = UIColor.colorWithHex(hexStr: mColor)
sview.width = width - 2 * marginLR
sview.height = 48
sview.setImage(UIImage(named: "pm-home-Frame-del"), for: .normal)
sview.width = width - 2 * 39
sview.height = 45
sview.titleEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 0)
sview.centerX = width / 2
sview.y = marginLR
sview.layer.cornerRadius = sview.height / 2
sview.layer.cornerRadius = 12
sview.layer.masksToBounds = true
return sview
......@@ -665,7 +666,7 @@ class HomeInfoDeleteView:UIView {
override init(frame: CGRect) {
super.init(frame: frame)
self.backgroundColor = .clear
setupUI()
}
......@@ -675,9 +676,9 @@ class HomeInfoDeleteView:UIView {
func setupUI() {
self.setShadow()
// self.setShadow()
backgroundColor = .white
backgroundColor = .clear
addSubview(deleteBtn)
}
......
PhoneManager/Class/Page/Home/View/HomePhotosDetailCustomHeaderView.swift
View file @ 8c1d49c2
......@@ -26,7 +26,7 @@ class HomePhotosDetailCustomHeaderView : UICollectionReusableView {
lazy var filterButton : UIButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "Frame 1"), for: .normal)
button.setTitle("The largest", for: .normal)
button.setTitle("largest", for: .normal)
button.layer.cornerRadius = 14
button.clipsToBounds = true
button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)
......
PhoneManager/Class/Page/Home/View/HomeVideoDetailCustomHeaderView.swift
View file @ 8c1d49c2
......@@ -24,7 +24,7 @@ class HomeVideoDetailCustomHeaderView : UICollectionReusableView {
lazy var filterButton : UIButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "Frame 1"), for: .normal)
button.setTitle("The largest", for: .normal)
button.setTitle("largest", for: .normal)
button.layer.cornerRadius = 14
button.clipsToBounds = true
button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)
......
PhoneManager/Class/Page/Home/View/HomeView.swift
View file @ 8c1d49c2
......@@ -82,17 +82,17 @@ class HomeView:UIView {
viewModel.homeDataChanged = {[weak self] section,row in
guard let weakSelf = self else { return }
DispatchQueue.main.async {
if let cell = weakSelf.collectionView.cellForItem(at: IndexPath(row: row, section: section)) as? HomeTitleCollectionCell {
// 只更新需要改变的内容
let model = weakSelf.viewModel.headerGroup[row]
cell.reloadUIWithModel(model: model)
}
if let cell = weakSelf.collectionView.cellForItem(at: IndexPath(row: row, section: section)) as? HomeOtherCollectionCell {
// 只更新需要改变的内容
let model = weakSelf.viewModel.cardGroup[row]
cell.reloadUIWithModel(model: model)
}
// weakSelf.collectionView.reloadData()
// if let cell = weakSelf.collectionView.cellForItem(at: IndexPath(row: row, section: section)) as? HomeTitleCollectionCell {
// // 只更新需要改变的内容
// let model = weakSelf.viewModel.headerGroup[row]
// cell.reloadUIWithModel(model: model)
// }
// if let cell = weakSelf.collectionView.cellForItem(at: IndexPath(row: row, section: section)) as? HomeOtherCollectionCell {
// // 只更新需要改变的内容
// let model = weakSelf.viewModel.cardGroup[row]
// cell.reloadUIWithModel(model: model)
// }
weakSelf.collectionView.reloadData()
weakSelf.homeHeader?.progressBar.chaoticProgress = CGFloat(weakSelf.viewModel.totalSize)
weakSelf.reloadHeadSize()
}
......
PhoneManager/Class/Page/Home/View/ResourceFilterBoxView.swift
View file @ 8c1d49c2
......@@ -10,10 +10,10 @@ import Foundation
import SnapKit
enum ResouceSortType : String{
case largest = "The largest"
case smallest = "The smallest"
case latest = "The latest"
case oldest = "The oldest"
case largest = "largest"
case smallest = "smallest"
case latest = "latest"
case oldest = "oldest"
}
struct ResourceFilterBoxModel {
......@@ -36,7 +36,7 @@ class ResourceFilterBoxView : UIView {
var endDate : Date?
var currentSortType: ResouceSortType = .largest
let tableData: [String] = ["The largest", "The smallest", "The latest", "The oldest"]
let tableData: [String] = ["largest", "smallest", "latest", "oldest"]
var callBack : callBack<Any> = {sortType in}
var datePicker : YearMonthPickerView?
......
PhoneManager/Class/Page/Home/View/TrashSubView.swift
View file @ 8c1d49c2
......@@ -32,21 +32,27 @@ class TrashSubView: UIView {
lazy var emptyButton: UIButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "ic_delete_duplicates"), for: .normal)
button.setImage(UIImage(named: "pm-home-Frame-del"), for: .normal)
button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 1)
button.setTitle("Empty Trash", for: .normal)
button.setTitleColor(.white, for: .normal)
button.titleLabel?.font = UIFont.systemFont(ofSize: 12, weight: .semibold)
button.layer.cornerRadius = 19
button.titleEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
button.clipsToBounds = true
button.addTarget(self, action: #selector(emptyButtonAction), for: .touchUpInside)
return button
}()
override func layoutSubviews() {
super.layoutSubviews()
self.setShadow(cornerRadius: 0, sColor: UIColor.colorWithHex(hexStr: "#1475B9"), offset: CGSizeMake(3, -1),opacity: 0.15)
}
override init(frame: CGRect) {
super.init(frame: frame)
self.addTopShadow()
// self.addTopShadow()
// 给当前视图添加手势
addTapGestureToSelf()
......@@ -71,7 +77,8 @@ class TrashSubView: UIView {
make.top.equalToSuperview().offset(17)
make.bottom.equalToSuperview().offset(-17 - safeHeight)
make.left.equalTo(self.resourceCountlabel.snp.right).offset(11)
make.width.equalTo(100)
// make.width.equalTo(200)
make.right.equalTo(emptyButton.snp.left).offset(-5)
}
self.emptyButton.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-9)
......
PhoneManager/Class/Page/Home/View/cell/HomeInfoTableViewCell.swift
View file @ 8c1d49c2
......@@ -52,11 +52,11 @@ class HomeInfoTableViewCell:UITableViewCell {
backView?.isUserInteractionEnabled = true
numberLabel = UILabel()
numberLabel?.textColor = UIColor.colorWithHex(hexStr: black3Color)
numberLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold)
numberLabel?.textColor = UIColor.colorWithHex(hexStr: "#111111")
numberLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
seletedAllBtn = UIButton()
seletedAllBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .bold)
seletedAllBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .semibold)
seletedAllBtn?.setTitle("Select All", for: .normal)
seletedAllBtn?.setTitle("Unselect all", for: .selected)
......@@ -66,7 +66,7 @@ class HomeInfoTableViewCell:UITableViewCell {
let flowlayout:UICollectionViewFlowLayout = UICollectionViewFlowLayout()
flowlayout.scrollDirection = .horizontal
flowlayout.minimumLineSpacing = 10
flowlayout.minimumLineSpacing = 6
collectionView = UICollectionView.init(frame: CGRectMake(0, 0 , ScreenW , ScreenH), collectionViewLayout: flowlayout)
collectionView?.backgroundColor = .clear
......@@ -95,26 +95,26 @@ class HomeInfoTableViewCell:UITableViewCell {
guard let model else {return}
let cH = ((model.smodels?.count ?? 0) > 2 ? 190 : 214) + 8
let cH = ((model.smodels?.count ?? 0) > 2 ? 205 : 229) + 8
backView?.height = CGFloat(cH - 8)
backView?.width = ScreenW - 16 * 2
backView?.width = ScreenW - 8 * 2
backView?.centerY = CGFloat(cH / 2)
backView?.centerX = ScreenW / 2
numberLabel?.text = "\(model.smodels?.count ?? 0) \(String(model.titleText!))"
numberLabel?.sizeToFit()
numberLabel?.x = (backView?.x ?? 0) + marginLR
numberLabel?.y = (backView?.y ?? 0) + marginLR
numberLabel?.x = (backView?.x ?? 0) + 8
numberLabel?.y = (backView?.y ?? 0) + 8
seletedAllBtn?.centerY = numberLabel?.centerY ?? 0
seletedAllBtn?.x = (backView?.x ?? 0) + (backView?.width ?? 0) - 12 - (seletedAllBtn?.width ?? 0)
checkSeletedAll()
collectionView?.height = CGFloat(cH - 64)
collectionView?.width = (backView?.width ?? 0) - marginLR
collectionView?.x = (backView?.x ?? 0) + marginLR
collectionView?.y = (backView?.y ?? 0) + (backView?.height ?? 0) - (collectionView?.height ?? 0) - 16
collectionView?.height = CGFloat(cH - Int(CGRectGetMaxY(numberLabel?.frame ?? CGRect())) - 16)
collectionView?.width = (backView?.width ?? 0) - 16
collectionView?.x = (backView?.x ?? 0) + 8
collectionView?.y = (backView?.y ?? 0) + (backView?.height ?? 0) - (collectionView?.height ?? 0) - 8
self.collectionView?.reloadData()
......
PhoneManager/Class/Page/Home/View/cell/HomePhotosDetailCollectionCell.swift
View file @ 8c1d49c2
......@@ -140,7 +140,7 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
self.selectImageView.snp.makeConstraints { make in
make.bottom.right.equalToSuperview().offset(-6)
make.height.width.equalTo(18)
make.height.width.equalTo(18.38)
}
self.saveSizeView.snp.makeConstraints { make in
......
PhoneManager/Class/Page/Home/View/cell/HomeVideoDetailCell.swift
View file @ 8c1d49c2
......@@ -196,7 +196,7 @@ class HomeVideoDetailCell : UICollectionViewCell {
}
self.playImageView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.width.height.equalTo(18.38)
make.width.height.equalTo(26.RW())
}
self.saveSizeView.snp.makeConstraints { make in
make.left.top.equalToSuperview().offset(6)
......
PhoneManager/Class/Page/Home/View/cell/ImageSeletedCollectionCell.swift
View file @ 8c1d49c2
......@@ -213,7 +213,7 @@ class ImageSeletedCollectionCell:UICollectionViewCell {
seletedBtn?.snp.makeConstraints({ make in
make.width.height.equalTo(12)
make.width.height.equalTo(18.38.RW())
make.bottom.equalToSuperview().offset(-6)
make.right.equalToSuperview().offset(-6)
})
......
PhoneManager/Class/Page/Secret/PMShowImgVideoController.swift
View file @ 8c1d49c2
......@@ -63,7 +63,7 @@ class PMShowImgVideoController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
self.view.backgroundColor = .white//UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
self.view.addSubview(self.navView)
self.navView.showType = .dateAndSizeNav
......@@ -102,6 +102,7 @@ class PMShowImgVideoController: BaseViewController {
self.MaxCollection.scrollToItem(at: IndexPath(row: currentIdx, section: 0), at: .centeredHorizontally, animated: false)
changeNavInfo()
backView.setShadow(cornerRadius: 0, sColor: UIColor.colorWithHex(hexStr: "#1475B9"), offset: CGSizeMake(3, -1),opacity: 0.15)
}
private func changeNavInfo(){
......@@ -161,7 +162,7 @@ class PMShowImgVideoController: BaseViewController {
let col = UICollectionView(frame: CGRect(), collectionViewLayout: flowlayout)
col.delegate = self;
col.dataSource = self;
col.backgroundColor = .clear
col.register(PMShowItemCell.self, forCellWithReuseIdentifier: PMShowItemCellID)
col.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "UICollectionViewCell")
col.showsHorizontalScrollIndicator = false
......@@ -230,7 +231,7 @@ class PMShowImgVideoController: BaseViewController {
private lazy var backView: UIView = {
let v = UIView()
v.backgroundColor = .white
v.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
view.addSubview(v)
return v
}()
......
PhoneManager/Class/Page/Secret/View/SecretBottomView.swift
View file @ 8c1d49c2
......@@ -36,11 +36,12 @@ class SecretBottomView: UIView {
layer.shadowOffset = CGSize(width: 0, height: -2)
layer.shadowOpacity = 1
layer.shadowRadius = 10
self.backgroundColor = .clear
}
private lazy var clayer: CALayer = {
let l = CALayer()
l.backgroundColor = UIColor.white.cgColor
l.backgroundColor = UIColor.clear.cgColor
return l
}()
......
PhoneManager/Class/Page/Trash/Controller/TrashViewController.swift
View file @ 8c1d49c2
......@@ -20,7 +20,9 @@ class TrashViewController: BaseViewController {
button.setTitle("Delete", for: .normal)
button.setTitleColor(.white, for: .normal)
button.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
button.setImage(UIImage(named: "pm-home-Frame-del"), for: .normal)
button.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
button.titleEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
button.layer.cornerRadius = 20
button.addTarget(self, action: #selector(delBtnAction), for: .touchUpInside)
return button
......@@ -124,18 +126,36 @@ class TrashViewController: BaseViewController {
lazy var videoView:TrashContenView = {
let videoView = TrashContenView()
videoView.trashType = .video
videoView.callback = { idx in
UIView.animate(withDuration: 0.2) {
self.contentScrollView.contentOffset = CGPoint(x: Int(self.view.width) * idx, y: 0)
self.currentPage = idx + 1
}
}
return videoView
}()
lazy var otherView:TrashContenView = {
let otherView = TrashContenView()
otherView.trashType = .other
otherView.callback = { idx in
UIView.animate(withDuration: 0.2) {
self.contentScrollView.contentOffset = CGPoint(x: Int(self.view.width) * idx, y: 0)
self.currentPage = idx + 1
}
}
return otherView
}()
lazy var shotView:TrashContenView = {
let shotView = TrashContenView()
shotView.trashType = .shot
shotView.callback = { idx in
UIView.animate(withDuration: 0.2) {
self.contentScrollView.contentOffset = CGPoint(x: Int(self.view.width) * idx, y: 0)
self.currentPage = idx + 1
}
}
return shotView
}()
......@@ -216,6 +236,7 @@ extension TrashViewController:UIScrollViewDelegate{
if self.delBtn == nil{
return
}
self.delBtn.isHidden = data.count <= 0
if data.count <= 0{
self.delBtn.setTitle("Delete", for: .normal)
self.delBtn.backgroundColor = UIColor(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)
......
PhoneManager/Class/Page/Trash/View/TrashContenAssetCell.xib
View file @ 8c1d49c2
......@@ -22,9 +22,9 @@
<color key="backgroundColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u7L-fz-1My">
<rect key="frame" x="110" y="0.0" width="28" height="34"/>
<rect key="frame" x="104" y="0.0" width="34" height="34"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="8iF-C1-mzq"/>
<constraint firstAttribute="width" constant="34" id="8iF-C1-mzq"/>
<constraint firstAttribute="height" constant="34" id="Yde-4P-yCb"/>
</constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
......@@ -52,6 +52,6 @@
</collectionViewCell>
</objects>
<resources>
<image name="icon_trash_remove" width="16" height="16"/>
<image name="icon_trash_remove" width="20" height="20"/>
</resources>
</document>
PhoneManager/Class/Page/Trash/View/TrashContenView.swift
View file @ 8c1d49c2
......@@ -22,13 +22,13 @@ class TrashContenView: UIView {
var sizeLabel:UILabel!
var lineOne: UIView!
var lineTwo: UIView!
var lineThree: UIView!
var lineFour: UIView!
// var lineTwo: UIView!
// var lineThree: UIView!
// var lineFour: UIView!
var deleteButton : UIButton?
var scrollLine:UIView!
// var scrollLine:UIView!
let lineW:CGFloat = (ScreenW - 62) / 3.0
var dataSource:[AssetModel] = [] {
......@@ -51,7 +51,15 @@ class TrashContenView: UIView {
collectionView.reloadData()
}
private lazy var stack: UIStackView = {
let st = UIStackView()
st.alignment = .fill
st.Radius = 12
st.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
st.distribution = .fillEqually
self.addSubview(st)
return st
}()
/// 当数据为空的时候显示默认页面
func setDefauleUI(){
......@@ -59,12 +67,20 @@ class TrashContenView: UIView {
self.defaultView.mediaType = self.mediaType
self.addSubview(self.defaultView)
self.defaultView.snp.makeConstraints { make in
make.left.top.right.bottom.equalToSuperview()
make.left.right.bottom.equalToSuperview()
make.top.equalTo(stack.snp.bottom)
}
}
var callback:((Int)->Void) = {idx in}
@objc func touch(_ sender:UIButton) -> Void {
callback(sender.tag)
}
var buttonTL : [String] = ["Video" , "Other" , "Screenshot"]
func configUI(){
let layout = UICollectionViewFlowLayout()
layout.minimumInteritemSpacing = 12
......@@ -113,34 +129,48 @@ class TrashContenView: UIView {
collectionView.snp.makeConstraints { make in
make.left.bottom.right.equalToSuperview()
make.top.equalTo(sizeLabel.snp.bottom).offset(32)
make.top.equalTo(stack.snp.bottom).offset(20)
}
lineOne = UIView()
lineOne.backgroundColor = UIColor.colorWithHex(hexStr: "#E5E5E5")
topView.addSubview(lineOne)
lineTwo = UIView()
lineTwo.backgroundColor = UIColor.colorWithHex(hexStr: "#E5E5E5")
topView.addSubview(lineTwo)
lineThree = UIView()
lineThree.backgroundColor = UIColor.colorWithHex(hexStr: "#E5E5E5")
topView.addSubview(lineThree)
lineOne.frame = CGRect(x: 16, y: 62, width: lineW, height: 6)
lineTwo.frame = CGRect(x: 10+lineOne.rightX, y: 62, width: lineW, height: 6)
lineThree.frame = CGRect(x: 10+lineTwo.rightX, y: 62, width: lineW, height: 6)
scrollLine = UIView()
scrollLine.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
scrollLine.frame = lineOne.frame
topView.addSubview(scrollLine)
lineOne.isHidden = true
stack.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(marginLR)
make.top.equalTo(sizeLabel.snp.bottom).offset(14)
make.height.equalTo(42)
}
// lineTwo = UIView()
// lineTwo.backgroundColor = UIColor.colorWithHex(hexStr: "#E5E5E5")
// topView.addSubview(lineTwo)
//
// lineThree = UIView()
// lineThree.backgroundColor = UIColor.colorWithHex(hexStr: "#E5E5E5")
// topView.addSubview(lineThree)
//
// lineOne.frame = CGRect(x: 16, y: 62, width: lineW, height: 6)
// lineTwo.frame = CGRect(x: 10+lineOne.rightX, y: 62, width: lineW, height: 6)
// lineThree.frame = CGRect(x: 10+lineTwo.rightX, y: 62, width: lineW, height: 6)
// scrollLine = UIView()
// scrollLine.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
// scrollLine.frame = lineOne.frame
// topView.addSubview(scrollLine)
var i = 0
for tl in buttonTL {
let b = UIButton(type: .custom)
b.setTitle(tl, for: .normal)
b.setTitleColor(UIColor.colorWithHex(hexStr: "#111111"), for: .normal)
b.setTitleColor(UIColor.white, for: .selected)
b.setBackgroundImage(UIColor.clear.generateImage() ?? UIImage(), for: .normal)
b.setBackgroundImage(UIColor.colorWithHex(hexStr: "#0082FF").generateImage(), for: .selected)
b.tag = i
b.addTarget(self, action: #selector(touch(_:)), for: .touchUpInside)
stack.addArrangedSubview(b)
b.Radius = 12
i += 1
}
NotificationCenter.default.addObserver(forName: .trashPageScroll, object: nil, queue: nil) {[weak self] notif in
guard let weakSelf = self else { return }
......@@ -151,83 +181,122 @@ class TrashContenView: UIView {
let page = model.page
switch weakSelf.trashType {
case .video:
if page == 1{
if offset > 0{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
}
}else{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineOne.frame
}
}
}else{
weakSelf.scrollLine.frame = weakSelf.lineOne.frame
}
break
// if page == 1{
// if offset > 0{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
// }
// }else{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineOne.frame
// }
// }
// }else{
// weakSelf.scrollLine.frame = weakSelf.lineOne.frame
// }
case .other:
if page == 2{
if offset > ScreenW{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineThree.frame
}
}
else if offset == ScreenW{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
}
}
else{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineOne.frame
}
}
}else{
weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
}
break
// if page == 2{
// if offset > ScreenW{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineThree.frame
// }
// }
// else if offset == ScreenW{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
// }
// }
// else{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineOne.frame
// }
// }
// }else{
// weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
// }
case .shot:
if page == 3{
if offset > ScreenW * 2{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineFour.frame
}
}
else if offset == ScreenW * 2{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineThree.frame
}
}
else{
UIView.animate(withDuration: 0.2) {
weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
}
}
}else{
weakSelf.scrollLine.frame = weakSelf.lineThree.frame
}
break
// if page == 3{
// if offset > ScreenW * 2{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineFour.frame
// }
// }
// else if offset == ScreenW * 2{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineThree.frame
// }
// }
// else{
// UIView.animate(withDuration: 0.2) {
// weakSelf.scrollLine.frame = weakSelf.lineTwo.frame
// }
// }
// }else{
// weakSelf.scrollLine.frame = weakSelf.lineThree.frame
// }
}
}
}
override func layoutSubviews() {
super.layoutSubviews()
scrollLine.cornerCut(radius: 2, corner: .allCorners)
lineOne.cornerCut(radius: 2, corner: .allCorners)
lineTwo.cornerCut(radius: 2, corner: .allCorners)
lineThree.cornerCut(radius: 2, corner: .allCorners)
// scrollLine.cornerCut(radius: 2, corner: .allCorners)
// lineOne.cornerCut(radius: 2, corner: .allCorners)
// lineTwo.cornerCut(radius: 2, corner: .allCorners)
// lineThree.cornerCut(radius: 2, corner: .allCorners)
}
var trashType:TrashTypeEnum = .video{
didSet{
// DispatchQueue.main.asyncAfter(deadline: .now()+0.1) {
// if self.trashType == .video {
// b.isSelected = true
// }else if self.trashType == .other {
// b.isSelected = true
// }else{
// b.isSelected = true
// }
// }
switch trashType {
case .video:
scrollLine.frame = lineOne.frame
for b in stack.subviews {
guard let btn:UIButton = b as? UIButton else { return }
if b.tag == 0 {
btn.isSelected = true
}else{
btn.isSelected = false
}
}
break
case .other:
scrollLine.frame = lineTwo.frame
for b in stack.subviews {
guard let btn:UIButton = b as? UIButton else { return }
if b.tag == 1 {
btn.isSelected = true
}else{
btn.isSelected = false
}
}
break
case .shot:
scrollLine.frame = lineThree.frame
for b in stack.subviews {
guard let btn:UIButton = b as? UIButton else { return }
if b.tag == 2 {
btn.isSelected = true
}else{
btn.isSelected = false
}
}
break
}
getData()
}
......
PhoneManager/Class/Page/Trash/View/TrashDefaultView.swift
View file @ 8c1d49c2
......@@ -43,7 +43,7 @@ class TrashDefaultView: UIView {
lazy var startButton : UIButton = {
let view = UIButton()
view.setTitle("Start cleaning", for: UIControl.State.normal)
view.setTitle("Clean Now", for: UIControl.State.normal)
view.setTitleColor(UIColor(red: 1, green: 1, blue: 1, alpha: 1), for: .normal)
view.titleLabel?.font = UIFont.systemFont(ofSize: 12, weight: .semibold)
view.clipsToBounds = true
......
PhoneManager/Class/Tool/Class/showImage/PMScaleImageView.swift
View file @ 8c1d49c2
......@@ -49,13 +49,13 @@ class PMScaleImageView: UIView , UIScrollViewDelegate {
}
self.showImg.snp.remakeConstraints({ make in
make.left.equalToSuperview().offset((self.width - size.width)/2.0 )
if size.height < self.height / 2.0 {
make.top.equalToSuperview().offset((self.height - size.height)/2.0 - 20 )
}else if self.height - size.height > 20 {
make.top.equalToSuperview().offset(10)
}else{
// if size.height < self.height / 2.0 {
// make.top.equalToSuperview().offset((self.height - size.height)/2.0 - 20 )
// }else if self.height - size.height > 20 {
// make.top.equalToSuperview().offset(10)
// }else{
make.top.equalToSuperview().offset((self.height - size.height)/2.0 )
}
// }
make.size.equalTo(size)
})
})
......
PhoneManager/GoogleService-Info.plist 0 → 100644
View file @ 8c1d49c2
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>API_KEY</key>
<string>AIzaSyDsq1YCrNyDHATVaIk8MkM1zFZNRMERF1E</string>
<key>GCM_SENDER_ID</key>
<string>671559026879</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.app.phonemanager</string>
<key>PROJECT_ID</key>
<string>ai-phone-manager</string>
<key>STORAGE_BUCKET</key>
<string>ai-phone-manager.firebasestorage.app</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<key>IS_GCM_ENABLED</key>
<true></true>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:671559026879:ios:3e9d1cac64859ed57d5e0a</string>
</dict>
</plist>
\ No newline at end of file
PhoneManager/Info.plist
View file @ 8c1d49c2
......@@ -239,6 +239,614 @@
<key>SKAdNetworkIdentifier</key>
<string>3qcr597p9d.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>22mmun2rn5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>238da6jt44.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>24t9a8vw3c.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>24zw6aqk47.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>252b5q8x7y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>275upjj5gd.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>294l99pt4k.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2fnua5tdw4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2u9pt9hc89.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>32z4fx6l9h.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3l6bd9hu43.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3qcr597p9d.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3qy4746246.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3rd42ekr43.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3sh42y64q3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>424m5254lk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4468km3ulz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>44jx6755aq.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>44n7hlldy6.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>47vhws6wlr.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>488r3q3dtq.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4dzt52r2t5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4fzdc2evr5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4mn522wn87.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4pfyvq9l8r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4w7y6s5ca2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>523jb4fst2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>52fl2v3hgk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>54nzkqm89y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>578prtvx9j.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5a6flpkh64.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5l3tpt7t6e.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5lm9lj6jb7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5tjdwbrq8w.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6964rsfnh4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6g9af3uyq4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6p4ks3rnbw.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6v7lgmsu45.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6xzpu9s2p8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>737z793b9f.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>74b6s63p6l.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>79pbpufp6p.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7fmhfwg9en.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7rz58n8ntl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7ug5zh24hu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>84993kbrcf.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>89z7zv988g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8c4e2ghe7u.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8m87ys6875.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8r8llnkz5a.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8s468mfl3y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>97r2b46745.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9b89h5y424.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9nlqeag3gk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9rd848q2bz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9t245vhmpl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9vvzujtq5s.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9yg77x724h.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>a2p9lx4jpn.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>a7xqa6mtl2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>a8cz6cu7e5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>av6w8kgt66.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>b9bk5wbcq9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bxvub5ada5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>c3frkrj4fj.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>c6k4g5qg8m.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cg4yq2srnc.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cj5566h2ga.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cp8zw746q7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cs644xg564.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cstr6suwn9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>dbu4b84rxf.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>dkc879ngq3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>dzg6xy7pwj.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>e5fvkxwrpn.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ecpz2srf59.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>eh6m2bh4zr.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ejvt5qm6ak.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>f38h382jlk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>f73kdq92p3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>f7s53z58qe.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>feyaarzu9v.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>g28c52eehv.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>g2y4y55b64.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>g6gcrrvk4p.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ggvn48r87g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>glqzh8vgby.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gta8lk7p23.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gta9lk7p23.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>hb56zgv37p.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>hdw39hrw9y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>hs6bdukanm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>k674qkevps.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>kbd757ywx3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>kbmxgpxpgc.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>klf5c3l5u5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>krvm3zuq6h.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>lr83yxwka7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ludvb6z3bs.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>m297p6643m.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>m5mvw97r93.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>m8dbw4sv7c.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mj797d8u6f.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mlmmfzh3r3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mls7yz5dvl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mp6xlyr22a.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mqn7fxpca7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mtkv5xtk9e.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n38lu8286q.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n66cz3y3bx.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n6fk4nfna4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n9x2a789qt.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>nzq8sh4pbs.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>p78axxw29g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ppxm28t8ap.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>prcb7njmu6.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pwa73g5rt2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pwdxu55a5a.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>qqp299437r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>qu637u8glc.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>r45fhb6rf7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>rvh3l7un93.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>rx5hdcabgc.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>s39g8k73mm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>s69wq72ugq.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>su67r6k2v3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>t38b2kh725.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>tl55sbb4fm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>u679fj5vs4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>uw77j35x4d.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v4nxqhlyqp.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v72qych5uu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v79kvwwj4g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v9wttpbfk9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>vcra2ehyfk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>vhf287vqwu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>vutu7akeur.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>w9q455wk68.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>wg4vff78zm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>wzmmz9fp6w.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>x44k69ngh6.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>x5l83yy675.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>x8jxxk4ff5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>x8uqf25wch.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>xga6mpmplv.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>xy9t38ct57.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>y45688jllp.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>y5ghdn5j9k.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yclnxrl5pm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ydx93a7ass.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>zmvfpc5aq8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>zq492l623r.skadnetwork</string>
</dict>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
......
Podfile
View file @ 8c1d49c2
......@@ -20,6 +20,9 @@ target 'PhoneManager' do
pod 'GoogleAPIClientForREST/Gmail'
pod 'Adjust', '~> 5.4.0'
#广告适配器
pod 'GoogleMobileAdsMediationAppLovin'
# pod 'GoogleMobileAdsMediationFacebook'
post_install do |installer|
installer.pods_project.targets.each do |target|
......
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