Commit 089f690cc8a4eb747550578e3e57427e236dab1f

Authored by zhangxiaowen
1 parent 7b02401c

no message

CNLiveMineModule/Classes/Controller/CNLiveMineController.m
... ... @@ -15,7 +15,6 @@
15 15 #import "CNLiveMineCell.h"
16 16 #import "CNLiveMineModel.h"
17 17  
18   -// HexColor(0x333333)
19 18 #define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
20 19  
21 20 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
... ... @@ -44,7 +43,8 @@ static const NSInteger kHEIGHT = 240;
44 43 @"name":@"常用工具",
45 44 @"style":@"2",
46 45 @"margin":@"10",
47   - @"titles": @[@"收货地址", @"余额", @"我的收藏",@"发布记录",@"邀请好友",@"设置",@"路径工具"], @"images":@[@"mine_address",@"mine_card",@"mine_like",@"mine_release",@"mine_invitation",@"mine_set",@"mine_tool_map"]
  46 + @"titles": @[@"收货地址", @"余额", @"我的收藏",@"发布记录",@"邀请好友",@"设置",@"路径工具"],
  47 + @"images":@[@"mine_address",@"mine_card",@"mine_like",@"mine_release",@"mine_invitation",@"mine_set",@"mine_tool_map"]
48 48 },
49 49 @{
50 50 @"name":@"购买的商品",
... ... @@ -96,7 +96,7 @@ static const NSInteger kHEIGHT = 240;
96 96 }
97 97 [self createSubViews];
98 98 [self loadData];
99   -
  99 +
100 100 }
101 101  
102 102 - (void)dealloc {
... ... @@ -165,18 +165,7 @@ static const NSInteger kHEIGHT = 240;
165 165 break;
166 166 }
167 167 }
168   -- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{
169   - [UIView animateWithDuration: 0.5 animations: ^{
170   -// self.soccerBtn.x = SCREEN_WIDTH+10;
171   - } completion: nil];
172   -
173   -}
174   -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{
175   - [UIView animateWithDuration: 0.5 animations: ^{
176   -// self.soccerBtn.x = SCREEN_WIDTH-67-10;
177   - } completion: nil];
178   -
179   -}
  168 +
180 169 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
181 170 CGPoint point = scrollView.contentOffset;
182 171 if (point.y < -kHEIGHT) {
... ...
CNLiveMineModule/Classes/View/CNLiveMineCell.m
... ... @@ -10,12 +10,6 @@
10 10 #import <Masonry/Masonry.h>
11 11 #import "QMUIKit.h"
12 12  
13   -//#import "UIView+Layout.h"
14   -//#import "UIImage+Bundle.h"
15   -//
16   -//#import "UIButton+ImageTitleSpace.h"
17   -
18   -// HexColor(0x333333)
19 13 #define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
20 14  
21 15 @interface CNLiveMineCell()
... ...
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
... ... @@ -11,15 +11,6 @@
11 11 #import <SDWebImage/SDWebImage.h>
12 12 #import "QMUIKit.h"
13 13  
14   -//#import "XWHeader.h"
15   -//#import <XWUserCenter/XWUserCenter.h>// 用户中心
16   -//#import "UIView+Layout.h"
17   -//#import "UIView+Events.h"
18   -//#import "UIImage+Bundle.h"
19   -//#import "XWUserInfoModel.h"
20   -//#import "XWUserInfoNotification.h"
21   -
22   -// HexColor(0x333333)
23 14 #define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
24 15  
25 16 @interface CNLiveMineHeaderView ()
... ... @@ -268,7 +259,7 @@ static const NSInteger margin = 20;
268 259 _certification.numberOfLines = 1;
269 260 _certification.textColor = [UIColor whiteColor];
270 261 _certification.font = [UIFont systemFontOfSize:16];
271   - _certification.attributedText = [self createAttributedImages:@[@"mine_common", @"mine_overbadge", @"mine_wjj_certification"]];
  262 + _certification.attributedText = [self createAttributedImages:@[@"mine_overbadge",@"mine_common", @"mine_wjj_certification"]];
272 263 }
273 264 return _certification;
274 265 }
... ...
Example/CNLiveMineModule.xcodeproj/project.pbxproj
... ... @@ -247,6 +247,9 @@
247 247 LastUpgradeCheck = 0720;
248 248 ORGANIZATIONNAME = "153993236@qq.com";
249 249 TargetAttributes = {
  250 + 6003F589195388D20070C39A = {
  251 + DevelopmentTeam = 94X49GG3ZW;
  252 + };
250 253 6003F5AD195388D20070C39A = {
251 254 TestTargetID = 6003F589195388D20070C39A;
252 255 };
... ... @@ -510,6 +513,7 @@
510 513 baseConfigurationReference = A107C92B1363BA9D7027FD97 /* Pods-CNLiveMineModule_Example.debug.xcconfig */;
511 514 buildSettings = {
512 515 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  516 + DEVELOPMENT_TEAM = 94X49GG3ZW;
513 517 GCC_PRECOMPILE_PREFIX_HEADER = YES;
514 518 GCC_PREFIX_HEADER = "CNLiveMineModule/CNLiveMineModule-Prefix.pch";
515 519 INFOPLIST_FILE = "CNLiveMineModule/CNLiveMineModule-Info.plist";
... ... @@ -526,6 +530,7 @@
526 530 baseConfigurationReference = 75B26F3FEFD98849EC15D9D1 /* Pods-CNLiveMineModule_Example.release.xcconfig */;
527 531 buildSettings = {
528 532 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  533 + DEVELOPMENT_TEAM = 94X49GG3ZW;
529 534 GCC_PRECOMPILE_PREFIX_HEADER = YES;
530 535 GCC_PREFIX_HEADER = "CNLiveMineModule/CNLiveMineModule-Prefix.pch";
531 536 INFOPLIST_FILE = "CNLiveMineModule/CNLiveMineModule-Info.plist";
... ...