iOS Team / CNLiveCMineModule · Commits

Commit 8d03d2c8643edffe077d5a48760fdd0c6f07c231

Authored by yanglingyu
1 parent 52616964

修复问题

Inline Side-by-side
Showing 15 changed files with 33 additions and 24 deletions
CNLiveCMineModule.podspec
  View file @8d03d2c
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCMineModule'
11   - s.version = '0.1.4'
  11 + s.version = '0.1.5'
12 12 s.summary = '网家家C端个人中心'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_qq@2x.png deleted 100644 → 0
View file @5261696

3.25 KB
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_qq@3x.png deleted 100644 → 0
View file @5261696

6.58 KB
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_wechat@2x.png deleted 100644 → 0
View file @5261696

3.9 KB
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_wechat@3x.png deleted 100644 → 0
View file @5261696

7.83 KB
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_weibo@2x.png deleted 100644 → 0
View file @5261696

6.38 KB
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_weibo@3x.png deleted 100644 → 0
View file @5261696

12.4 KB
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.h
  View file @8d03d2c
... ... @@ -32,8 +32,6 @@ typedef enum {
32 32  
33 33  
34 34 } CNGetAgreementH5Type;
35   -typedef void(^SuccessBlock)(NSString *h5,NSString *title);
36   -typedef void(^FailureBlock)(NSError *error);
37 35 NS_ASSUME_NONNULL_BEGIN
38 36 @interface CNMinePresent : NSObject
39 37 /// 返回包含扫码、客服、设置的数组
... ... @@ -56,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
56 54 /// @param responseBlock 返回数据
57 55 + (void)requestFeedback:(NSString *)message secceedBlock:(void(^)(void))responseBlock;
58 56  
59   -+ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure;
  57 ++ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(void(^)(NSString *h5,NSString *title))success failure:(void(^)(NSError *error))failure;
60 58 /// 是否展示社区按钮
61 59 /// @param block 返回是否展示状态
62 60 + (void)requestCommunitySucceed:(void(^)(BOOL isCommunity))block;
... ...
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.m
  View file @8d03d2c
... ... @@ -448,7 +448,7 @@
448 448 }];
449 449 }
450 450  
451   -+ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure {
  451 ++ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(void(^)(NSString *h5,NSString *title))success failure:(void(^)(NSError *error))failure{
452 452  
453 453 [CNLiveNetworking setAllowRequestDefaultArgument:NO];
454 454 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNGetAgreementH5Url Param:@{} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
... ...
CNLiveCMineModule/Classes/CNCMine/View/CNListCollectionView.m
  View file @8d03d2c
... ... @@ -184,7 +184,7 @@ static NSString *CNWalletCellID = @"CNWalletCellID";
184 184 }
185 185 }else if (_model.type == 5){
186 186 CNMineListModel *listModel = [CNMineListModel mj_objectWithKeyValues:self.model.lists[indexPath.row]];
187   - if ([listModel.title isEqualToString:@"小家音响"]) {
  187 + if ([listModel.title isEqualToString:@"小家音箱"]) {
188 188 [[CNLiveCMineService shareMineProtocol] pushCMinePagesEvent:@"config_click_xiaojia"];
189 189 CNLiveAddDeviceController *addDeviceVC = [[CNLiveAddDeviceController alloc]init];
190 190 [[BaseAppDelegate sharedAppDelegate] pushViewController:addDeviceVC];
... ...
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
  View file @8d03d2c
... ... @@ -37,6 +37,10 @@
37 37 [self addSubview:self.titleLabel];
38 38 [self addSubview:self.mineListView];
39 39 [self uploadViewLayout];
  40 + weakself
  41 + [CNMinePresent requestCommunitySucceed:^(BOOL isCommunity) {
  42 + weakSelf.myCommuintyBtn.hidden = !isCommunity;
  43 + }];
40 44 }
41 45 return self;
42 46 }
... ... @@ -101,10 +105,6 @@
101 105 } else {
102 106 self.titleLabel.text = @"昵称";
103 107 }
104   - weakself
105   - [CNMinePresent requestCommunitySucceed:^(BOOL isCommunity) {
106   - weakSelf.myCommuintyBtn.hidden = !isCommunity;
107   - }];
108 108 }
109 109 #pragma mark - Action
110 110 - (void)buttonAction:(UIButton *)sender{
... ... @@ -135,9 +135,9 @@
135 135 {
136 136 if (!_iconImage) {
137 137 _iconImage = [[UIImageView alloc] init];
138   - _iconImage.layer.cornerRadius = 30;
  138 + _iconImage.layer.cornerRadius = DS_adapt_length(30);
139 139 _iconImage.contentMode = UIViewContentModeScaleAspectFill;
140   - _iconImage.image = [CNLiveCMineService imageWithMineName:@"mine_no_Avatar"];
  140 + [_iconImage sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:[CNLiveCMineService imageWithMineName:@"mine_no_Avatar"]];
141 141 _iconImage.userInteractionEnabled = YES;
142 142 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id _Nonnull sender) {
143 143 CNMinePersonInfoController *infoVC = [[CNMinePersonInfoController alloc] init];
... ... @@ -194,7 +194,11 @@
194 194 _titleLabel.textColor = kWhiteColor;
195 195 _titleLabel.textAlignment = NSTextAlignmentLeft;
196 196 _titleLabel.font = UIFontCNMake(17);
197   - _titleLabel.text = @"我的昵称";
  197 + if (![NSString isEmpty:CNUserShareModel.nickname]) {
  198 + [_titleLabel setText:CNUserShareModel.nickname];
  199 + } else {
  200 + _titleLabel.text = @"昵称";
  201 + }
198 202 }
199 203 return _titleLabel;
200 204 }
... ...
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
  View file @8d03d2c
... ... @@ -172,6 +172,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne
172 172 make.left.equalTo(self.view).offset(DS_adapt_length( 12));
173 173 make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28));
174 174 }];
  175 + self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28)];
175 176 [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
176 177 make.top.equalTo(self.view).offset(kStatusHeight);
177 178 make.right.equalTo(self.view).offset(-DS_adapt_length(10));
... ... @@ -187,6 +188,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne
187 188 make.left.equalTo(self.view).offset(DS_adapt_length(12));
188 189 make.width.height.mas_equalTo(DS_adapt_length(32));
189 190 }];
  191 + self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(32)];
190 192 [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
191 193 make.top.equalTo(self.view).offset(kStatusHeight);
192 194 make.right.equalTo(self.view).offset(-DS_adapt_length(10));
... ... @@ -202,6 +204,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne
202 204 make.left.equalTo(self.topImageView).offset(DS_adapt_length(12));
203 205 make.width.height.mas_equalTo(DS_adapt_length(60));
204 206 }];
  207 + self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(60)];
205 208 [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
206 209 make.top.equalTo(self.topImageView).offset(kStatusHeight);
207 210 make.right.equalTo(self.topImageView).offset(-DS_adapt_length(10));
... ... @@ -210,6 +213,12 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne
210 213 }];
211 214 }
212 215 }
  216 +-(CAShapeLayer *)maskLayerWithWidth:(CGFloat)width{
  217 + UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, width, width) cornerRadius:(width)/2];
  218 + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
  219 + maskLayer.path = path.CGPath;
  220 + return maskLayer;
  221 +}
213 222 #pragma mark - Getting
214 223 - (UIScrollView *)bgScrollView
215 224 {
... ...
CNLiveCMineModule/Classes/CNCSubMine/Present/CNCSubMinePresent.m
  View file @8d03d2c
... ... @@ -42,11 +42,11 @@
42 42 NSNumber *rowHeight = @56;
43 43 NSString *isHidden = @"0";
44 44 NSDictionary *dic = [[NSUserDefaults standardUserDefaults] objectForKey:CNWjjAddSourceTime];
45   -// if(!dic[@"isShowIntegral"]||[dic[@"isShowIntegral"] isEqualToString:@"false"]||[dic[@"isShowIntegral"] isEqualToString:@"0"]){
46   -// //隐藏
47   -// rowHeight = @0;
48   -// isHidden = @"1";
49   -// }
  45 + if(!dic[@"isShowIntegral"]||[dic[@"isShowIntegral"] isEqualToString:@"false"]||[dic[@"isShowIntegral"] isEqualToString:@"0"]){
  46 + //隐藏
  47 + rowHeight = @0;
  48 + isHidden = @"1";
  49 + }
50 50 NSArray *array = @[
51 51 @{
52 52 @"title":@"更换手机号",
... ...
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineSettingVC.m
  View file @8d03d2c
... ... @@ -164,12 +164,7 @@ static NSString *settingListCellId = @"settingListCellId";
164 164 #pragma mark - UITableViewDelegate
165 165 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
166 166 [self.tableView qmui_clearsSelection];
167   - NSDictionary *dic = [[NSUserDefaults standardUserDefaults] objectForKey:CNWjjAddSourceTime];
168   - NSInteger i = 0;
169   - if(!dic[@"isShowIntegral"]||[dic[@"isShowIntegral"] isEqualToString:@"false"]||[dic[@"isShowIntegral"] isEqualToString:@"0"]){
170   - //隐藏
171   - i = 1;
172   - }
  167 + NSInteger i = 1;
173 168 if (indexPath.row == 0) {
174 169 // 更换手机号
175 170 CNMineChangePhoneNumController *cpnVC = [[CNMineChangePhoneNumController alloc] init];
... ...
Example/CNLiveCMineModule/CNLiveCMineViewModuleImpl.m
  View file @8d03d2c
... ... @@ -64,6 +64,9 @@
64 64 // UIImage *image = [SGQRCodeGenerateManager generateWithLogoQRCodeData:jsonStr logoImageName:@"ewm_lcon" logoScaleToSuperView:0.2];
65 65 return [UIImage new];
66 66 }
  67 +- (void)addressSendVCType:(CNLiveAddressType)type block:(nullable void(^)(id addressObj) ) block{
  68 +
  69 +}
67 70 - (void)appLoginOut:(BOOL)closePush{
68 71 // //退出登录
69 72 // [CNLiveBBASMModuleService accountLogout];
... ...