靓号业务逻辑 暂时提交

MiMoLive/MiMoLive/Classes/Base/StarNum/MOStarNumView.h

@@ -6,7 +6,7 @@
 //
 
 #define MOStarNumViewSmallHeight 20.0
-#define MOStarNumViewSmallFont  7.0
+#define MOStarNumViewSmallFont  8.0
 
 #define MOStarNumViewNormalHeight 27.0
 
@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) CGFloat viewWidth;
 
 @property (nonatomic, strong) NSString *idNumStr;
+@property (nonatomic, assign) NSInteger levelNum;
 
 - (CGFloat)getTheViewWidth;
 

MiMoLive/MiMoLive/Classes/Base/StarNum/MOStarNumView.m

@@ -77,6 +77,35 @@
     self.numLab.text = idNumStr;
 }
 
+- (void)setLevelNum:(NSInteger)levelNum{
+    _levelNum = levelNum;
+    
+    [self.bgImgView setImage:[MOStarNumView getTheBgImgWith:levelNum]];
+    
+}
+
++ (UIImage *)getTheBgImgWith:(NSInteger)level{
+    UIImage *needImg;
+    
+    if(level >= 4){
+        needImg = [UIImage imageNamed:@"icon_star_4"];
+        return needImg;
+    }
+    
+    if(level >= 3){
+        needImg = [UIImage imageNamed:@"icon_star_3"];
+        return needImg;
+    }
+    
+    if(level >= 2){
+        needImg = [UIImage imageNamed:@"icon_star_2"];
+        return needImg;
+    }
+    
+    needImg = [UIImage imageNamed:@"icon_star_1"];
+    return needImg;
+}
+
 #pragma mark - Lazy
 - (UIImageView *)bgImgView{
     if(!_bgImgView){

MiMoLive/MiMoLive/Classes/Live/View/LiveingView/MOShowRoomLiveView.m

@@ -1821,6 +1821,17 @@ static int theLikeComboNum = 0;
     self.headViewWidth.constant = [self.headView theViewWidth];
     
     [self.roomIdLab setTitle:[NSString stringWithFormat:@"ID: %@",roomInfo.anchorUser.userNo] forState:UIControlStateNormal];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",roomInfo.anchorUser.userNo];
+    self.startView.levelNum = (NSInteger)roomInfo.anchorUser.beautifulLevel;
+    
+    if(roomInfo.anchorUser.beautifulLevel == 0){
+        self.roomIdLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.roomIdLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     //时间计时
     if(self.isCreatLive){
@@ -1845,6 +1856,7 @@ static int theLikeComboNum = 0;
         }
         
         self.roomIdLab.hidden = YES;
+        self.startView.hidden = YES;
         self.headView.roomNoStr = roomInfo.anchorUser.userNo;
         
         if(self.isCreatLive){

MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/MOInvitePkCell.m

@@ -74,13 +74,14 @@
         make.width.equalTo(@40.0);
     }];
     
-    self.startView.viewHeight = MOStarNumViewNormalHeight;
+    self.startView.viewHeight = MOStarNumViewSmallHeight;
+    self.startView.fontSize = MOStarNumViewSmallFont;
     CGFloat startWidth = [self.startView getTheViewWidth];
     [self.contentView addSubview:self.startView];
     [self.startView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.idLab.mas_centerY);
-        make.centerX.equalTo(self.idLab.mas_centerX);
-        make.height.equalTo(@(MOStarNumViewNormalHeight));
+        make.left.equalTo(self.idLab.mas_left).offset(-3.0);
+        make.height.equalTo(@(MOStarNumViewSmallHeight));
         make.width.equalTo(@(startWidth));
     }];
     
@@ -181,7 +182,20 @@
     }
     
     CGFloat idWidth = [MOTools getWidthWithString:[NSString stringWithFormat:@"ID: %@",cellModel.userProfile.userNo] font:[UIFont systemFontOfSize:10.0]] + 3.0;
+    
     self.idLab.text = [NSString stringWithFormat:@"ID: %@",cellModel.userProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",cellModel.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)cellModel.userProfile.beautifulLevel;
+    
+    if(cellModel.userProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
+    
     if(idWidth < 20.0){
         idWidth = 20.0;
     }

MiMoLive/MiMoLive/Classes/Live/View/UserInfoView/MOLiveUserInfoView.m

@@ -464,6 +464,17 @@
     
     
     [self.idBtn setTitle:[NSString stringWithFormat:@"ID:%@",userModel.userProfile.userNo] forState:UIControlStateNormal];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",userModel.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)userModel.userProfile.beautifulLevel;
+    
+    if(userModel.userProfile.beautifulLevel == 0){
+        self.idBtn.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idBtn.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     MOCountryList *countryModel;
     if(userModel.userProfile.country.length != 0){

MiMoLive/MiMoLive/Classes/Live/View/VoiceRoom/Application/MOApplicationTableViewCell.m

@@ -82,7 +82,19 @@
         [self.headImgView sd_setImageWithURL:[NSURL URLWithString:cellModel.userBase.userProfile.avatar] placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
         
         self.nameLab.text = cellModel.userBase.userProfile.nickname;
+        
         self.idLab.text = cellModel.userBase.userProfile.userNo;
+        self.startView.idNumStr = [NSString stringWithFormat:@"%@",cellModel.userBase.userProfile.userNo];
+        self.startView.levelNum = (NSInteger)cellModel.userBase.userProfile.beautifulLevel;
+        
+        if(cellModel.userBase.userProfile.beautifulLevel == 0){
+            self.idLab.hidden = NO;
+            self.startView.hidden = YES;
+        }
+        else{
+            self.idLab.hidden = YES;
+            self.startView.hidden = NO;
+        }
         
         if(cellModel.userBase.userProfile.adornment.headdress.length > 0){
             self.headBgView.hidden = NO;
@@ -107,7 +119,19 @@
     [self.headImgView sd_setImageWithURL:[NSURL URLWithString:applyCellModel.userBase.userProfile.avatar] placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
     
     self.nameLab.text = applyCellModel.userBase.userProfile.nickname;
+    
     self.idLab.text = [NSString stringWithFormat:@"ID: %@",applyCellModel.userBase.userProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",applyCellModel.userBase.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)applyCellModel.userBase.userProfile.beautifulLevel;
+    
+    if(applyCellModel.userBase.userProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     self.indexLab.hidden = NO;
     self.indexLab.text = [NSString stringWithFormat:@"%zd",(self.cellIndexPath.row + 1)];
@@ -140,7 +164,19 @@
         [self.headImgView sd_setImageWithURL:[NSURL URLWithString:linkCellModel.profile.avatar] placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
         
         self.nameLab.text = linkCellModel.profile.nickname;
+        
         self.idLab.text = linkCellModel.profile.userNo;
+        self.startView.idNumStr = [NSString stringWithFormat:@"%@",linkCellModel.profile.userNo];
+        self.startView.levelNum = (NSInteger)linkCellModel.profile.beautifulLevel;
+        
+        if(linkCellModel.profile.beautifulLevel == 0){
+            self.idLab.hidden = NO;
+            self.startView.hidden = YES;
+        }
+        else{
+            self.idLab.hidden = YES;
+            self.startView.hidden = NO;
+        }
         
         if(linkCellModel.video2){
             self.videoBtn.selected = YES;

MiMoLive/MiMoLive/Classes/Live/View/VoiceRoom/Connect/MOVoiceConnectBaseView.m

@@ -99,6 +99,17 @@
     self.nameLab.text = anchorProfile.nickname;
     
     self.idLab.text = [NSString stringWithFormat:@"ID: %@",anchorProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",anchorProfile.userNo];
+    self.startView.levelNum = (NSInteger)anchorProfile.beautifulLevel;
+    
+    if(anchorProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     self.genderImgView.hidden = NO;
     if(anchorProfile.gender == 1){

MiMoLive/MiMoLive/Classes/Live/View/VoiceRoom/ContributionList/MOVoiceContriCell.m

@@ -84,6 +84,17 @@
     }
     
     self.idLab.text = [NSString stringWithFormat:@"ID: %@",cellModel.userBase.userProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",cellModel.userBase.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)cellModel.userBase.userProfile.beautifulLevel;
+    
+    if(cellModel.userBase.userProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     NSString *goldNumStr = [MOTextTools numberToStringWith:cellModel.total];
     [self.zuanBtn setTitle:goldNumStr forState:UIControlStateNormal];

MiMoLive/MiMoLive/Classes/Live/View/VoiceRoom/InviteView/MOInviteTableViewCell.m

@@ -33,7 +33,7 @@
     CGFloat startWidth = [self.startView getTheViewWidth];
     [self.contentView addSubview:self.startView];
     [self.startView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(self.idLab.mas_centerY);
+        make.centerY.equalTo(self.idLab.mas_centerY).offset(-3);
         make.left.equalTo(self.idLab.mas_left).offset(-10.0);
         make.height.equalTo(@(MOStarNumViewNormalHeight));
         make.width.equalTo(@(startWidth));
@@ -51,7 +51,19 @@
     
     [self.headImgView sd_setImageWithURL:[NSURL URLWithString:cellModel.userProfile.avatar] placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
     self.nameLab.text = cellModel.userProfile.nickname;
+    
     self.idLab.text = [NSString stringWithFormat:@"ID: %@",cellModel.userProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",cellModel.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)cellModel.userProfile.beautifulLevel;
+    
+    if(cellModel.userProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     if(cellModel.isSelect){
         self.inviteBtn.selected = YES;

MiMoLive/MiMoLive/Classes/Mine/Controller/AboutHomePage/View/MOHomePageTopCell.m

@@ -101,7 +101,7 @@
     [self.contentView addSubview:self.startView];
     [self.startView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.idBtn.mas_centerY);
-        make.left.equalTo(self.idBtn.mas_left).offset(-10.0);
+        make.left.equalTo(self.idBtn.mas_left).offset(-5.0);
         make.height.equalTo(@(MOStarNumViewNormalHeight));
         make.width.equalTo(@(startWidth));
     }];
@@ -376,8 +376,27 @@
     
     NSString *idStr = [NSString stringWithFormat:@"ID: %@",userProfile.userNo];
     CGFloat idBtnWidth = [MOTools getWidthWithString:idStr font:[MOTextTools getTheFontWithSize:10.0 AndFontName:@"Akrobat"]] + 30.0;
+    
+    if(userProfile.beautifulLevel > 0){
+        idBtnWidth = idBtnWidth + 30.0;
+    }
+    
     self.idBtnWidth.constant = idBtnWidth;
+    
     [self.idBtn setTitle:idStr forState:UIControlStateNormal];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",userProfile.userNo];
+    self.startView.levelNum = (NSInteger)userProfile.beautifulLevel;
+    
+    if(userProfile.beautifulLevel == 0){
+        self.idBtn.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idBtn.hidden = NO;
+        self.idBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+        [self.idBtn setTitle:@" " forState:UIControlStateNormal];
+        self.startView.hidden = NO;
+    }
     
     MOCountryList *countryModel;
     if(userProfile.country.length != 0){

MiMoLive/MiMoLive/Classes/Mine/Controller/AboutHomePage/View/MOHomePageTopCell.xib

@@ -177,14 +177,14 @@
                         </connections>
                     </button>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3Fu-z9-wq2">
-                        <rect key="frame" x="140" y="427.66666666666669" width="18" height="18"/>
+                        <rect key="frame" x="150" y="427.66666666666669" width="18" height="18"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="18" id="hlo-r2-x6T"/>
                             <constraint firstAttribute="height" constant="18" id="umh-yx-WHQ"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SvP-0K-zVn">
-                        <rect key="frame" x="164" y="430.33333333333331" width="2" height="13"/>
+                        <rect key="frame" x="174" y="430.33333333333331" width="2" height="13"/>
                         <fontDescription key="fontDescription" name="Akrobat-Black" family="Akrobat" pointSize="10"/>
                         <color key="textColor" red="0.35686274509803922" green="0.35686274509803922" blue="0.35686274509803922" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -206,7 +206,7 @@
                     <constraint firstItem="SvP-0K-zVn" firstAttribute="centerY" secondItem="3Fu-z9-wq2" secondAttribute="centerY" id="PBq-5i-bsR"/>
                     <constraint firstItem="7td-kM-LEw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Ped-EZ-wtT"/>
                     <constraint firstAttribute="trailing" secondItem="qDI-xL-iaD" secondAttribute="trailing" constant="21" id="Pey-9x-Keh"/>
-                    <constraint firstItem="3Fu-z9-wq2" firstAttribute="leading" secondItem="omG-TO-lj1" secondAttribute="trailing" constant="10" id="PjE-Wc-YTO"/>
+                    <constraint firstItem="3Fu-z9-wq2" firstAttribute="leading" secondItem="omG-TO-lj1" secondAttribute="trailing" constant="20" id="PjE-Wc-YTO"/>
                     <constraint firstItem="lMf-Op-wWh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="QMQ-qf-5FH"/>
                     <constraint firstItem="n5E-2R-MhC" firstAttribute="bottom" secondItem="1G1-hI-Ojh" secondAttribute="bottom" constant="3" id="Qle-Kv-csr"/>
                     <constraint firstItem="VI3-mt-mqA" firstAttribute="leading" secondItem="VZw-1H-dLM" secondAttribute="trailing" constant="8" id="RFR-DR-egU"/>
@@ -254,7 +254,7 @@
     <resources>
         <image name="icon_hP_c_btn" width="94.333335876464844" height="59.666667938232422"/>
         <image name="icon_hP_top_bg" width="375" height="303"/>
-        <image name="icon_mine_copy_black" width="8" height="8"/>
+        <image name="icon_mine_copy_black" width="10.333333015441895" height="10.333333015441895"/>
         <image name="icon_mine_info_edit" width="15.333333015441895" height="15.666666984558105"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

MiMoLive/MiMoLive/Classes/Mine/Controller/ContactPerson/ContactPersonView/MOContactListBaseCell.m

@@ -95,14 +95,13 @@
         _idBtn.layer.cornerRadius = 17.0 / 2.0;
         _idBtn.layer.masksToBounds = YES;
         
-        self.startView.viewHeight = MOStarNumViewSmallHeight;
-        self.startView.fontSize = MOStarNumViewSmallFont;
+        self.startView.viewHeight = 25.0;
         CGFloat startWidth = [self.startView getTheViewWidth];
         [self.contentView addSubview:self.startView];
         [self.startView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.equalTo(self.idBtn.mas_centerY);
             make.left.equalTo(self.idBtn.mas_left).offset(-2.0);
-            make.height.equalTo(@(MOStarNumViewSmallHeight));
+            make.height.equalTo(@(25.0));
             make.width.equalTo(@(startWidth));
         }];
         
@@ -231,6 +230,17 @@
     }
     
     [self.idBtn setTitle:[NSString stringWithFormat:@"ID:%@",model.userBase.userProfile.userNo] forState:UIControlStateNormal];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",model.userBase.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)model.userBase.userProfile.beautifulLevel;
+    
+    if(model.userBase.userProfile.beautifulLevel == 0){
+        self.idBtn.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idBtn.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     self.vipImgView.hidden = YES;
     CGFloat levelLeftSpac = 12.0;

MiMoLive/MiMoLive/Classes/Mine/Controller/ContactPerson/Model/MOUserProfile.h

@@ -34,6 +34,7 @@
 @property (nonatomic, assign) NSInteger seatNum;
 @property (nonatomic, assign) BOOL isSelect;
 
+/** 靓号等级 0为没有 1 ~ 4 */
 @property (nonatomic, assign) double beautifulLevel;
 @property (nonatomic, strong) NSString *orgUserNo;
 

MiMoLive/MiMoLive/Classes/Mine/View/MOMine/MOMianTopCell.m

@@ -246,8 +246,28 @@
     
     NSString *idStr = [NSString stringWithFormat:@"ID: %@",meDataInfo.userProfile.userNo];
     CGFloat idBtnWidth = [MOTools getWidthWithString:idStr font:[UIFont systemFontOfSize:10]] + 25.0;
+    
+    if(meDataInfo.userProfile.beautifulLevel > 0){
+        idBtnWidth = idBtnWidth + 15.0;
+    }
+    
     self.idBtnWidth.constant = idBtnWidth;
+    
     [self.idBtn setTitle:[NSString stringWithFormat:@"ID: %@",meDataInfo.userProfile.userNo] forState:UIControlStateNormal];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",meDataInfo.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)meDataInfo.userProfile.beautifulLevel;
+    
+    if(meDataInfo.userProfile.beautifulLevel == 0){
+        self.idBtn.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idBtn.hidden = NO;
+        self.idBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+        [self.idBtn setTitle:@" " forState:UIControlStateNormal];
+        self.startView.hidden = NO;
+    }
+    
     
     self.friendNumLab.text = [NSString stringWithFormat:@"%.f",meDataInfo.friends];
     self.followerNumLab.text = [NSString stringWithFormat:@"%.f",meDataInfo.follows];

MiMoLive/MiMoLive/Classes/Mine/View/MOMineSetUp/MOBlackListBaseCell.m

@@ -66,7 +66,7 @@
         [self.contentView addSubview:self.startView];
         [self.startView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.equalTo(self.idLab.mas_centerY);
-            make.left.equalTo(self.idLab.mas_left).offset(-10.0);
+            make.left.equalTo(self.idLab.mas_left).offset(-3.0);
             make.height.equalTo(@(MOStarNumViewNormalHeight));
             make.width.equalTo(@(startWidth));
         }];
@@ -116,6 +116,17 @@
     }
     
     self.idLab.text = [NSString stringWithFormat:@"ID: %@",cellModel.userBase.userProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",cellModel.userBase.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)cellModel.userBase.userProfile.beautifulLevel;
+    
+    if(cellModel.userBase.userProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     if(cellModel.userBase.userProfile.gender == 1){
         [self.genderImg setImage:[UIImage imageNamed:@"icon_contact_man"]];

MiMoLive/MiMoLive/Classes/Square/View/History/MOHistoryListCell.m

@@ -106,7 +106,7 @@
         [self.contentView addSubview:self.startView];
         [self.startView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.equalTo(self.idLab.mas_centerY);
-            make.left.equalTo(self.idLab.mas_left).offset(-10.0);
+            make.left.equalTo(self.idLab.mas_left).offset(-5.0);
             make.height.equalTo(@(MOStarNumViewNormalHeight));
             make.width.equalTo(@(startWidth));
         }];
@@ -163,6 +163,17 @@
     }
     
     self.idLab.text = [NSString stringWithFormat:@"ID:%@",cellModel.userProfile.userNo];
+    self.startView.idNumStr = [NSString stringWithFormat:@"%@",cellModel.userProfile.userNo];
+    self.startView.levelNum = (NSInteger)cellModel.userProfile.beautifulLevel;
+    
+    if(cellModel.userProfile.beautifulLevel == 0){
+        self.idLab.hidden = NO;
+        self.startView.hidden = YES;
+    }
+    else{
+        self.idLab.hidden = YES;
+        self.startView.hidden = NO;
+    }
     
     self.followBtn.selected = cellModel.follow;