no message

iOS-Xiaowen
1 parent b91440a1
Showing 10 changed files with 33 additions and 12 deletions
CNLiveBMineModule/Assets/CNLiveBMineModule.xcassets/mine_overbadge.imageset/mine_overbadge@2x.png
CNLiveBMineModule/Assets/CNLiveBMineModule.xcassets/mine_overbadge.imageset/mine_overbadge@3x.png
CNLiveBMineModule/Assets/CNLiveBMineModule.xcassets/mine_overbadge.imageset/Contents.json → CNLiveBMineModule/Assets/CNLiveBMineModule.xcassets/mine_qiye.imageset/Contents.json
CNLiveBMineModule/Assets/CNLiveBMineModule.xcassets/mine_qiye.imageset/mine_qiye@2x.png
CNLiveBMineModule/Assets/CNLiveBMineModule.xcassets/mine_qiye.imageset/mine_qiye@3x.png
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageCell.h
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageCell.m
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageController.m
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageRequest.m
CNLiveBMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "mine_qiye@2x.png",
       "idiom" : "universal",
-      "filename" : "mine_overbadge@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "mine_qiye@3x.png",
       "idiom" : "universal",
-      "filename" : "mine_overbadge@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol CNLiveBindingManageCellDelegate <NSObject>
 //isBinding YES 绑定操作  NO 解除绑定操作
 - (void)clickedBindingButton:(CNLiveBindingManageCell *)cell isBinding:(BOOL)isBinding;
+- (void)jumpBingdingTel;
 @end
@@ -161,6 +161,11 @@ static NSInteger const margin = 15;
 #pragma mark - Action
 - (void)manageDidClicked:(UIButton *)btn{
     if([self.model.thirdPartyPlat isEqualToString:@"10"]){
+        if([self.model.isBinding isEqualToString:@"0"]){
+            if (self.delegate && [self.delegate respondsToSelector:@selector(jumpBingdingTel)]) {
+                [self.delegate jumpBingdingTel];
+            }
+        }
         return;
     }
     if(![CNLiveNetworking isNetworking]){
@@ -13,6 +13,7 @@
 #import "CNLiveBaseKit.h"
 #import "CNLiveNavigationBar.h"
+#import "CNLiveUpdateTelController.h"
 #import "CNLiveBindingManageHeaderView.h"
 #import "CNLiveBindingManageCell.h"
 #import "CNLiveBindingManageModel.h"
@@ -28,6 +29,11 @@
 @implementation CNLiveBindingManageController
 #pragma mark - CNLiveBindingManageCellDelegate
+- (void)jumpBingdingTel{
+    CNLiveUpdateTelController *vc = [[CNLiveUpdateTelController alloc] init];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 - (void)clickedBindingButton:(CNLiveBindingManageCell *)cell isBinding:(BOOL)isBinding{
     if(isBinding){
         //绑定操作
@@ -188,15 +188,24 @@
 }
 //请求绑定数据
+//请求绑定数据
 + (void)requestModels:(CNLiveBindingArrayBlock)block{
     NSMutableArray *bindingData = [[NSMutableArray alloc] init];
     NSMutableArray *unBindingData = [[NSMutableArray alloc] init];
     CNLiveBindingManageModel *tmodel = [[CNLiveBindingManageModel alloc]init];
     tmodel.title = @"手机号";
     tmodel.image = @"mine_telephone";
-    NSString *mobile = [CNUserShareModel.mobile stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
-    tmodel.desc = mobile;
-    tmodel.isBinding = @"1";
+    if(CNUserShareModel.mobile&&![CNUserShareModel.mobile isEqualToString:@""]){
+        if (CNUserShareModel.mobile.length > 10) {
+            NSString *mobile = [CNUserShareModel.mobile stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
+            tmodel.desc = mobile;
+        }
+        tmodel.thirdPartyId = CNUserShareModel.qqUid;
+        tmodel.isBinding = @"1";
+    }else{
+        tmodel.desc = @"未绑定手机号";
+        tmodel.isBinding = @"0";
+    }
     tmodel.thirdPartyPlat = @"10";
     tmodel.thirdPartyId = CNUserShareModel.uid;
     [bindingData addObject:tmodel];
@@ -55,7 +55,7 @@ static const NSInteger margin = 20;
         _name.text = info;
     }else if(type == CNLiveUserInfoDataTypeAddress){
-        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info fontSize:13.0 isFront:YES];
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info?info:@"未知" fontSize:13.0 isFront:YES];
     }
 }
@@ -143,7 +143,7 @@ static const NSInteger margin = 20;
     _isRefresh = isRefresh;
     if(isRefresh){
         _name.text = CNUserShareModel.nickname;
-        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location fontSize:13.0 isFront:YES];
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location?CNUserShareModel.location:@"未知" fontSize:13.0 isFront:YES];
     }
 }
@@ -300,7 +300,7 @@ static const NSInteger margin = 20;
         _certification.numberOfLines = 1;
         _certification.textColor = [UIColor whiteColor];
         _certification.font = [UIFont systemFontOfSize:16];
-        _certification.attributedText = [self createAttributedImages:@[@"mine_wjj_certification",@"mine_common",@"mine_overbadge"]];
+        _certification.attributedText = [self createAttributedImages:@[@"mine_wjj_certification",@"mine_common",@"mine_qiye"]];
     }
     return _certification;
 }
@@ -310,7 +310,7 @@ static const NSInteger margin = 20;
         _address.numberOfLines = 1;
         _address.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
         _address.font = [UIFont systemFontOfSize:13];
-        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location fontSize:13.0 isFront:YES];
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location?CNUserShareModel.location:@"未知" fontSize:13.0 isFront:YES];
     }
     return _address;
 }