暂时提交

MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/PKContribution/MOPkContribuCell.m

@@ -12,6 +12,9 @@
 @property (weak, nonatomic) IBOutlet UIView *bgView;
 @property (weak, nonatomic) IBOutlet UILabel *indexLab;
 
+@property (weak, nonatomic) IBOutlet UIImageView *indexImg;
+
+
 @property (weak, nonatomic) IBOutlet UIImageView *headImg;
 @property (weak, nonatomic) IBOutlet UILabel *nameLab;
 @property (weak, nonatomic) IBOutlet UIImageView *genderImg;
@@ -32,6 +35,7 @@
     
     [self.nameLab setFont:[MOTextTools getTheFontWithSize:14.0 AndFontName:@"Akrobat"]];
     [self.pkNumLab setFont:[MOTextTools getTheFontWithSize:12.0 AndFontName:@"Akrobat"]];
+    [self.indexLab setFont:[MOTextTools getTheFontWithSize:20.0 AndFontName:@"Akrobat"]];
     
     self.backgroundColor = [UIColor clearColor];
     
@@ -104,9 +108,24 @@
         self.headBgView.hidden = YES;
     }
     
-    NSInteger sortNum = self.cellIndexPath.row + 1;
-    NSString *sortStr = [NSString stringWithFormat:@"%zd",sortNum];
-    self.indexLab.text = sortStr;
+    self.indexLab.hidden = YES;
+    self.indexImg.hidden = NO;
+    if(self.cellIndexPath.row == 0){
+        [self.indexImg setImage:[UIImage imageNamed:@"icon_voice_rank_jin"]];
+    }
+    else if (self.cellIndexPath.row == 1){
+        [self.indexImg setImage:[UIImage imageNamed:@"icon_voice_rank_yin"]];
+    }
+    else if (self.cellIndexPath.row == 2){
+        [self.indexImg setImage:[UIImage imageNamed:@"icon_voice_rank_tong"]];
+    }
+    else{
+        self.indexLab.hidden = NO;
+        self.indexImg.hidden = YES;
+        NSInteger sortNum = self.cellIndexPath.row + 1;
+        NSString *sortStr = [NSString stringWithFormat:@"%zd",sortNum];
+        self.indexLab.text = sortStr;
+    }
 }
 
 - (UIImageView *)levelImgView{

MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/PKContribution/MOPkContribuCell.xib

@@ -22,7 +22,7 @@
                         <rect key="frame" x="5" y="5" width="396" height="95"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Gg-H6-4ig">
-                                <rect key="frame" x="0.0" y="38.666666666666664" width="30" height="18"/>
+                                <rect key="frame" x="0.0" y="38.666666666666664" width="60" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="F5f-bM-RX5"/>
                                 </constraints>
@@ -30,15 +30,22 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_voice_rank_jin" translatesAutoresizingMaskIntoConstraints="NO" id="odB-R5-J2o">
+                                <rect key="frame" x="16" y="34.666666666666664" width="28" height="26"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="28" id="psH-4a-wcI"/>
+                                    <constraint firstAttribute="height" constant="26" id="uI7-Yh-lGp"/>
+                                </constraints>
+                            </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_mine_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="AWi-at-y1e">
-                                <rect key="frame" x="30" y="23.666666666666671" width="48" height="48"/>
+                                <rect key="frame" x="60" y="23.666666666666671" width="48" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="48" id="f4Z-E1-kBX"/>
                                     <constraint firstAttribute="width" constant="48" id="lQq-R3-UYy"/>
                                 </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="Wus-zH-DCV">
-                                <rect key="frame" x="93" y="23.666666666666671" width="42" height="21"/>
+                                <rect key="frame" x="123" y="23.666666666666671" width="42" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="42" id="Jkd-R2-7Wg"/>
                                     <constraint firstAttribute="height" constant="21" id="tFK-uo-5tt"/>
@@ -48,21 +55,21 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="t4k-rn-rgO">
-                                <rect key="frame" x="147" y="26.666666666666671" width="15" height="15"/>
+                                <rect key="frame" x="177" y="26.666666666666671" width="15" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="Jl3-wL-bin"/>
                                     <constraint firstAttribute="width" constant="15" id="v1e-7Y-T2h"/>
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_live_pk" translatesAutoresizingMaskIntoConstraints="NO" id="ozG-G4-3L3">
-                                <rect key="frame" x="93" y="52.666666666666664" width="16" height="15.999999999999993"/>
+                                <rect key="frame" x="123" y="52.666666666666664" width="16" height="15.999999999999993"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="7P6-lc-Y9X"/>
                                     <constraint firstAttribute="width" constant="16" id="FjT-N8-pNx"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kgA-4s-7Cy">
-                                <rect key="frame" x="121" y="50" width="42" height="21"/>
+                                <rect key="frame" x="151" y="50" width="42" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="42" id="W6V-WN-aIz"/>
                                     <constraint firstAttribute="height" constant="21" id="adb-yx-C5z"/>
@@ -71,19 +78,37 @@
                                 <color key="textColor" red="0.59607843137254901" green="0.56862745098039214" blue="0.61176470588235299" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oty-Aq-TCl">
+                                <rect key="frame" x="60" y="94" width="336" height="1"/>
+                                <color key="backgroundColor" red="0.85882352939999995" green="0.85882352939999995" blue="0.85882352939999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="1" id="wc6-o3-zWT" customClass="LBDesignableOnePixelConstant">
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="onePixelConstant">
+                                                <integer key="value" value="1"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                    </constraint>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="AWi-at-y1e" firstAttribute="leading" secondItem="5ee-aS-OxQ" secondAttribute="leading" constant="30" id="8R4-Nh-P6c"/>
+                            <constraint firstItem="AWi-at-y1e" firstAttribute="leading" secondItem="5ee-aS-OxQ" secondAttribute="leading" constant="60" id="8R4-Nh-P6c"/>
                             <constraint firstItem="3Gg-H6-4ig" firstAttribute="leading" secondItem="5ee-aS-OxQ" secondAttribute="leading" id="E2c-R0-C3r"/>
+                            <constraint firstItem="Oty-Aq-TCl" firstAttribute="leading" secondItem="5ee-aS-OxQ" secondAttribute="leading" constant="60" id="FX2-Sq-8kP"/>
                             <constraint firstItem="Wus-zH-DCV" firstAttribute="leading" secondItem="AWi-at-y1e" secondAttribute="trailing" constant="15" id="KAL-Bl-KOV"/>
                             <constraint firstItem="t4k-rn-rgO" firstAttribute="centerY" secondItem="Wus-zH-DCV" secondAttribute="centerY" id="U19-wd-N7L"/>
+                            <constraint firstAttribute="bottom" secondItem="Oty-Aq-TCl" secondAttribute="bottom" id="Yq8-Hg-Gt6"/>
                             <constraint firstItem="kgA-4s-7Cy" firstAttribute="centerY" secondItem="ozG-G4-3L3" secondAttribute="centerY" id="agc-LO-foE"/>
+                            <constraint firstItem="odB-R5-J2o" firstAttribute="centerY" secondItem="3Gg-H6-4ig" secondAttribute="centerY" id="gck-3r-gOU"/>
                             <constraint firstItem="ozG-G4-3L3" firstAttribute="leading" secondItem="AWi-at-y1e" secondAttribute="trailing" constant="15" id="gih-Js-JKZ"/>
                             <constraint firstItem="ozG-G4-3L3" firstAttribute="top" secondItem="Wus-zH-DCV" secondAttribute="bottom" constant="8" id="hgP-2a-NGC"/>
                             <constraint firstItem="3Gg-H6-4ig" firstAttribute="centerY" secondItem="5ee-aS-OxQ" secondAttribute="centerY" id="nCn-QA-OSE"/>
                             <constraint firstItem="AWi-at-y1e" firstAttribute="centerY" secondItem="5ee-aS-OxQ" secondAttribute="centerY" id="oeT-Qc-cRM"/>
+                            <constraint firstAttribute="trailing" secondItem="Oty-Aq-TCl" secondAttribute="trailing" id="rre-no-FLl"/>
                             <constraint firstItem="Wus-zH-DCV" firstAttribute="top" secondItem="AWi-at-y1e" secondAttribute="top" id="vBU-6E-xfV"/>
+                            <constraint firstItem="odB-R5-J2o" firstAttribute="centerX" secondItem="3Gg-H6-4ig" secondAttribute="centerX" id="vQ3-aG-FyX"/>
                             <constraint firstItem="t4k-rn-rgO" firstAttribute="leading" secondItem="Wus-zH-DCV" secondAttribute="trailing" constant="12" id="vaY-dW-auz"/>
                             <constraint firstItem="AWi-at-y1e" firstAttribute="leading" secondItem="3Gg-H6-4ig" secondAttribute="trailing" id="wKy-dd-F1N"/>
                             <constraint firstItem="kgA-4s-7Cy" firstAttribute="leading" secondItem="ozG-G4-3L3" secondAttribute="trailing" constant="12" id="zH9-yf-Ta5"/>
@@ -102,6 +127,7 @@
                 <outlet property="bgView" destination="5ee-aS-OxQ" id="0aW-7k-YhI"/>
                 <outlet property="genderImg" destination="t4k-rn-rgO" id="j1m-Vj-GTB"/>
                 <outlet property="headImg" destination="AWi-at-y1e" id="X1M-GW-LR6"/>
+                <outlet property="indexImg" destination="odB-R5-J2o" id="wX0-T0-lDO"/>
                 <outlet property="indexLab" destination="3Gg-H6-4ig" id="7wX-yp-d5Y"/>
                 <outlet property="nameLab" destination="Wus-zH-DCV" id="ce7-0W-bjW"/>
                 <outlet property="pkNumLab" destination="kgA-4s-7Cy" id="vqa-U4-CVq"/>
@@ -112,6 +138,7 @@
     <resources>
         <image name="icon_live_pk" width="37.333332061767578" height="36.333332061767578"/>
         <image name="icon_mine_placeHolder" width="70" height="70.333335876464844"/>
+        <image name="icon_voice_rank_jin" width="28.333333969116211" height="26.333333969116211"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>