iOS Team / CNLiveMateCode · Commits

Commit 54a0be3a577b4436a946ae489dcf22d8915bcfb1

Authored by 张旭
1 parent 4af2c0c7

改为navigationpush

Inline Side-by-side
Showing 16 changed files with 79 additions and 66 deletions
metaCode.xcodeproj/project.pbxproj
  View file @54a0be3
... ... @@ -1783,7 +1783,7 @@
1783 1783 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1784 1784 CLANG_ENABLE_MODULES = YES;
1785 1785 CODE_SIGN_STYLE = Automatic;
1786   - CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
  1786 + CURRENT_PROJECT_VERSION = 1.0.2.23.12.25.10;
1787 1787 DEVELOPMENT_TEAM = 94X49GG3ZW;
1788 1788 EXCLUDED_ARCHS = "";
1789 1789 GENERATE_INFOPLIST_FILE = YES;
... ... @@ -1806,7 +1806,7 @@
1806 1806 "$(inherited)",
1807 1807 "@executable_path/Frameworks",
1808 1808 );
1809   - MARKETING_VERSION = 1.0.1;
  1809 + MARKETING_VERSION = 1.0.2;
1810 1810 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
1811 1811 PRODUCT_NAME = "$(TARGET_NAME)";
1812 1812 SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
... ... @@ -1828,7 +1828,7 @@
1828 1828 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1829 1829 CLANG_ENABLE_MODULES = YES;
1830 1830 CODE_SIGN_STYLE = Automatic;
1831   - CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
  1831 + CURRENT_PROJECT_VERSION = 1.0.2.23.12.25.10;
1832 1832 DEVELOPMENT_TEAM = 94X49GG3ZW;
1833 1833 EXCLUDED_ARCHS = "";
1834 1834 GENERATE_INFOPLIST_FILE = YES;
... ... @@ -1851,7 +1851,7 @@
1851 1851 "$(inherited)",
1852 1852 "@executable_path/Frameworks",
1853 1853 );
1854   - MARKETING_VERSION = 1.0.1;
  1854 + MARKETING_VERSION = 1.0.2;
1855 1855 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
1856 1856 PRODUCT_NAME = "$(TARGET_NAME)";
1857 1857 SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
... ...
metaCode/Classes/Config/CNLiveConfigstant.swift
  View file @54a0be3
... ... @@ -35,7 +35,7 @@ let kBucketName_QN:String = "mam-wjjtest-802"
35 35 let KVCBackgroupColor = UIColor("#F9F9F9")
36 36  
37 37 ///控制器push动画Bool
38   -let pushAnimated = true
  38 +let pushAnimated = false
39 39  
40 40 /**
41 41 获取系统状态栏高度
... ...
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
  View file @54a0be3
... ... @@ -32,9 +32,6 @@ func currentViewController() -> (UIViewController?) {
32 32 }
33 33 let vc = window?.rootViewController
34 34 let retVC = currentVC(vc)
35   - print("currentVC:\(retVC!)")
36   - print("111111currentVC.children:\(retVC!).children)")
37   - print("111111currentVC.navi:\(retVC!.navigationController)")
38 35 return retVC
39 36 }
40 37  
... ... @@ -55,9 +52,6 @@ private func currentVC(_ vc :UIViewController?) -> UIViewController? {
55 52 return currentVC(naiVC.visibleViewController)
56 53 }
57 54 else {
58   - print("111111vcChildren:\(vc?.children)")
59   - print("111111vcChildrenlast.Navi:\(vc?.children.last?.navigationController)")
60   - print("111111vcChildrenlast.Navi.controls:\(vc?.children.last?.navigationController?.viewControllers)")
61 55 return vc
62 56 }
63 57 }
... ... @@ -75,36 +69,28 @@ private func currentVC(_ vc :UIViewController?) -> UIViewController? {
75 69 }
76 70 }
77 71 if let isNav = window!.rootViewController?.isKind(of: UINavigationController.self){
78   - let nav = window?.rootViewController as! UINavigationController
79   - return nav
80   - }else if let isTabbar = window!.rootViewController?.isKind(of: UITabBarController.self){
81   - let tabbar = window?.rootViewController as! UITabBarController
82   - let selectVc = tabbar.selectedViewController
83   - if let isNavi = selectVc?.isKind(of: UINavigationController.self){
84   - let nav = selectVc as! UINavigationController
  72 + if isNav{
  73 + let nav = window?.rootViewController as! UINavigationController
85 74 return nav
  75 + }else{
  76 + if let isTabbar = window!.rootViewController?.isKind(of: UITabBarController.self){
  77 + if isTabbar{
  78 + let tabbar = window?.rootViewController as! UITabBarController
  79 + let selectVc = tabbar.selectedViewController
  80 + if let isNavi = selectVc?.isKind(of: UINavigationController.self){
  81 + if isNavi{
  82 + let nav = selectVc as! UINavigationController
  83 + return nav
  84 + }
  85 + }
  86 + }else{
  87 +
  88 + }
  89 + }
86 90 }
87 91 }
88   - return nil
  92 + return UINavigationController()
89 93 }
90   -- (UINavigationController *)navigationViewController
91   -{
92   -
93   - if ([self.window.rootViewController isKindOfClass:[UINavigationController class]])
94   - {
95   - return (UINavigationController *)self.window.rootViewController;
96   - }
97   - else if ([self.window.rootViewController isKindOfClass:[UITabBarController class]])
98   - {
99   - UIViewController *selectVc = [((UITabBarController *)self.window.rootViewController) selectedViewController];
100   - if ([selectVc isKindOfClass:[UINavigationController class]])
101   - {
102   - return (UINavigationController *)selectVc;
103   - }
104   - }
105   - return nil;
106   -}
107   -
108 94  
109 95 /// 弹框提示
110 96 /// - Parameter message: 内容提示
... ...
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
  View file @54a0be3
... ... @@ -87,27 +87,33 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
87 87 let itemModel = listMdl.list[indexPath.item]
88 88 if itemModel.type == CNLiveShopConsoleType.XZSP.rawValue{
89 89 //商城新增商品
90   - currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
  90 + navigationViewController().pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
  91 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
91 92  
92 93 }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{
93 94 //商城商品管理
94   - currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
  95 + navigationViewController().pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
  96 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
95 97 }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{
96 98 //新增优惠券
97 99 let vc = CNLiveShopCouponCreateViewController(couponListModel: nil, type: .create)
98   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  100 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  101 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
99 102 }else if itemModel.type == CNLiveShopConsoleType.GLYHQ.rawValue{
100 103 //优惠券管理
101 104 let vc = CNLiveShopCouponsManagerViewController()
102   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  105 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  106 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
103 107 }else if itemModel.type == CNLiveShopConsoleType.CreateShopClassify.rawValue{
104 108 //创建店铺分类
105 109 let vc = CNLiveCreateShopClassifyViewController()
106 110 vc.classifyType = .oneLevelClassify
107   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  111 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  112 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
108 113 }else if itemModel.type == CNLiveShopConsoleType.ShopClassifyManager.rawValue{
109 114 //店铺分类管理
110   - currentViewController()?.navigationController?.pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
  115 + navigationViewController().pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
  116 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
111 117 }else if itemModel.type == CNLiveShopConsoleType.FBDT.rawValue{
112 118 //发布动态
113 119  
... ... @@ -116,7 +122,8 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
116 122  
117 123 }else if itemModel.type == CNLiveShopConsoleType.DDGL.rawValue{
118 124 //订单管理
119   - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  125 + navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  126 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
120 127 }
121 128 // else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{
122 129 // //退款/售后
... ... @@ -129,7 +136,8 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
129 136 //直播管理
130 137 let webVC = CNWebViewController()
131 138 webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php")
132   - currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  139 + navigationViewController().pushViewController(webVC, animated: pushAnimated)
  140 +// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
133 141 }
134 142 }
135 143  
... ...
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
  View file @54a0be3
... ... @@ -572,7 +572,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
572 572 if(navigationAction.navigationType == .linkActivated){
573 573 let webVC = CNWebViewController()
574 574 webVC.url = URL(string: url)
575   - currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  575 + navigationViewController().pushViewController(webVC, animated: pushAnimated)
  576 +// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
576 577 decisionHandler(.cancel, preferences)
577 578 return
578 579 }else if(navigationAction.navigationType == .other){
... ...
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
  View file @54a0be3
... ... @@ -486,7 +486,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
486 486 if self.navigationController == nil{
487 487 print("self nil")
488 488 }
489   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  489 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  490 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
490 491 }
491 492  
492 493 // MARK: - 数据请求
... ...
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopClassilyManageViewController.swift
  View file @54a0be3
... ... @@ -149,7 +149,8 @@ class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableVi
149 149 vc.successCompleteBlock = {[weak self] in
150 150 self!.loadData()
151 151 }
152   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  152 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  153 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
153 154 }
154 155 ///显示/隐藏子分类
155 156 func showChildCalssifyAction(section:Int,classifyModel:CNLiveShopClassifyModel){
... ... @@ -168,7 +169,8 @@ class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableVi
168 169 vc.successCompleteBlock = {[weak self] in
169 170 self!.loadData()
170 171 }
171   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  172 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  173 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
172 174 }
173 175 func editBtnActionWithMModel(classifyModel:CNLiveShopClassifyModel,type:CNLiveCreateType){
174 176 let data = modelToDictionary(classifyModel)
... ...
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
  View file @54a0be3
... ... @@ -292,8 +292,8 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
292 292  
293 293 // MARK: - BtnAction
294 294 @objc func addBtnAction(){
295   -
296   - currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
  295 + navigationViewController().pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
  296 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
297 297 }
298 298  
299 299 // MARK: - 商品编辑通知
... ...
metaCode/Classes/Main/HomePage/Controller/ShopCoupon/CNLiveShopCouponsManagerViewController.swift
  View file @54a0be3
... ... @@ -177,7 +177,8 @@ class CNLiveShopCouponsManagerViewController:CNLiveBaseViewController,UITableVie
177 177 }
178 178 }else{
179 179 let vc = CNLiveShopCouponCreateViewController(couponListModel: nil, type: .create)
180   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  180 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  181 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
181 182 }
182 183 }
183 184 // MARK: - UITableViewDelegate
... ... @@ -225,6 +226,7 @@ class CNLiveShopCouponsManagerViewController:CNLiveBaseViewController,UITableVie
225 226 case 1:
226 227 // 编辑
227 228 let vc = CNLiveShopCouponCreateViewController(couponListModel: model, type: .edit)
  229 +
228 230 currentViewController()?.navigationController?.pushViewController(vc, animated: true)
229 231 break
230 232 default: break
... ...
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailBtnsCell.swift
  View file @54a0be3
... ... @@ -73,14 +73,17 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
73 73 let tag = sender.tag
74 74 ///push VC
75 75 if tag == 100 {
76   - //商品管理
77   - currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
  76 + //商品管理
  77 + navigationViewController().pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
  78 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
78 79 }else if tag == 101 {
79 80 //订单管理
80   - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  81 + navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  82 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
81 83 }else if tag == 102 {
82 84 //交易记录
83   - currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
  85 + navigationViewController().pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
  86 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
84 87 }
85 88 // if tag == 100 {
86 89 // //发布动态
... ...
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailOrderAssetCell.swift
  View file @54a0be3
... ... @@ -125,7 +125,8 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
125 125 @objc func navsubBtnAction(_ sender: UIButton){
126 126 if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
127 127 //push订单VC
128   - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  128 + navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  129 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
129 130 }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
130 131 //push余额VC
131 132 }
... ... @@ -133,7 +134,8 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
133 134 @objc func clickBtnAction(_ sender: UIButton){
134 135 if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
135 136 //push订单VC
136   - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  137 + navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
  138 +// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
137 139 }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
138 140 //push余额VC
139 141 }
... ...
metaCode/Classes/Main/HomePage/View/CNLliveShopDetailBannerCell.swift
  View file @54a0be3
... ... @@ -99,6 +99,7 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
99 99 let bannerMdl = self.shopDetailModel?.banner[index]
100 100 let webVC = CNWebViewController()
101 101 webVC.url = URL(string: bannerMdl?.url ?? "")
102   - currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  102 + navigationViewController().pushViewController(webVC, animated: pushAnimated)
  103 +// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
103 104 }
104 105 }
... ...
metaCode/Classes/Main/HomePage/View/CNMainView.swift
  View file @54a0be3
... ... @@ -204,11 +204,13 @@ class CNFrontMainView : UIView{
204 204 CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
205 205  
206 206 if respStatue == .success {
207   - currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
  207 + navigationViewController().pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
  208 +// currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
208 209 }
209 210 }
210 211 }else{
211   - currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
  212 + navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
  213 +// currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
212 214 }
213 215  
214 216 // }
... ...
metaCode/Classes/Main/Util/CNLiveCommonManager.swift
  View file @54a0be3
... ... @@ -23,7 +23,8 @@ class CNLiveCommonManager: NSObject{
23 23 let vc = CNLivePlayerViewController()
24 24 vc.setPlayUrl(playUrl: playURL, isLive: false)
25 25 vc.coverImageUrl = coverImageUrl
26   - currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
  26 + navigationViewController().pushViewController(vc, animated: pushAnimated)
  27 +// currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
27 28 }
28 29  
29 30 /**
... ...
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
  View file @54a0be3
... ... @@ -19,12 +19,14 @@ class CNLiveDownSlideTool:NSObject{
19 19 let regURL = urlComponents.url
20 20 let webVC = CNWebViewController()
21 21 webVC.url = regURL
22   - currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  22 + navigationViewController().pushViewController(webVC, animated: pushAnimated)
  23 +// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
23 24  
24 25 }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
25 26 let webVC = CNWebViewController()
26 27 webVC.url = URL(string: (contentMdl.thirdUrl)!)
27   - currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  28 + navigationViewController().pushViewController(webVC, animated: pushAnimated)
  29 +// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
28 30 }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
29 31  
30 32 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
... ... @@ -35,7 +37,8 @@ class CNLiveDownSlideTool:NSObject{
35 37 let regURL = urlComponents?.url
36 38 let webVC = CNWebViewController()
37 39 webVC.url = regURL
38   - currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  40 + navigationViewController().pushViewController(webVC, animated: pushAnimated)
  41 +// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
39 42 }else{
40 43 return
41 44 }
... ...
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerView.swift
  View file @54a0be3
... ... @@ -101,7 +101,8 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
101 101 self?.currentOrientation = .portrait
102 102 }else{
103 103 self?.popCallBack!()
104   - currentViewController()?.navigationController?.popViewController(animated: pushAnimated)
  104 + navigationViewController().popViewController(animated: pushAnimated)
  105 +// currentViewController()?.navigationController?.popViewController(animated: pushAnimated)
105 106 }
106 107 }
107 108 controlView.clickFrameBtnAction = {[weak self] in
... ...