修复问题

yanglingyu
1 parent 52616964
Showing 15 changed files with 33 additions and 24 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_qq@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_qq@3x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_wechat@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_wechat@3x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_weibo@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/c_mine_login_weibo@3x.png
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.h
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.m
CNLiveCMineModule/Classes/CNCMine/View/CNListCollectionView.m
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
CNLiveCMineModule/Classes/CNCSubMine/Present/CNCSubMinePresent.m
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineSettingVC.m
Example/CNLiveCMineModule/CNLiveCMineViewModuleImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.1.4'
+  s.version          = '0.1.5'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -32,8 +32,6 @@ typedef enum {
 } CNGetAgreementH5Type;
-typedef void(^SuccessBlock)(NSString *h5,NSString *title);
-typedef void(^FailureBlock)(NSError *error);
 NS_ASSUME_NONNULL_BEGIN
 @interface CNMinePresent : NSObject
 /// 返回包含扫码、客服、设置的数组
@@ -56,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param responseBlock 返回数据
 + (void)requestFeedback:(NSString *)message secceedBlock:(void(^)(void))responseBlock;
-+ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure;
++ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(void(^)(NSString *h5,NSString *title))success failure:(void(^)(NSError *error))failure;
 /// 是否展示社区按钮
 /// @param block 返回是否展示状态
 + (void)requestCommunitySucceed:(void(^)(BOOL isCommunity))block;
@@ -448,7 +448,7 @@
     }];
 }
-+ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure {
++ (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(void(^)(NSString *h5,NSString *title))success failure:(void(^)(NSError *error))failure{
     [CNLiveNetworking setAllowRequestDefaultArgument:NO];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNGetAgreementH5Url Param:@{} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
@@ -184,7 +184,7 @@ static NSString *CNWalletCellID = @&quot;CNWalletCellID&quot;;
         }
     }else if (_model.type == 5){
         CNMineListModel *listModel =  [CNMineListModel mj_objectWithKeyValues:self.model.lists[indexPath.row]];
-        if ([listModel.title isEqualToString:@"小家音响"]) {
+        if ([listModel.title isEqualToString:@"小家音箱"]) {
             [[CNLiveCMineService shareMineProtocol] pushCMinePagesEvent:@"config_click_xiaojia"];
             CNLiveAddDeviceController *addDeviceVC = [[CNLiveAddDeviceController alloc]init];
             [[BaseAppDelegate sharedAppDelegate] pushViewController:addDeviceVC];
@@ -37,6 +37,10 @@
         [self addSubview:self.titleLabel];
         [self addSubview:self.mineListView];
         [self uploadViewLayout];
+        weakself
+        [CNMinePresent requestCommunitySucceed:^(BOOL isCommunity) {
+            weakSelf.myCommuintyBtn.hidden = !isCommunity;
+        }];
     }
     return self;
 }
@@ -101,10 +105,6 @@
     } else {
         self.titleLabel.text = @"昵称";
     }
-    weakself
-    [CNMinePresent requestCommunitySucceed:^(BOOL isCommunity) {
-        weakSelf.myCommuintyBtn.hidden = !isCommunity;
-    }];
 }
 #pragma mark - Action
 - (void)buttonAction:(UIButton *)sender{
@@ -135,9 +135,9 @@
 {
     if (!_iconImage) {
         _iconImage = [[UIImageView alloc] init];
-        _iconImage.layer.cornerRadius = 30;
+        _iconImage.layer.cornerRadius = DS_adapt_length(30);
         _iconImage.contentMode = UIViewContentModeScaleAspectFill;
-        _iconImage.image = [CNLiveCMineService imageWithMineName:@"mine_no_Avatar"];
+        [_iconImage sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:[CNLiveCMineService imageWithMineName:@"mine_no_Avatar"]];
         _iconImage.userInteractionEnabled = YES;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
             CNMinePersonInfoController *infoVC = [[CNMinePersonInfoController alloc] init];
@@ -194,7 +194,11 @@
         _titleLabel.textColor = kWhiteColor;
         _titleLabel.textAlignment = NSTextAlignmentLeft;
         _titleLabel.font = UIFontCNMake(17);
-        _titleLabel.text = @"我的昵称";
+        if (![NSString isEmpty:CNUserShareModel.nickname]) {
+            [_titleLabel setText:CNUserShareModel.nickname];
+        } else {
+            _titleLabel.text = @"昵称";
+        }
     }
     return _titleLabel;
 }
@@ -172,6 +172,7 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
             make.left.equalTo(self.view).offset(DS_adapt_length( 12));
             make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28));
         }];
+        self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28)];
         [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.view).offset(kStatusHeight);
             make.right.equalTo(self.view).offset(-DS_adapt_length(10));
@@ -187,6 +188,7 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
             make.left.equalTo(self.view).offset(DS_adapt_length(12));
             make.width.height.mas_equalTo(DS_adapt_length(32));
         }];
+        self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(32)];
         [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.view).offset(kStatusHeight);
             make.right.equalTo(self.view).offset(-DS_adapt_length(10));
@@ -202,6 +204,7 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
             make.left.equalTo(self.topImageView).offset(DS_adapt_length(12));
             make.width.height.mas_equalTo(DS_adapt_length(60));
         }];
+        self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(60)];
         [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.topImageView).offset(kStatusHeight);
             make.right.equalTo(self.topImageView).offset(-DS_adapt_length(10));
@@ -210,6 +213,12 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
         }];
     }
 }
+-(CAShapeLayer *)maskLayerWithWidth:(CGFloat)width{
+    UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, width, width) cornerRadius:(width)/2];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.path = path.CGPath;
+    return maskLayer;
+}
 #pragma mark - Getting
 - (UIScrollView *)bgScrollView
 {
@@ -42,11 +42,11 @@
     NSNumber *rowHeight = @56;
     NSString *isHidden = @"0";
     NSDictionary *dic = [[NSUserDefaults standardUserDefaults] objectForKey:CNWjjAddSourceTime];
-//    if(!dic[@"isShowIntegral"]||[dic[@"isShowIntegral"] isEqualToString:@"false"]||[dic[@"isShowIntegral"] isEqualToString:@"0"]){
-//        //隐藏
-//        rowHeight = @0;
-//        isHidden = @"1";
-//    }
+    if(!dic[@"isShowIntegral"]||[dic[@"isShowIntegral"] isEqualToString:@"false"]||[dic[@"isShowIntegral"] isEqualToString:@"0"]){
+        //隐藏
+        rowHeight = @0;
+        isHidden = @"1";
+    }
     NSArray *array = @[
                        @{
                            @"title":@"更换手机号",
@@ -164,12 +164,7 @@ static NSString *settingListCellId = @&quot;settingListCellId&quot;;
 #pragma mark - UITableViewDelegate
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     [self.tableView qmui_clearsSelection];
-    NSDictionary *dic = [[NSUserDefaults standardUserDefaults] objectForKey:CNWjjAddSourceTime];
-   NSInteger i = 0;
-    if(!dic[@"isShowIntegral"]||[dic[@"isShowIntegral"] isEqualToString:@"false"]||[dic[@"isShowIntegral"] isEqualToString:@"0"]){
-        //隐藏
-        i = 1;
-    }
+   NSInteger i = 1;
     if (indexPath.row == 0) {
         // 更换手机号
             CNMineChangePhoneNumController *cpnVC = [[CNMineChangePhoneNumController alloc] init];
@@ -64,6 +64,9 @@
 //    UIImage *image = [SGQRCodeGenerateManager generateWithLogoQRCodeData:jsonStr logoImageName:@"ewm_lcon" logoScaleToSuperView:0.2];
     return [UIImage new];
 }
+- (void)addressSendVCType:(CNLiveAddressType)type block:(nullable void(^)(id addressObj) ) block{
+    
+}
 - (void)appLoginOut:(BOOL)closePush{
 //    //退出登录
 //    [CNLiveBBASMModuleService accountLogout];