继续调整UI

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"
+            startingLineNumber = "513"
-            endingLineNumber = "514"
+            endingLineNumber = "513"
             landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -30,8 +30,8 @@
             filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "506"
+            startingLineNumber = "505"
-            endingLineNumber = "506"
+            endingLineNumber = "505"
             landmarkName = "CCHomeController"
             landmarkType = "21">
          </BreakpointContent>
@@ -94,8 +94,8 @@
             filePath = "SwiftProject/Project/Controller/CCHomeController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "470"
+            startingLineNumber = "469"
-            endingLineNumber = "470"
+            endingLineNumber = "469"
             landmarkName = "gotoVideoTransformVC(url:asset:)"
             landmarkType = "7">
          </BreakpointContent>

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)

SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift

@@ -24,21 +24,26 @@ extension MembershipVC {
             make.height.equalTo(150)
         }
         
-        let centerView = self.centerView()
+        var acView = topView
-        self.view.addSubview(centerView)
+        if UserInfo.sharedInstance.isMemberShip == false {
-        centerView.snp.makeConstraints { make in
+            let centerView = self.centerView()
-            make.left.equalToSuperview().offset(20)
+            self.view.addSubview(centerView)
-            make.right.equalToSuperview().offset(-20)
+            centerView.snp.makeConstraints { make in
-            make.top.equalTo(topView.snp.bottom).offset(20)
+                make.left.equalToSuperview().offset(20)
-            make.height.equalTo(210)
+                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.setTitle(UserInfo.sharedInstance.isMemberShip ?NSLocalizedString("Membership activated", comment: "") : NSLocalizedString("Free Trail 3 Days", comment: ""), for: .normal)
-        subscribeBtn.backgroundColor = .darkText
+        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()

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";

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";