Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularListView.m

@@ -54,7 +54,7 @@
         FUSPopularListView *xibView = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class]) owner:self options:nil] firstObject];
         xibView.frame = frame;
         self = xibView;
-        _popularTitle.text = [NSString fus_localString:@"热门榜"];
+        _popularTitle.text = [NSString fus_localString:@"人气榜"];
         [self initView];
     }
     return self;

FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularListView.xib

@@ -39,7 +39,7 @@
                                                 <action selector="onTapPopularExplanationBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="e0c-xd-Twm"/>
                                             </connections>
                                         </button>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门榜" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XEc-zv-0VG">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="人气榜" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XEc-zv-0VG">
                                             <rect key="frame" x="15" y="10.5" width="51" height="24"/>
                                             <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="17"/>
                                             <color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>