diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index aacf403..d56512d 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 0096624A2BB3B45200FCA65F /* ExternalSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 009662492BB3B45200FCA65F /* ExternalSceneDelegate.swift */; }; 0096624D2BB3BA3B00FCA65F /* ZZHExternalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0096624C2BB3BA3B00FCA65F /* ZZHExternalViewController.swift */; }; 0096625A2BB552E700FCA65F /* CCSpatialVideoDisplayForVideoTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 009662592BB552E700FCA65F /* CCSpatialVideoDisplayForVideoTask.swift */; }; - 00B946232B67B26D00DA668F /* ddd_video.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 00B946222B67B26D00DA668F /* ddd_video.mp4 */; }; 00B946252B67B7DE00DA668F /* CCSpatialPlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B946242B67B7DE00DA668F /* CCSpatialPlayView.swift */; }; 00C665732BAA81F900C309C3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 00C665722BAA81F900C309C3 /* GoogleService-Info.plist */; }; 00C665792BAA94EA00C309C3 /* CopyCrashHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C665772BAA941E00C309C3 /* CopyCrashHandler.swift */; }; @@ -647,7 +646,6 @@ 00EB2D022BA2D15700924D84 /* Localizable.strings in Resources */, AF21209A2B4E7F1C00400B7F /* LaunchScreen.storyboard in Resources */, AF2120972B4E7F1C00400B7F /* Assets.xcassets in Resources */, - 00B946232B67B26D00DA668F /* ddd_video.mp4 in Resources */, AF2120952B4E7F1A00400B7F /* Main.storyboard in Resources */, 009662462BB3B39900FCA65F /* External.storyboard in Resources */, 00C665732BAA81F900C309C3 /* GoogleService-Info.plist in Resources */, diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 2ede001..d1915be 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 f1fc0c8..12a1f90 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 = "513" - endingLineNumber = "513" + startingLineNumber = "525" + endingLineNumber = "525" landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)" landmarkType = "7"> @@ -30,8 +30,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "505" - endingLineNumber = "505" + startingLineNumber = "517" + endingLineNumber = "517" landmarkName = "CCHomeController" landmarkType = "21"> @@ -94,8 +94,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "469" - endingLineNumber = "469" + startingLineNumber = "481" + endingLineNumber = "481" landmarkName = "gotoVideoTransformVC(url:asset:)" landmarkType = "7"> @@ -387,8 +387,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1200" - endingLineNumber = "1200" + startingLineNumber = "1156" + endingLineNumber = "1156" landmarkName = "compositeSpatialPhoto()" landmarkType = "7"> diff --git a/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Contents.json new file mode 100644 index 0000000..69d677a --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Frame 1171276042.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame 1171276042@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame 1171276042@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042.png b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042.png new file mode 100644 index 0000000..ed8b42f Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042@2x.png new file mode 100644 index 0000000..04be949 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042@3x.png new file mode 100644 index 0000000..0501c32 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/camera_vip.imageset/Frame 1171276042@3x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Contents.json new file mode 100644 index 0000000..4b7bf60 --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Frame.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame.png b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame.png new file mode 100644 index 0000000..09840ad Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame@2x.png new file mode 100644 index 0000000..0a321ff Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame@3x.png new file mode 100644 index 0000000..59497cc Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/home/userxieyi.imageset/Frame@3x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Contents.json new file mode 100644 index 0000000..ee11f7e --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 427320221.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 427320221@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 427320221@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221.png b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221.png new file mode 100644 index 0000000..0fc8971 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221@2x.png new file mode 100644 index 0000000..9a53a57 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221@3x.png new file mode 100644 index 0000000..ac0fffa Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/membership_close.imageset/Group 427320221@3x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Contents.json new file mode 100644 index 0000000..78b0c52 --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Diamond.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Diamond@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Diamond@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond.png b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond.png new file mode 100644 index 0000000..fc7ca96 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond@2x.png new file mode 100644 index 0000000..cd9f8b2 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond@3x.png new file mode 100644 index 0000000..70cfb63 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/vip_Diamond.imageset/Diamond@3x.png differ diff --git a/SwiftProject/SwiftProject/CCKit/Add/UIColor+CCExtension.swift b/SwiftProject/SwiftProject/CCKit/Add/UIColor+CCExtension.swift index fd82824..03ccc86 100644 --- a/SwiftProject/SwiftProject/CCKit/Add/UIColor+CCExtension.swift +++ b/SwiftProject/SwiftProject/CCKit/Add/UIColor+CCExtension.swift @@ -35,6 +35,10 @@ extension UIColor { self.init(red: red, green: green, blue: blue, alpha: 1) } + convenience init(r:Int,g:Int,b:Int,a:CGFloat) { + self.init(red: CGFloat(r)/255.0, green: CGFloat(g)/255.0, blue: CGFloat(b)/255.0, alpha: a) + } + convenience init(hexString: String,alpha:CGFloat) { let hexString = hexString.trimmingCharacters(in: .whitespacesAndNewlines) let scanner = Scanner(string: hexString) diff --git a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift index 80a382f..2d64bf1 100644 --- a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift @@ -92,10 +92,10 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV //76*56 leftBtn1 = UIButton.init(type: UIButton.ButtonType.custom) navtionBar?.addSubview(leftBtn1!) - leftBtn1?.tag = 10 + leftBtn1?.tag = 11 leftBtn1?.isSelected = false leftBtn1?.addTarget(self, action: #selector(navgationButtonClick2(sender:)), for: UIControl.Event.touchUpInside) - let img:UIImage = UIImage.init(named: "Frame_1171276035" as String)! + let img:UIImage = UIImage.init(named: "Icon_Menu" as String)! leftBtn1?.setImage(img, for: UIControl.State.normal) leftBtn1?.frame = CGRect(x: 5, y: 10, width: 76, height: 56) leftBtn1!.centerY = StatuBar_Height + NavBar_Height * 0.5 @@ -103,10 +103,10 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV //76*56 rightBtn1 = UIButton.init(type: UIButton.ButtonType.custom) navtionBar?.addSubview(rightBtn1!) - rightBtn1?.tag = 11 + rightBtn1?.tag = 10 rightBtn1?.isSelected = false rightBtn1?.addTarget(self, action: #selector(navgationButtonClick2(sender:)), for: UIControl.Event.touchUpInside) - let img2:UIImage = UIImage.init(named: "Icon_Menu" as String)! + let img2:UIImage = UIImage.init(named: "vip_Diamond" as String)! rightBtn1?.setImage(img2, for: UIControl.State.normal) rightBtn1?.frame = CGRect(x: 2, y: 10, width: 76, height: 56) rightBtn1!.centerY = StatuBar_Height + NavBar_Height * 0.5 @@ -297,18 +297,22 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV addMenu() } + if(sender.tag == 10) { + let vc:MembershipVC = MembershipVC() + let nav = UINavigationController(rootViewController: vc) + nav.modalTransitionStyle = UIModalTransitionStyle.coverVertical + nav.modalPresentationStyle = .fullScreen + self.present(nav, animated: true) + } + if sender.tag == 20 { - if UserInfo.sharedInstance.isMemberShip { +// if UserInfo.sharedInstance.isMemberShip { let vc:CCSpatialShootController = CCSpatialShootController() self.navigationController?.pushViewController(vc, animated: true) - } - else { - let vc:MembershipVC = MembershipVC() - let nav = UINavigationController(rootViewController: vc) - nav.modalTransitionStyle = UIModalTransitionStyle.coverVertical - nav.modalPresentationStyle = .fullScreen - self.present(nav, animated: true) - } +// } +// else { + +// } }else if sender.tag == 21{ //空间转码 @@ -377,10 +381,18 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV if((dic["name"] as! String).elementsEqual(NSLocalizedString("隐私政策", comment: ""))){ let vc:CCWebController = CCWebController() + vc.titleValue = NSLocalizedString("隐私政策", comment: "") let sizeUrl = NSLocalizedString("siteUrl", comment: "隐私政策url") vc.urlString = sizeUrl self.navigationController?.pushViewController(vc, animated: true) } + else if((dic["name"] as! String).elementsEqual(NSLocalizedString("用户协议", comment: ""))){ + let vc:CCWebController = CCWebController() + vc.titleValue = NSLocalizedString("用户协议", comment: "") + let sizeUrl = NSLocalizedString("userSiteUrl", comment: "用户协议url") + vc.urlString = sizeUrl + self.navigationController?.pushViewController(vc, animated: true) + } else if((dic["name"] as! String).elementsEqual(NSLocalizedString("联系我们", comment: ""))) {//联系我们 if !MFMailComposeViewController.canSendMail() { SVProgressHUD.showInfo(withStatus: NSLocalizedString("请先前往系统设置配置发送的邮箱信息", comment: "")) diff --git a/SwiftProject/SwiftProject/Project/Controller/CCWebController.swift b/SwiftProject/SwiftProject/Project/Controller/CCWebController.swift index d1e17eb..38913c6 100644 --- a/SwiftProject/SwiftProject/Project/Controller/CCWebController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/CCWebController.swift @@ -14,12 +14,12 @@ class CCWebController: BaseController, WKNavigationDelegate { var webView: WKWebView! var urlString: String = "" - + var titleValue:String? override func viewDidLoad() { super.viewDidLoad() self.view.backgroundColor = UIColor.white self.titleLab?.width = 200 - self.setNavgaionTitle(string: NSLocalizedString("隐私政策", comment: "")) + self.setNavgaionTitle(string:titleValue ?? "") self.titleLab?.sizeToFit() // 创建 WKWebView webView = WKWebView() diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipProductView.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipProductView.swift index 1e06b66..b479a25 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipProductView.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipProductView.swift @@ -32,6 +32,8 @@ class MembershipProductView: UIView ,UITableViewDataSource,UITableViewDelegate{ override init(frame: CGRect) { super.init(frame: frame) + self.backgroundColor = .clear + tableView = UITableView.init(frame: .zero, style: .plain) self.addSubview(tableView!) tableView?.snp.makeConstraints({ make in @@ -44,6 +46,7 @@ class MembershipProductView: UIView ,UITableViewDataSource,UITableViewDelegate{ tableView?.separatorStyle = .none tableView?.isScrollEnabled = false tableView?.showsHorizontalScrollIndicator = false + tableView?.backgroundColor = .clear } func setData(_ dataArr:[MemberShipModelItem]?,selectedItem:MemberShipModelItem?) { @@ -101,6 +104,7 @@ class MembershipViewCell: UITableViewCell { override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) bgView = UIView() + bgView?.backgroundColor = UIColor(r: 20, g: 20, b: 20, a: 1) self.contentView.addSubview(bgView!) bgView?.layer.cornerRadius = 10 bgView?.layer.masksToBounds = true @@ -134,9 +138,12 @@ class MembershipViewCell: UITableViewCell { rightDescBtn = UIButton() rightDescBtn?.isUserInteractionEnabled = false self.contentView.addSubview(rightDescBtn!) - rightDescBtn?.setBackgroundImage(UIImage(named: "BG_Top"), for: .normal) +// rightDescBtn?.setBackgroundImage(UIImage(named: "BG_Top"), for: .normal) + rightDescBtn?.layer.cornerRadius = 8 + rightDescBtn?.layer.masksToBounds = true + rightDescBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 12) - rightDescBtn?.setTitleColor(.white, for: .normal) + rightDescBtn?.setTitleColor(.black, for: .normal) rightDescBtn?.snp.makeConstraints { make in make.right.equalToSuperview().offset(0) make.top.equalToSuperview().offset(0) @@ -161,7 +168,8 @@ class MembershipViewCell: UITableViewCell { return } if it.isSelected == true{ - bgView?.backgroundColor = .gray +// bgView?.backgroundColor = .gray + bgView?.backgroundColor = UIColor(r: 20, g: 20, b: 20, a: 1) bgView?.layer.borderColor = UIColor.black.cgColor } else{ diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift index fa07031..9caf533 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift @@ -10,6 +10,13 @@ import UIKit class MembershipVC: BaseController { var pvView:MembershipProductView? var selectedItem:MemberShipModelItem? + lazy var mTopImgView:UIImageView = { + //393*236 + let view = UIImageView(frame: CGRect(x: 0, y: 0, width: SCREEN_Width, height: SCREEN_Height * 236/393)) + + view.image = UIImage.init(named: "BG_Top") + return view + }() override func viewDidLoad() { super.viewDidLoad() diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift index dd4f3b6..0df53ed 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift @@ -11,11 +11,14 @@ extension MembershipVC { func configureUI() { + self.view.backgroundColor = .black self.navLine?.isHidden = true - self.setLeftOneBtnImg(imgStr: "Icon_Close_Top") + self.setLeftOneBtnImg(imgStr: "membership_close") self.leftBtn1?.addTarget(self, action: #selector(dismissVC(sender: )), for: .touchUpInside) - self.setRightOneBtnImg(imgStr: "Icon_PopUp_Icon_Folder") +// self.setRightOneBtnImg(imgStr: "Icon_PopUp_Icon_Folder") self.rightBtn1?.addTarget(self, action: #selector(buyMembership(sender: )), for: .touchUpInside) + self.setRightOneBtnTitle(string: NSLocalizedString("restorevip", comment: "") as NSString) + self.rightBtn1?.isHidden = false let topView = self.topView() self.view.addSubview(topView) topView.snp.makeConstraints { make in @@ -24,6 +27,9 @@ extension MembershipVC { make.height.equalTo(150) } + self.view.addSubview(mTopImgView) + self.view.bringSubviewToFront(self.navtionBar!) + self.setNavgationBarColorImg(color: .clear) var acView = topView if UserInfo.sharedInstance.isMemberShip == false { let centerView = self.centerView() @@ -141,7 +147,7 @@ extension MembershipVC { func centerView() -> UIView { let bgView = UIView() - bgView.backgroundColor = .white + bgView.backgroundColor = .clear pvView = MembershipProductView(frame: .zero) bgView.addSubview(pvView!) pvView?.snp.makeConstraints { make in @@ -247,12 +253,14 @@ extension MembershipVC { @objc func goWeb(sender:UIButton) { if sender.tag == 1 {//隐私政策 let vc:CCWebController = CCWebController() + vc.titleValue = NSLocalizedString("隐私政策", comment: "") let sizeUrl = NSLocalizedString("siteUrl", comment: "隐私政策url") vc.urlString = sizeUrl self.navigationController?.pushViewController(vc, animated: true) } else if sender.tag == 2{//用户协议 let vc:CCWebController = CCWebController() + vc.titleValue = NSLocalizedString("用户协议", comment: "") let sizeUrl = NSLocalizedString("userSiteUrl", comment: "用户协议url") vc.urlString = sizeUrl self.navigationController?.pushViewController(vc, animated: true) diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift index ded044b..ee79e5a 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift @@ -188,6 +188,11 @@ class CCSpatialShootController: BaseController { return view }() + lazy var vipLogoView:UIImageView = { + let imgView = UIImageView() + imgView.image = UIImage(named: "camera_vip") + return imgView + }() lazy var cameraButton: UIButton = { let botton = UIButton() @@ -316,7 +321,9 @@ class CCSpatialShootController: BaseController { self.view.addSubview(switchBackView) switchBackView.addSubview(cameraButton) + switchBackView.addSubview(videoButton) + self.view.addSubview(vipLogoView) self.view.addSubview(cameraLabel) self.view.addSubview(videoLabel) @@ -344,6 +351,16 @@ class CCSpatialShootController: BaseController { make.width.equalTo(128) make.height.equalTo(40) } + if !UserInfo.sharedInstance.isMemberShip { + vipLogoView.snp.makeConstraints { make in + make.width.equalTo(25) + make.height.equalTo(12) + make.left.equalTo(switchBackView.snp.right).offset(-22) + make.bottom.equalTo(switchBackView.snp.top).offset(12) + } + } + + cameraButton.snp.makeConstraints { (make) in make.centerY.equalTo(switchBackView.snp.centerY) @@ -353,6 +370,8 @@ class CCSpatialShootController: BaseController { make.height.equalTo(32) } + + videoButton.snp.makeConstraints { (make) in make.centerY.equalTo(switchBackView.snp.centerY) make.leading.equalTo(switchBackView.snp.leading).offset(4) @@ -892,7 +911,7 @@ class CCSpatialShootController: BaseController { // 移除通知 // // 结束生成设备旋转方向通知 // UIDevice.current.endGeneratingDeviceOrientationNotifications() - + print("shootcontroller deinit....") if let timer = self.timer { // 当视图控制器被释放时,取消定时器 timer.invalidate() diff --git a/SwiftProject/SwiftProject/Project/View/CCMineView.swift b/SwiftProject/SwiftProject/Project/View/CCMineView.swift index 8cde44f..542afcb 100644 --- a/SwiftProject/SwiftProject/Project/View/CCMineView.swift +++ b/SwiftProject/SwiftProject/Project/View/CCMineView.swift @@ -86,9 +86,11 @@ class CCMineView: UIView,UITableViewDelegate,UITableViewDataSource{ // "name":"隐私政策"]] let arr = [["img":"Icon_Menu_all_Icon_Connect", - "name":NSLocalizedString(NSLocalizedString("联系我们", comment: ""), comment: "")], + "name":NSLocalizedString("联系我们", comment: "")], ["img":"Icon_Menu_all_Icon_Privacy", - "name":NSLocalizedString(NSLocalizedString("隐私政策", comment: ""), comment: "")]] + "name":NSLocalizedString("隐私政策", comment: "")], + ["img":"userxieyi", + "name":NSLocalizedString("用户协议", comment: "")]] datas.addObjects(from: arr) diff --git a/SwiftProject/SwiftProject/en.lproj/Localizable.strings b/SwiftProject/SwiftProject/en.lproj/Localizable.strings index e27cba7..488c842 100644 --- a/SwiftProject/SwiftProject/en.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/en.lproj/Localizable.strings @@ -88,5 +88,7 @@ "Free Trail 3 Days" = "Free Trail 3 Days"; "subscribDesc" = "免费试用3天,试用结束后,按照图示费用进行续费,您可以随时在Tunes Store中取消订阅.若已订阅过或已付费成功却未显示,可使用相同AppleID恢复会员.确认购买后将从iTunes账户扣款,自动续订会在到期前24小时内扣款,可前往AppleID管理页面关闭订阅."; "用户协议" = "用户协议"; -"userSiteUrl" = "https://www.wolai.com/9BZr3sEbpbXJEUorHEyAoP"; + +"userSiteUrl" = "https://sapphire-mango-hvwxmh.mystrikingly.com"; "Membership activated" = "Membership activated"; +"restorevip" = "Restore"; diff --git a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings index 4a923b6..2b57b6d 100644 --- a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings @@ -92,3 +92,4 @@ "用户协议" = "用户协议"; "userSiteUrl" = "https://www.wolai.com/9BZr3sEbpbXJEUorHEyAoP"; "Membership activated" = "Membership activated"; +"restorevip" = "恢复购买";