Merge commit 'a9fb200412736aa9c3adbedf36316028d4eedb2c' into dev_1.8.6

MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -256,7 +256,7 @@
 		A62477EA2AD5314D000C2E10 /* BigBtn.m in Sources */ = {isa = PBXBuildFile; fileRef = A62477E92AD5314D000C2E10 /* BigBtn.m */; };
 		A62477F42AD5364E000C2E10 /* MOMineVC.m in Sources */ = {isa = PBXBuildFile; fileRef = A62477F22AD5364E000C2E10 /* MOMineVC.m */; };
 		A62477F52AD5364E000C2E10 /* MOMineVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = A62477F32AD5364E000C2E10 /* MOMineVC.xib */; };
-		A62477FE2AD53AEB000C2E10 /* MOMianTopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A62477FC2AD53AEB000C2E10 /* MOMianTopCell.m */; };
+		A62477FE2AD53AEB000C2E10 /* MOMineTopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A62477FC2AD53AEB000C2E10 /* MOMineTopCell.m */; };
 		A62477FF2AD53AEB000C2E10 /* MOMineTopCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A62477FD2AD53AEB000C2E10 /* MOMineTopCell.xib */; };
 		A62478022AD553EC000C2E10 /* POBaseStyleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A62478002AD553EC000C2E10 /* POBaseStyleTableViewCell.m */; };
 		A62478052AD55523000C2E10 /* UITableViewCell+POAccessory.m in Sources */ = {isa = PBXBuildFile; fileRef = A62478032AD55523000C2E10 /* UITableViewCell+POAccessory.m */; };
@@ -2085,7 +2085,7 @@
 		A62477F22AD5364E000C2E10 /* MOMineVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOMineVC.m; sourceTree = "<group>"; };
 		A62477F32AD5364E000C2E10 /* MOMineVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MOMineVC.xib; sourceTree = "<group>"; };
 		A62477FB2AD53AEB000C2E10 /* MOMineTopCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOMineTopCell.h; sourceTree = "<group>"; };
-		A62477FC2AD53AEB000C2E10 /* MOMianTopCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOMianTopCell.m; sourceTree = "<group>"; };
+		A62477FC2AD53AEB000C2E10 /* MOMineTopCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOMineTopCell.m; sourceTree = "<group>"; };
 		A62477FD2AD53AEB000C2E10 /* MOMineTopCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MOMineTopCell.xib; sourceTree = "<group>"; };
 		A62478002AD553EC000C2E10 /* POBaseStyleTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POBaseStyleTableViewCell.m; sourceTree = "<group>"; };
 		A62478012AD553EC000C2E10 /* POBaseStyleTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = POBaseStyleTableViewCell.h; sourceTree = "<group>"; };
@@ -4611,7 +4611,7 @@
 			isa = PBXGroup;
 			children = (
 				A62477FB2AD53AEB000C2E10 /* MOMineTopCell.h */,
-				A62477FC2AD53AEB000C2E10 /* MOMianTopCell.m */,
+				A62477FC2AD53AEB000C2E10 /* MOMineTopCell.m */,
 				A62477FD2AD53AEB000C2E10 /* MOMineTopCell.xib */,
 				A6A3BE752D7D444200C219B8 /* MOMineDailySignCell.h */,
 				A6A3BE762D7D444200C219B8 /* MOMineDailySignCell.m */,
@@ -11541,7 +11541,7 @@
 				A61944012AE52E8700D2878F /* MOModifyAvatarVC.m in Sources */,
 				A6F0F52A2CD8A46A0047B965 /* EMMsgExtGifBubbleView.m in Sources */,
 				A68860AE2AE8F53400B87861 /* MOUserBase.m in Sources */,
-				A62477FE2AD53AEB000C2E10 /* MOMianTopCell.m in Sources */,
+				A62477FE2AD53AEB000C2E10 /* MOMineTopCell.m in Sources */,
 				A64BCB542C04D50300072AC9 /* MOFansList.m in Sources */,
 				A6F8CE6E2C35595B003475BE /* MODiaWinBuyView.m in Sources */,
 				A609ED572BFCA47100368C86 /* MOWishStatusList.m in Sources */,

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

@@ -15,6 +15,7 @@
 @interface MOMineTopCell ()
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *headImgTop;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *setBtnTop;
+@property (weak, nonatomic) IBOutlet UIImageView *avatarImgView;
 
 @property (nonatomic, strong) UIImageView *vipImgView;
 @property (nonatomic, strong) MOBaseLevelView *levelImgView;
@@ -46,13 +47,12 @@
     self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.backgroundColor = [UIColor clearColor];
     
-    self.headImg.layer.cornerRadius = 68.0 / 2.0;
-    self.headImg.layer.masksToBounds = YES;
-    self.headImg.layer.borderColor = [MOTools colorWithHexString:@"#FFFFFF" alpha:0.5].CGColor;
-    self.headImg.layer.borderWidth = 0.5;
-    self.headImg.imageView.contentMode = UIViewContentModeScaleAspectFill;
-    [self.headImg sd_setBackgroundImageWithURL:[NSURL URLWithString:GetAvatar] forState:UIControlStateNormal placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
-    
+    self.avatarImgView.userInteractionEnabled = NO;
+    self.avatarImgView.layer.cornerRadius = 68.0 / 2.0;
+    self.avatarImgView.layer.masksToBounds = YES;
+    self.avatarImgView.layer.borderColor = [MOTools colorWithHexString:@"#FFFFFF" alpha:0.5].CGColor;
+    self.avatarImgView.layer.borderWidth = 0.5;
+    self.avatarImgView.contentMode = UIViewContentModeScaleAspectFill;
     
     [self.contentView addSubview:self.headBgView];
     [self.headBgView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -238,7 +238,7 @@
 - (void)setMeDataInfo:(MOMeDataInfo *)meDataInfo{
     _meDataInfo = meDataInfo;
     
-    [self.headImg sd_setImageWithURL:[NSURL URLWithString:GetAvatar] forState:UIControlStateNormal placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
+    [self.avatarImgView sd_setImageWithURL:[NSURL URLWithString:GetAvatar] placeholderImage:[UIImage imageNamed:@"icon_mine_placeHolder"]];
 
     self.nickNameLab.text = meDataInfo.userProfile.nickname;
 

MiMoLive/MiMoLive/Classes/Mine/View/MOMine/MOMineTopCell.xib

@@ -248,10 +248,17 @@
                             <action selector="headImgBtnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Aeo-gY-hTL"/>
                         </connections>
                     </button>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yih-9M-Zo3" userLabel="avatarView">
+                        <rect key="frame" x="20" y="90" width="68" height="68"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="68" id="ris-Hp-bd3"/>
+                        </constraints>
+                    </imageView>
                 </subviews>
                 <constraints>
                     <constraint firstItem="yvc-Ti-gzV" firstAttribute="leading" secondItem="UsL-It-DO3" secondAttribute="leading" id="0cS-4O-p1p"/>
                     <constraint firstAttribute="trailing" secondItem="h0Z-ma-TsM" secondAttribute="trailing" constant="1" id="1o6-rB-y7s"/>
+                    <constraint firstItem="yih-9M-Zo3" firstAttribute="centerX" secondItem="uKi-pa-dR9" secondAttribute="centerX" id="5iA-EI-2bg"/>
                     <constraint firstItem="evY-oh-eq7" firstAttribute="leading" secondItem="UsL-It-DO3" secondAttribute="trailing" constant="5" id="7F5-r6-gDv"/>
                     <constraint firstItem="Cbm-R9-DjE" firstAttribute="top" secondItem="h0Z-ma-TsM" secondAttribute="bottom" constant="2" id="Ak5-rv-2zz"/>
                     <constraint firstItem="4Tr-7j-CcA" firstAttribute="top" secondItem="uKi-pa-dR9" secondAttribute="bottom" constant="18" id="GpB-gO-xkF"/>
@@ -263,6 +270,7 @@
                     <constraint firstItem="Cbm-R9-DjE" firstAttribute="centerX" secondItem="h0Z-ma-TsM" secondAttribute="centerX" id="QL2-dk-Ugy"/>
                     <constraint firstItem="4Tr-7j-CcA" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="VZF-we-Ibw"/>
                     <constraint firstAttribute="trailing" secondItem="4Tr-7j-CcA" secondAttribute="trailing" constant="20" id="YgV-to-yc2"/>
+                    <constraint firstItem="yih-9M-Zo3" firstAttribute="height" secondItem="uKi-pa-dR9" secondAttribute="height" id="ZAW-wr-ZrX"/>
                     <constraint firstItem="uKi-pa-dR9" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="90" id="ZEu-Fg-eeD"/>
                     <constraint firstItem="uKi-pa-dR9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="aAS-Oh-lv5"/>
                     <constraint firstItem="yvc-Ti-gzV" firstAttribute="top" secondItem="UsL-It-DO3" secondAttribute="bottom" constant="27" id="bdc-t4-Vu4"/>
@@ -270,10 +278,14 @@
                     <constraint firstItem="h0Z-ma-TsM" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="40" id="gO1-ZY-9jX"/>
                     <constraint firstItem="HgL-9u-e55" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ghg-fA-qkn"/>
                     <constraint firstItem="UsL-It-DO3" firstAttribute="leading" secondItem="uKi-pa-dR9" secondAttribute="trailing" constant="16" id="kvI-LR-Xkn"/>
+                    <constraint firstItem="yih-9M-Zo3" firstAttribute="centerX" secondItem="uKi-pa-dR9" secondAttribute="centerX" id="oQ6-rM-CJk"/>
                     <constraint firstAttribute="trailing" secondItem="HgL-9u-e55" secondAttribute="trailing" id="pEa-9T-YFh"/>
+                    <constraint firstItem="yih-9M-Zo3" firstAttribute="centerY" secondItem="uKi-pa-dR9" secondAttribute="centerY" id="rVI-sF-zDh"/>
+                    <constraint firstItem="yih-9M-Zo3" firstAttribute="width" secondItem="uKi-pa-dR9" secondAttribute="width" id="uYZ-il-WLt"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
+                <outlet property="avatarImgView" destination="yih-9M-Zo3" id="vzX-K6-yvJ"/>
                 <outlet property="editBtn" destination="VEc-Ia-wPR" id="pbe-5m-lTl"/>
                 <outlet property="fanTipLab" destination="NA4-OH-y3x" id="jcZ-XQ-uNf"/>
                 <outlet property="fansNumLab" destination="sCr-rv-0ty" id="2N0-Io-Fy5"/>
@@ -292,7 +304,7 @@
                 <outlet property="setBtnTop" destination="gO1-ZY-9jX" id="mzK-Fs-zSt"/>
                 <outlet property="topBgImg" destination="HgL-9u-e55" id="vZm-hp-UCH"/>
             </connections>
-            <point key="canvasLocation" x="-303.05343511450383" y="-54.577464788732399"/>
+            <point key="canvasLocation" x="-303.05343511450383" y="-54.929577464788736"/>
         </tableViewCell>
     </objects>
     <resources>