iOS Team / CNLiveCMineModule · Commits

Commit a0a31e867ea28e8e70c25ed07501857a53f1dc51

Authored by yanglingyu
1 parent dc4d22fc

增加人物形象选择0.5.0

Inline Side-by-side
Showing 6 changed files with 53 additions and 15 deletions
CNLiveCMineModule.podspec
  View file @a0a31e8
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCMineModule'
11   - s.version = '0.4.9'
  11 + s.version = '0.5.0'
12 12 s.summary = '网家家C端个人中心'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCMineModule/Assets/CNLiveCMineModule.xcassets/Mine/mine_image.imageset/Contents.json 0 → 100644
  View file @a0a31e8
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "filename" : "wodexingxiang@2x.png",
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "filename" : "wodexingxiang@3x.png",
  14 + "idiom" : "universal",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "author" : "xcode",
  20 + "version" : 1
  21 + }
  22 +}
... ...
CNLiveCMineModule/Assets/CNLiveCMineModule.xcassets/Mine/mine_image.imageset/wodexingxiang@2x.png 0 → 100644
View file @a0a31e8

12 KB
CNLiveCMineModule/Assets/CNLiveCMineModule.xcassets/Mine/mine_image.imageset/wodexingxiang@3x.png 0 → 100644
View file @a0a31e8

24.4 KB
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
  View file @a0a31e8
... ... @@ -19,6 +19,7 @@
19 19 @property (nonatomic, strong) UIButton *unionBtn;//我的工会
20 20 @property (nonatomic, strong) UIButton *homelandBtn;//我的家园
21 21 @property (nonatomic, strong) UIButton *myCommuintyBtn;//我的社区
  22 +@property (nonatomic, strong) UIButton *myImage;
22 23 @property (nonatomic, strong) CNListCollectionView *mineListView;//我的视频、我的收藏、生活圈、付费记录
23 24 @end
24 25  
... ... @@ -38,6 +39,7 @@
38 39 [self addSubview:self.myCommuintyBtn];
39 40 }else{
40 41 [self addSubview:self.backBtn];
  42 + [self addSubview:self.myImage];
41 43 }
42 44 [self addSubview:self.mineListView];
43 45 [self uploadViewLayout];
... ... @@ -55,6 +57,11 @@
55 57 make.left.equalTo(self).offset(DS_adapt_length(12));
56 58 make.width.height.mas_equalTo(DS_adapt_length(60));
57 59 }];
  60 + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
  61 + make.left.mas_equalTo(DS_adapt_length(82.5));
  62 + make.right.equalTo(self).offset(-10);
  63 + make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
  64 + }];
58 65 if ([CNLiveEnvironmentManager manager].isNewHomePage) {
59 66 [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
60 67 make.top.equalTo(self).offset(kStatusHeight);
... ... @@ -68,17 +75,18 @@
68 75 make.width.mas_equalTo(DS_adapt_length(11));
69 76 make.height.mas_equalTo(DS_adapt_length(18));
70 77 }];
71   - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
72   - make.left.mas_equalTo(DS_adapt_length(82.5));
73   - make.right.equalTo(self).offset(-10);
74   - make.top.mas_equalTo(kStatusHeight+DS_adapt_length(53));
75   - }];
76 78 [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) {
77   - make.top.equalTo(self.titleLabel.mas_bottom).offset(DS_adapt_length(25));
  79 + make.top.equalTo(self.myImage.mas_bottom).offset(DS_adapt_length(15));
78 80 make.left.equalTo(self).offset(DS_adapt_length(10));
79 81 make.right.equalTo(self).offset(-DS_adapt_length(10));
80 82 make.height.mas_equalTo(DS_adapt_length(70));
81 83 }];
  84 + [self.myImage mas_makeConstraints:^(MASConstraintMaker *make) {
  85 + make.left.equalTo(self.titleLabel);
  86 + make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
  87 + make.height.mas_equalTo(DS_adapt_length(26));
  88 + make.width.mas_equalTo(DS_adapt_length(86.5));
  89 + }];
82 90 }else{
83 91 [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
84 92 make.top.equalTo(self).offset(kStatusHeight);
... ... @@ -86,12 +94,6 @@
86 94 make.height.mas_equalTo(DS_adapt_length(35));
87 95 make.width.mas_equalTo(DS_adapt_length(105));
88 96 }];
89   -
90   - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
91   - make.left.mas_equalTo(DS_adapt_length(82.5));
92   - make.right.equalTo(self).offset(-10);
93   - make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
94   - }];
95 97 [self.homelandBtn mas_makeConstraints:^(MASConstraintMaker *make) {
96 98 make.left.equalTo(self.titleLabel);
97 99 make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
... ... @@ -162,7 +164,10 @@
162 164 [[BaseAppDelegate sharedAppDelegate] popViewController];
163 165 }
164 166 break;
165   -
  167 + case 4:{
  168 + [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:27 param:@{} contentVC:[self displayViewController]];
  169 + break;
  170 + }
166 171 default:
167 172 break;
168 173 };
... ... @@ -236,6 +241,17 @@
236 241 }
237 242 return _myCommuintyBtn;
238 243 }
  244 +- (UIButton *)myImage
  245 +{
  246 + if (!_myImage) {
  247 + _myImage = [UIButton buttonWithType:UIButtonTypeCustom];
  248 + _myImage.exclusiveTouch = YES;
  249 + _myImage.tag = 1005;
  250 + [_myImage setBackgroundImage:[UIImage imageNamed:@"mine_image"] forState:UIControlStateNormal];
  251 + [_myImage addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
  252 + }
  253 + return _myImage;
  254 +}
239 255 - (UILabel *)titleLabel{
240 256 if (!_titleLabel) {
241 257 _titleLabel = [[UILabel alloc] init];
... ...
CNLiveCMineModule/Classes/CNLiveCMineProtocol.h
  View file @a0a31e8
... ... @@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
72 72 - (void)sendMessageWithCodeType:(CNLiveMobileType) type mobile:(NSString *)pNumber contryCode:(NSString *)contryCode verificationCode:(NSString *)verifiCode success:(void(^)(id result))success failure:(void(^)(NSDictionary *errorDic))failure;
73 73  
74 74 /// 交互跳转
75   -/// @param type 跳转类型1.协议信息h5页面 2.我的视频 3.生活圈 4付费记录 5.电商订单 6投诉 7听见中国 8扫描二维码 9设置背景图片 10用户信息页 11通信录黑名单 12活动h5页面 13小家音响页面跳转 14通讯录界面 15点播页面 16聊天界面 17达人主页 18我的家园 19我的工会 20我的社区 21我的礼盒 22我的话题 23赛事活动 24徒步记录 25路径工具 26第三方绑定
  75 +/// @param type 跳转类型1.协议信息h5页面 2.我的视频 3.生活圈 4付费记录 5.电商订单 6投诉 7听见中国 8扫描二维码 9设置背景图片 10用户信息页 11通信录黑名单 12活动h5页面 13小家音响页面跳转 14通讯录界面 15点播页面 16聊天界面 17达人主页 18我的家园 19我的工会 20我的社区 21我的礼盒 22我的话题 23赛事活动 24徒步记录 25路径工具 26第三方绑定 27选择人物形象
76 76 /// @param param 跳转传参
77 77 - (void)pushCMineContentForCMainPlatWithType:(NSInteger)type param:(NSDictionary *)param contentVC:(UIViewController *)contetVC;
78 78  
... ...