diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index e0163a8..de582b4 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index e75f66e..f1fc0c8 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -14,8 +14,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "514" - endingLineNumber = "514" + startingLineNumber = "513" + endingLineNumber = "513" landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)" landmarkType = "7"> @@ -30,8 +30,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "506" - endingLineNumber = "506" + startingLineNumber = "505" + endingLineNumber = "505" landmarkName = "CCHomeController" landmarkType = "21"> @@ -94,8 +94,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "470" - endingLineNumber = "470" + startingLineNumber = "469" + endingLineNumber = "469" landmarkName = "gotoVideoTransformVC(url:asset:)" landmarkType = "7"> diff --git a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift index 57b2dca..80a382f 100644 --- a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift @@ -305,7 +305,6 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV else { let vc:MembershipVC = MembershipVC() let nav = UINavigationController(rootViewController: vc) -// self.navigationController?.pushViewController(vc, animated: true) nav.modalTransitionStyle = UIModalTransitionStyle.coverVertical nav.modalPresentationStyle = .fullScreen self.present(nav, animated: true) diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift index 4e52152..dd4f3b6 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift @@ -24,21 +24,26 @@ extension MembershipVC { make.height.equalTo(150) } - let centerView = self.centerView() - self.view.addSubview(centerView) - centerView.snp.makeConstraints { make in - make.left.equalToSuperview().offset(20) - make.right.equalToSuperview().offset(-20) - make.top.equalTo(topView.snp.bottom).offset(20) - make.height.equalTo(210) + var acView = topView + if UserInfo.sharedInstance.isMemberShip == false { + let centerView = self.centerView() + self.view.addSubview(centerView) + centerView.snp.makeConstraints { make in + make.left.equalToSuperview().offset(20) + make.right.equalToSuperview().offset(-20) + make.top.equalTo(topView.snp.bottom).offset(20) + make.height.equalTo(210) + } + acView = centerView } + let bottomView = self.bottomView() self.view .addSubview(bottomView) bottomView.snp.makeConstraints { make in make.left.equalToSuperview().offset(20) make.right.equalToSuperview().offset(-20) - make.top.equalTo(centerView.snp.bottom).offset(20) + make.top.equalTo(acView.snp.bottom).offset(20) make.bottom.equalToSuperview() } } @@ -210,10 +215,11 @@ extension MembershipVC { subscribeBtn.addTarget(self, action: #selector(subscribeAction(sender: )), for: .touchUpInside) subscribeBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16) subscribeBtn.setTitleColor(.white, for: .normal) - subscribeBtn.setTitle(NSLocalizedString("Free Trail 3 Days", comment: ""), for: .normal) - subscribeBtn.backgroundColor = .darkText + subscribeBtn.setTitle(UserInfo.sharedInstance.isMemberShip ?NSLocalizedString("Membership activated", comment: "") : NSLocalizedString("Free Trail 3 Days", comment: ""), for: .normal) + subscribeBtn.backgroundColor = UserInfo.sharedInstance.isMemberShip ? .lightGray : .darkText subscribeBtn.layer.masksToBounds = true subscribeBtn.layer.cornerRadius = 16 + subscribeBtn.isEnabled = !UserInfo.sharedInstance.isMemberShip subscribeBtn.snp.makeConstraints { make in make.top.equalTo(btn_privateBtn.snp.bottom).offset(20) make.centerX.equalToSuperview() diff --git a/SwiftProject/SwiftProject/en.lproj/Localizable.strings b/SwiftProject/SwiftProject/en.lproj/Localizable.strings index 9f216f7..e27cba7 100644 --- a/SwiftProject/SwiftProject/en.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/en.lproj/Localizable.strings @@ -89,3 +89,4 @@ "subscribDesc" = "免费试用3天,试用结束后,按照图示费用进行续费,您可以随时在Tunes Store中取消订阅.若已订阅过或已付费成功却未显示,可使用相同AppleID恢复会员.确认购买后将从iTunes账户扣款,自动续订会在到期前24小时内扣款,可前往AppleID管理页面关闭订阅."; "用户协议" = "用户协议"; "userSiteUrl" = "https://www.wolai.com/9BZr3sEbpbXJEUorHEyAoP"; +"Membership activated" = "Membership activated"; diff --git a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings index 8799198..4a923b6 100644 --- a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings @@ -91,3 +91,4 @@ "subscribDesc" = "免费试用3天,试用结束后,按照图示费用进行续费,您可以随时在Tunes Store中取消订阅.若已订阅过或已付费成功却未显示,可使用相同AppleID恢复会员.确认购买后将从iTunes账户扣款,自动续订会在到期前24小时内扣款,可前往AppleID管理页面关闭订阅."; "用户协议" = "用户协议"; "userSiteUrl" = "https://www.wolai.com/9BZr3sEbpbXJEUorHEyAoP"; +"Membership activated" = "Membership activated";