1. 同步Android 我的 tag UI

2. 其他优化

YuMi.xcodeproj/project.pbxproj

@@ -520,6 +520,7 @@
 		23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42752AA6E1480055733C /* XPHomeRecommendOtherRoomView.m */; };
 		23FF42792AA6E19C0055733C /* HomeMenuSourceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */; };
 		23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */; };
+		5412E0F42C4E460300FDD668 /* XPMineCenterAgencyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */; };
 		541DD9552C1EDEFB00B616C4 /* XPHomePagingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */; };
 		5458319D2C2AE09300364026 /* XPRoomTypeSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */; };
 		545831A02C2AEFAF00364026 /* TenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458319F2C2AEFAF00364026 /* TenMicStageView.m */; };
@@ -2586,6 +2587,8 @@
 		23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeMenuSourceModel.m; sourceTree = "<group>"; };
 		23FF428C2AAB2D3A0055733C /* XPCandyTreeBuyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeBuyView.h; sourceTree = "<group>"; };
 		23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeBuyView.m; sourceTree = "<group>"; };
+		5412E0F22C4E460300FDD668 /* XPMineCenterAgencyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCenterAgencyView.h; sourceTree = "<group>"; };
+		5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCenterAgencyView.m; sourceTree = "<group>"; };
 		541DD9532C1EDEFB00B616C4 /* XPHomePagingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomePagingViewController.h; sourceTree = "<group>"; };
 		541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomePagingViewController.m; sourceTree = "<group>"; };
 		5458319B2C2AE09300364026 /* XPRoomTypeSelectionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTypeSelectionViewController.h; sourceTree = "<group>"; };
@@ -5625,6 +5628,8 @@
 				23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */,
 				23E7FE9A2BB6CD42008F6800 /* XPNobleCenterWindow.h */,
 				23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */,
+				5412E0F22C4E460300FDD668 /* XPMineCenterAgencyView.h */,
+				5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */,
 			);
 			path = SubViews;
 			sourceTree = "<group>";
@@ -11665,6 +11670,7 @@
 				E85E7B262A4EB0D300B6D00A /* XPMineGuildViewController.m in Sources */,
 				E85E7B672A4EC35A00B6D00A /* XPBindExtractInfoModel.m in Sources */,
 				E86596512701A1C000846EBD /* StatisticsService.m in Sources */,
+				5412E0F42C4E460300FDD668 /* XPMineCenterAgencyView.m in Sources */,
 				23CEFC5E2AFB8FC100576D89 /* BSRealTimeView.m in Sources */,
 				E824544026F58F9400BE8163 /* XPMinePayPwdViewController.m in Sources */,
 				9BE01AED2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m in Sources */,

YuMi/Assets.xcassets/MineInfo/me_bg_guild.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "me_bg_guild@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/MineInfo/me_bg_vip.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "me_bg_vip@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/MineInfo/me_bg_wallet.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "me_bg_wallet@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/MineInfo/mine_gift_bg.imageset/Contents.json

@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "mine_gift_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

YuMi/Assets.xcassets/MineInfo/mine_lucky_gift_bg.imageset/Contents.json

@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "mine_lucky_gift_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

YuMi/CustomUI/UIImageView/NetImageView.h

@@ -34,7 +34,7 @@ typedef NS_ENUM(NSInteger, NetImageState){
 
 - (void)loadImage:(LoadCompletion _Nullable)completion;
 - (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion _Nullable)completion;
-- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion fail:(LoadFail)fail;
+- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion _Nullable)completion fail:(LoadFail _Nullable)fail;
 
 - (void)updateConfigPlaceHolder:(UIImage *)image;
 @end

YuMi/CustomUI/UIImageView/NetImageView.m

@@ -88,59 +88,48 @@
 
 - (void)setImageUrl:(NSString *)imageUrl {
     [self initImageUrl:imageUrl];
-    UIImage * image = [[SDImageCache sharedImageCache] imageFromCacheForKey:_innerConfigUrl];
-    if (image) {
-        self.image = image;
-        self.state = NetImageStateLoaded;
-    } else {
-        [self loadImage:nil];
-    }
+    [self loadImage:nil fail:nil];
 }
 
 - (void)loadImage:(LoadCompletion)completion {
+    [self loadImage:completion fail:nil];
+}
+
+- (void)loadImageWithUrl:(NSString *)imageUrl completion:(LoadCompletion)completion {
+    [self initImageUrl:imageUrl];
+    [self loadImage:completion fail:nil];
+}
+
+- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion _Nullable)completion fail:(LoadFail _Nullable)fail{
+    [self initImageUrl:imageUrl];
+    [self loadImage:completion fail:fail];
+}
+
+- (void)loadImage:(LoadCompletion _Nullable)completion fail:(LoadFail _Nullable)fail{
     self.state = NetImageStateLoading;
     @kWeakify(self);
-    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigUrl] 
+    [self sd_setImageWithURL:[NSURL URLWithString:self.innerConfigUrl]
             placeholderImage:self.config.placeHolder
                      options:SDWebImageRetryFailed
                    completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
         @kStrongify(self);
-        if (error) {
-            self.state = NetImageStateUnload;
-        } else {
-            self.state = NetImageStateLoaded;
-            if (completion) {
-                completion(image, imageURL);
-            };
-        }
-    }];
-}
-- (void)loadImage:(LoadCompletion)completion fail:(LoadFail)fail{
-    self.state = NetImageStateLoading;
-    @kWeakify(self);
-    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigUrl] placeholderImage:self.config.placeHolder options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
-        @kStrongify(self);
-        if (error) {
-            self.state = NetImageStateUnload;
-            if (fail){
-                fail(error);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (error) {
+                self.state = NetImageStateUnload;
+                if (fail){
+                    fail(error);
+                }
+            } else {
+                self.image = image;
+                self.state = NetImageStateLoaded;
+                if (completion) {
+                    completion(image, imageURL);
+                };
             }
-        } else {
-            self.state = NetImageStateLoaded;
-            if (completion) {
-                completion(image, imageURL);
-            };
-        }
+        });
     }];
 }
-- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion {
-    [self initImageUrl:imageUrl];
-    [self loadImage:completion];
-}
-- (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion fail:(LoadFail)fail{
-    [self initImageUrl:imageUrl];
-    [self loadImage:completion fail:fail];
-}
+
 - (NetImageConfig *)config {
     if (!_config) {
         _config = [[NetImageConfig alloc] init];
@@ -150,6 +139,9 @@
 
 - (void)updateConfigPlaceHolder:(UIImage *)image {
     self.config.placeHolder = image;
+    if (self.state == NetImageStateUnload) {
+        self.image = image;
+    }
 }
 
 @end

YuMi/Modules/YMMessage/Presenter/MessagePresenter.m

@@ -77,7 +77,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.fromUid = userInfo.fromUid;

YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m

@@ -686,7 +686,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.androidBubbleUrl = userInfo.androidBubbleUrl;

YuMi/Modules/YMMine/Presenter/XPMinePresent.m

@@ -69,7 +69,7 @@
 - (void)getClanDetailInfo {
 	NSString * uid = [[AccountInfoStorage instance] getUid];
 	if (!uid.length) {
-		[[self getView]onGetClanDetailInfoFail];
+//		[[self getView]onGetClanDetailInfoFail];
 		return;
 	}
     @kWeakify(self);
@@ -78,8 +78,8 @@
         ClanDetailMainInfoModel * clanDetailInfo = [ ClanDetailMainInfoModel modelWithDictionary:data.data];
 		[[self getView] onGetClanDetailInfoSuccess:clanDetailInfo];
 	}fail:^(NSInteger code, NSString * _Nullable msg) {
-        @kStrongify(self);
-		[[self getView]onGetClanDetailInfoFail];
+//        @kStrongify(self);
+//		[[self getView]onGetClanDetailInfoFail];
 	}] uid:uid];
 }
 

YuMi/Modules/YMMine/Protocol/XPMineProtocol.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///获取家族信息成功
 - (void)onGetClanDetailInfoSuccess:(ClanDetailMainInfoModel *)clanInfo ;
 ///获取家族信息失败
-- (void)onGetClanDetailInfoFail;
+//- (void)onGetClanDetailInfoFail;
 ///获取个人中心功能
 - (void)onGetMineFuntionItemSuccess:(NSArray<XPMineFunctionItemModel *> *)items ;
 ///获取个人中心功能失败

YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m

@@ -97,7 +97,7 @@
         
             self.experImageView.hidden = NO;
             self.charmImageView.hidden = NO;
-            self.experImageView.imageUrl = _userInfo.userLevelVo.expertUrl;
+            self.experImageView.imageUrl = _userInfo.userLevelVo.experUrl;
             self.charmImageView.imageUrl = _userInfo.userLevelVo.charmUrl;
             [self.sexImageView setTitle:[NSString getAgeWithBirth:_userInfo.birth] forState:UIControlStateNormal];
             self.sexImageView.backgroundColor = _userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);

YuMi/Modules/YMMine/View/Cell/XPMineListCell.m

@@ -14,7 +14,7 @@
 
 @property (nonatomic,strong) UIView * bgView;
 @property (nonatomic,strong) NetImageView *iconView;
-@property (nonatomic,strong) UILabel * titleVeiw;
+@property (nonatomic,strong) UILabel * titleView;
 @property (nonatomic,strong) UIImageView * arrowView;
 @property (nonatomic,strong) UIView *lineView;
 ///角标
@@ -38,7 +38,7 @@
    
 	[self.bgView addSubview:self.iconView];
     [self.bgView addSubview:self.badgeImageView];
-	[self.bgView addSubview:self.titleVeiw];
+	[self.bgView addSubview:self.titleView];
 	[self.bgView addSubview:self.arrowView];
 	[self.bgView addSubview:self.lineView];
 
@@ -60,13 +60,13 @@
         make.size.mas_equalTo(CGSizeMake(24, 10));
         make.leading.mas_equalTo(self.iconView.mas_centerX);
     }];
-	[self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
+	[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.leading.mas_equalTo(42);
 		make.centerY.equalTo(self.bgView);
 	}];
 	[self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.width.mas_offset(20);
-		make.height.mas_offset(20);
+		make.width.mas_offset(14);
+		make.height.mas_offset(14);
 		make.centerY.equalTo(self.bgView);
 		make.trailing.mas_equalTo(-15);
 	}];
@@ -85,7 +85,7 @@
 - (void)setItemModel:(XPMineFunctionItemModel *)itemModel {
 	_itemModel = itemModel;
 	if (_itemModel) {
-		self.titleVeiw.text = _itemModel.centerName;
+		self.titleView.text = _itemModel.centerName;
 		if([_itemModel.centerPic isEqualToString:@"mineview_set"]){
 			self.iconView.image = [UIImage imageNamed:@"mineview_set"];
 		}else{
@@ -93,27 +93,18 @@
 		}
         self.badgeImageView.imageUrl = itemModel.centerBadge ? itemModel.centerBadge : nil;
 
-        if (_itemModel.skipType == 78) {
-            [self.iconView mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.leading.mas_equalTo(12);
-                make.width.mas_equalTo(25);
-                make.height.mas_equalTo(20);
-                make.centerY.equalTo(self.bgView);
-            }];
-        } else {
-            [self.iconView mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.leading.mas_equalTo(11);
-                make.width.height.mas_equalTo(25);
-                make.centerY.equalTo(self.bgView);
-            }];
-        }
+        [self.iconView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.leading.mas_equalTo(12);
+            make.width.mas_equalTo(25);
+            make.height.mas_equalTo(25);
+            make.centerY.equalTo(self.bgView);
+        }];
 	}
 }
 -(void)setCornerWithIsTop:(BOOL)isTop isBottom:(BOOL)isBottom{
 	_bgView.layer.mask = nil;
 	if(isTop == YES && isBottom == YES){
 		[_bgView setCornerWithLeftTopCorner:10 rightTopCorner:10 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(KScreenWidth - 30, 60)];
-
 		return;
 	}
 	if (isTop){
@@ -133,24 +124,25 @@
 - (NetImageView *)iconView{
 	if (!_iconView){
 		_iconView = [NetImageView new];
-        _iconView.contentMode = UIViewContentModeScaleAspectFit;
+        _iconView.contentMode = UIViewContentModeScaleAspectFill;
 	}
 	return _iconView;
 }
 
-- (UILabel *)titleVeiw{
-	if (!_titleVeiw){
-		_titleVeiw = [UILabel new];
-		_titleVeiw.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular];
-		_titleVeiw.textColor = UIColorFromRGB(0x1F1A4E);
+- (UILabel *)titleView{
+	if (!_titleView){
+		_titleView = [UILabel new];
+		_titleView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular];
+		_titleView.textColor = UIColorFromRGB(0x1F1A4E);
 	}
-	return _titleVeiw;
+	return _titleView;
 }
 
 - (UIImageView *)arrowView{
 	if (!_arrowView){
 		_arrowView = [UIImageView new];
-		_arrowView.image = [UIImage imageNamed:@"mine_item_new_arrow"];
+		_arrowView.image = [UIImage imageNamed:@"common_right_arrow"];
+        _arrowView.contentMode = UIViewContentModeScaleAspectFit;
 	}
 	return _arrowView;
 }

YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m

@@ -148,9 +148,9 @@
     self.sexImageView.backgroundColor = _authorityModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);
     self.sexImageView.titleEdgeInsets =  _authorityModel.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
     self.sexImageView.selected =  _authorityModel.gender != GenderType_Male;
-    if (_authorityModel.userLevelVo.expertUrl) {
+    if (_authorityModel.userLevelVo.experUrl) {
         if (self.experImageView.state == NetImageStateLoaded) {
-            self.experImageView.imageUrl = _authorityModel.userLevelVo.expertUrl;
+            self.experImageView.imageUrl = _authorityModel.userLevelVo.experUrl;
             CGFloat kImageScale = self.experImageView.image.size.width / self.experImageView.image.size.height;
             CGFloat imageWidth = 17 * kImageScale;
             [self.experImageView mas_updateConstraints:^(MASConstraintMaker *make) {
@@ -158,7 +158,7 @@
             }];
         } else {
             @kWeakify(self);
-            [self.experImageView loadImageWithUrl:_authorityModel.userLevelVo.expertUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
+            [self.experImageView loadImageWithUrl:_authorityModel.userLevelVo.experUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
                 @kStrongify(self);
                 self.experImageView.image = image;
                 CGFloat kImageScale = image.size.width / image.size.height;
@@ -169,7 +169,7 @@
             }];
         }
     }
-    self.experImageView.hidden = _authorityModel.userLevelVo.expertUrl.length <= 0;
+    self.experImageView.hidden = _authorityModel.userLevelVo.experUrl.length <= 0;
     
     if (_authorityModel.userLevelVo.charmUrl) {
         if (self.charmImageView.state == NetImageStateLoaded) {

YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m

@@ -49,7 +49,9 @@
 
 ///获取VIP充值产品列表
 - (void)getNobleChargeProductListWithChannelType:(NSString *)type {
+    @kWeakify(self);
     [Api getChargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        @kStrongify(self);
         NSArray *list = [RechargeListModel modelsWithArray:data.data];
         [[self getView] onGetNobleRechargeDataSuccess:list];
     }fail:^(NSInteger code, NSString * _Nullable msg) {

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.h

@@ -0,0 +1,18 @@
+//
+//  XPMineCenterAgencyView.h
+//  YuMi
+//
+//  Created by P on 2024/7/22.
+//
+
+#import <UIKit/UIKit.h>
+@class ClanDetailMainInfoModel;
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XPMineCenterAgencyView : UIView
+
+@property (nonatomic, strong) ClanDetailMainInfoModel *model;
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.m

@@ -0,0 +1,83 @@
+//
+//  XPMineCenterAgencyView.m
+//  YuMi
+//
+//  Created by P on 2024/7/22.
+//
+
+#import "XPMineCenterAgencyView.h"
+#import "ClanDetailInfoModel.h"
+
+@interface XPMineCenterAgencyView ()
+
+@property (nonatomic, strong) UIImageView *bgImageView;
+@property (nonatomic, strong) UILabel *coinLabel;
+
+@end
+
+@implementation XPMineCenterAgencyView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self initSubViews];
+        [self initSubViewConstraints];
+    }
+    return self;
+}
+
+- (void)setModel:(ClanDetailMainInfoModel *)model {
+    _model = model;
+    if([model.clanMode isEqualToString: @"clan_hall"]){
+        if(model.clan.hall.ownerUid > 0 || model.clan.clan.elderUid > 0){
+            self.coinLabel.text = YMLocalizedString(@"XPMineTheGuildCell3");
+        }
+    } else {
+        // 家族
+        if(model.family.familyId){
+            self.coinLabel.text = YMLocalizedString(@"XPMineTheGuildCell3");
+        }
+    }
+}
+
+#pragma mark - Private Method
+- (void)initSubViews {
+    [self addSubview:self.bgImageView];
+    [self addSubview:self.coinLabel];
+}
+
+- (void)initSubViewConstraints {
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_equalTo(0);
+    }];
+
+    [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(-8);
+        make.leading.mas_equalTo(4);
+        make.trailing.mas_equalTo(-4);
+        make.height.mas_equalTo(18);
+    }];
+}
+
+#pragma mark - Getters And Setters
+- (UIImageView *)bgImageView {
+    if (!_bgImageView) {
+        _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"me_bg_guild"]];
+        _bgImageView.contentMode = UIViewContentModeScaleAspectFill;
+    }
+    return _bgImageView;
+}
+
+- (UILabel *)coinLabel {
+    if (!_coinLabel) {
+        _coinLabel = [[UILabel alloc] init];
+        _coinLabel.text = YMLocalizedString(@"XPMineTheGuildCell1");
+        _coinLabel.textAlignment = NSTextAlignmentCenter;
+        _coinLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium];
+        _coinLabel.textColor = UIColorFromRGB(0x78330A);
+    }
+    return _coinLabel;
+}
+
+@end

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m

@@ -15,17 +15,7 @@
 @interface XPNobleCenterEntranceView ()
 
 @property (nonatomic, strong) UIImageView *bgImageView;
-///
-@property (nonatomic,strong) NetImageView *nobleIconImage;
 @property (nonatomic, strong) UILabel *titleLabel;
-@property (nonatomic, strong) UILabel *descLabel;
-@property (nonatomic, strong) UIImageView *arrowImageView;
-///底层进度条
-@property (nonatomic, strong) UIView *backProgressView;
-///当前进度条
-@property (nonatomic, strong) UIImageView *currentProgressView;
-///下一等级
-@property (nonatomic, strong) UILabel *nextLevelLabel;
 
 @end
 
@@ -45,11 +35,9 @@
 - (void)initSubViews {
     [self addSubview:self.bgImageView];
     [self addSubview:self.titleLabel];
-    [self addSubview:self.descLabel];
-    [self addSubview:self.backProgressView];
-    [self addSubview:self.arrowImageView];
-    [self.backProgressView addSubview:self.currentProgressView];
-    [self.backProgressView addSubview:self.nextLevelLabel];
+//    [self addSubview:self.backProgressView];
+//    [self.backProgressView addSubview:self.currentProgressView];
+//    [self.backProgressView addSubview:self.nextLevelLabel];
 }
 
 - (void)initSubViewConstraints {
@@ -58,73 +46,39 @@
     }];
     
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(16);
-        make.leading.mas_equalTo(16);
-        make.trailing.mas_equalTo(0);
+        make.bottom.mas_equalTo(-8);
+        make.leading.mas_equalTo(4);
+        make.trailing.mas_equalTo(-4);
         make.height.mas_equalTo(18);
     }];
-    [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(2);
-        make.leading.mas_equalTo(16);
-        make.trailing.mas_lessThanOrEqualTo(0);
-    }];
   
-    [self.backProgressView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.trailing.mas_equalTo(self).inset(12);
-        make.height.mas_equalTo(10);
-        make.bottom.mas_equalTo(-5);
-    }];
-    [self.currentProgressView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.top.bottom.mas_equalTo(self.backProgressView);
-        make.width.mas_equalTo(0);
-    }];
-    [self.nextLevelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.mas_equalTo(-4);
-        make.centerY.mas_equalTo(self.backProgressView);
-    }];
-    [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(4);
-            make.height.mas_equalTo(6);
-            make.leading.equalTo(self.descLabel.mas_trailing).mas_offset(3);
-            make.centerY.equalTo(self.descLabel);
-    }];
+//    [self.backProgressView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.leading.trailing.mas_equalTo(self).inset(12);
+//        make.height.mas_equalTo(10);
+//        make.bottom.mas_equalTo(-5);
+//    }];
+//    [self.currentProgressView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.leading.top.bottom.mas_equalTo(self.backProgressView);
+//        make.width.mas_equalTo(0);
+//    }];
+//    [self.nextLevelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.trailing.mas_equalTo(-4);
+//        make.centerY.mas_equalTo(self.backProgressView);
+//    }];
+
 }
 
 - (void)setVipInfo:(NobleInfo *)vipInfo {
     _vipInfo = vipInfo;
     if (vipInfo) {
-        [self addSubview:self.nobleIconImage];
-        [self.nobleIconImage loadImageWithUrl:vipInfo.vipIcon completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-            self.nobleIconImage.image = image;
-        }fail:^(NSError * _Nonnull error) {
-            NSLog(@"%@",error);
-        }];
         self.titleLabel.text = vipInfo.vipName;
-        self.titleLabel.textColor = UIColorFromRGB(0x403077);
-        self.bgImageView.image = [UIImage imageNamed:@"mine_noble_entrance_hadNoble"];
-        [self.nobleIconImage mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.leading.mas_equalTo(12);
-            make.top.mas_equalTo(9);
-            make.size.mas_equalTo(CGSizeMake(40, 35));
-        }];
-        [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.leading.mas_equalTo(self.nobleIconImage.mas_trailing).mas_offset(4);
-            make.top.mas_equalTo(9);
-            make.trailing.mas_equalTo(0);
-            make.height.mas_equalTo(22);
-        }];
-        [self.descLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.leading.mas_equalTo(self.titleLabel);
-            make.top.mas_equalTo(self.titleLabel.mas_bottom);
-            make.trailing.mas_lessThanOrEqualTo(-16);
-        }];
-        [self setNobleInfoData:self.nobleInfo];
+//        self.titleLabel.textColor = UIColorFromRGB(0x403077);
+//        self.bgImageView.image = [UIImage imageNamed:@"mine_noble_entrance_hadNoble"];
+//        [self setNobleInfoData:self.nobleInfo];
     }
 }
 -(void)setNobleInfoData:(NobleCenterModel *)nobleInfo{
     if (self.vipInfo) {
-        self.backProgressView.hidden = NO;
-        self.arrowImageView.hidden = YES;
         NSInteger distanceValue = 0;
         NSInteger saveScore = 0;
         NSInteger nextScore = 0;
@@ -141,18 +95,6 @@
                 nextLevelName = info.vipName;
             }
         }
-        NSString *value = [NSString getDealNumwithstring:@(distanceValue).stringValue];
-        self.descLabel.text =  nobleInfo.currentLevel >= 9 ? YMLocalizedString(@"XPNobleCenterEntranceView3") : [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterEntranceView0"), value];
-        self.descLabel.textColor = UIColorFromRGB(0x5E4D98);
-        self.nextLevelLabel.text = nextLevelName;
-      
-        CGFloat margin = self.backProgressView.frame.size.width * (nobleInfo.currScore * 1.0 / (nextScore > 0 ? nextScore : 1));
-        [self.currentProgressView mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.trailing.mas_equalTo(self.backProgressView.mas_leading).mas_offset(margin);
-        }];
-    } else {
-        self.backProgressView.hidden = YES;
-        self.arrowImageView.hidden = NO;
     }
 }
 
@@ -160,8 +102,8 @@
 #pragma mark - Getters And Setters
 - (UIImageView *)bgImageView {
     if (!_bgImageView) {
-        _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_noble_entrance_noNoble"] ];
-        _bgImageView.contentMode = UIViewContentModeScaleAspectFit;
+        _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"me_bg_vip"] ];
+        _bgImageView.contentMode = UIViewContentModeScaleAspectFill;
     }
     return _bgImageView;
 }
@@ -170,71 +112,12 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium];
-        _titleLabel.textColor = UIColorFromRGB(0x93570B);
-        _titleLabel.text = YMLocalizedString(@"XPNobleCenterEntranceView1");
+        _titleLabel.textColor = UIColorFromRGB(0x78330A);
+        _titleLabel.textAlignment = NSTextAlignmentCenter;
+        _titleLabel.text = YMLocalizedString(@"XPMineTheGuildCell2");
     }
     return _titleLabel;
 }
 
-- (UILabel *)descLabel {
-    if (!_descLabel) {
-        _descLabel = [[UILabel alloc] init];
-        _descLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightRegular];
-        _descLabel.textColor = UIColorFromRGB(0xAA6F29);
-        _descLabel.text = YMLocalizedString(@"XPNobleCenterEntranceView2");
-        _descLabel.adjustsFontSizeToFitWidth = YES;
-    }
-    return _descLabel;
-}
-
-
-- (NetImageView *)nobleIconImage {
-    if (!_nobleIconImage) {
-        NetImageConfig * config = [[NetImageConfig alloc]init];
-        _nobleIconImage = [[NetImageView alloc] initWithConfig:config];
-        _nobleIconImage.contentMode = UIViewContentModeScaleAspectFill;
-    }
-    return _nobleIconImage;
-}
-
-- (UIView *)backProgressView {
-    if (!_backProgressView) {
-        _backProgressView = [[UIView alloc] init];
-        _backProgressView.backgroundColor = UIColorFromRGB(0x7F5DFF);
-        _backProgressView.layer.cornerRadius = 5;
-        _backProgressView.layer.masksToBounds = YES;
-        _backProgressView.hidden = YES;
-    }
-    return _backProgressView;
-}
-
-- (UIImageView *)currentProgressView {
-    if (!_currentProgressView) {
-        _currentProgressView = [[UIImageView alloc] init];
-        UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFFFFF),UIColorFromRGB(0xFFFFFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)];
-        _currentProgressView.image = image;
-        _currentProgressView.layer.cornerRadius = 5;
-        _currentProgressView.layer.masksToBounds = YES;
-    }
-    return _currentProgressView;
-}
-
-- (UILabel *)nextLevelLabel {
-    if (!_nextLevelLabel) {
-        _nextLevelLabel = [[UILabel alloc] init];
-        _nextLevelLabel.font = [UIFont systemFontOfSize:8];
-        _nextLevelLabel.textColor = [UIColor whiteColor];
-        _nextLevelLabel.hidden = YES;
-    }
-    return _nextLevelLabel;
-}
--(UIImageView *)arrowImageView{
-    if (!_arrowImageView){
-        _arrowImageView = [UIImageView new];
-        _arrowImageView.image = [[UIImage imageNamed:@"mine_head_noble_arrow"]ms_SetImageForRTL] ;
-    }
-    return _arrowImageView;
-}
-
 
 @end

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterMyNobleView.m

@@ -258,10 +258,16 @@
     self.upGradeValueLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterMyNobleView9"), nextScore];
     self.currentValueLabel.text =  [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterMyNobleView10"), model.currScore];
     CGFloat margin = self.backProgressView.frame.size.width * (model.currScore * 1.0 / nextScore);
+    if (nextScore == 0) {
+        margin = 0;
+    }
     [self.indicateImageView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self.backProgressView.mas_leading).mas_offset(margin);
     }];
     CGFloat safeMargin = self.backProgressView.frame.size.width * (safeScore * 1.0 / nextScore);
+    if (nextScore == 0) {
+        safeMargin = 0;
+    }
     [self.safeValueLabel mas_updateConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self.backProgressView.mas_leading).mas_offset(safeMargin);
     }];

YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m

@@ -62,7 +62,7 @@
         [[NSNotificationCenter defaultCenter]postNotificationName:@"kChanecNavView" object:language];
         [self.navigationController popViewControllerAnimated:YES];
 
-        });
+    });
 }
 #pragma mark - UITableViewDelegate And UITableViewDataSource
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m

@@ -551,8 +551,8 @@ return view;\
     self.newUserImageView.hidden = !userInfo.newUser;
 
 
-    if (userInfo.userLevelVo.expertUrl) {
-        [self.experImageView loadImageWithUrl:userInfo.userLevelVo.expertUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
+    if (userInfo.userLevelVo.experUrl) {
+        [self.experImageView loadImageWithUrl:userInfo.userLevelVo.experUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
             self.experImageView.image = image;
             CGFloat width = image.size.width*20/ (image.size.height > 0 ? image.size.height : 1);
             [self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
@@ -561,7 +561,7 @@ return view;\
             }];
         }];
     }
-    self.experImageView.hidden = userInfo.userLevelVo.expertUrl.length <= 0;
+    self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0;
 
     if (userInfo.userLevelVo.charmUrl) {
         [self.charmImageView loadImageWithUrl:userInfo.userLevelVo.charmUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {

YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m

@@ -13,8 +13,6 @@
 
 @property (nonatomic, strong) UIImageView *bgImageView;
 @property (nonatomic, strong) UILabel *coinLabel;
-@property (nonatomic, strong) UILabel *descLabel;
-@property(nonatomic,strong) UIImageView *arrowView;
 
 @end
 
@@ -34,8 +32,6 @@
 - (void)initSubViews {
     [self addSubview:self.bgImageView];
     [self addSubview:self.coinLabel];
-    [self addSubview:self.descLabel];
-    [self addSubview:self.arrowView];
 }
 
 - (void)initSubViewConstraints {
@@ -44,24 +40,11 @@
     }];
 
     [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(16);
-        make.leading.mas_equalTo(16);
-        make.trailing.mas_equalTo(0);
+        make.bottom.mas_equalTo(-8);
+        make.leading.mas_equalTo(4);
+        make.trailing.mas_equalTo(-4);
         make.height.mas_equalTo(18);
     }];
-    [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(self.coinLabel);
-        make.top.equalTo(self.coinLabel.mas_bottom).mas_offset(4);
-       
-    }];
-    
-   
-    [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(5);
-        make.height.mas_equalTo(7);
-        make.leading.equalTo(self.descLabel.mas_trailing).mas_offset(2);
-        make.centerY.equalTo(self.descLabel);
-    }];
 }
 
 - (void)setDiamonds:(NSString *)diamonds {
@@ -71,39 +54,21 @@
 #pragma mark - Getters And Setters
 - (UIImageView *)bgImageView {
     if (!_bgImageView) {
-        _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_head_account_bg"]];
-        _bgImageView.contentMode = UIViewContentModeScaleAspectFit;
+        _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"me_bg_wallet"]];
+        _bgImageView.contentMode = UIViewContentModeScaleAspectFill;
     }
     return _bgImageView;
 }
 
-- (UILabel *)descLabel {
-    if (!_descLabel) {
-        _descLabel = [[UILabel alloc] init];
-        _descLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightRegular];
-        _descLabel.textColor = UIColorFromRGB(0x628ebb);
-        _descLabel.text = YMLocalizedString(@"XPMineAccountView1");
-    }
-    return _descLabel;
-}
-
-
 - (UILabel *)coinLabel {
     if (!_coinLabel) {
         _coinLabel = [[UILabel alloc] init];
         _coinLabel.text = YMLocalizedString(@"XPIncomeRecordVC1");
+        _coinLabel.textAlignment = NSTextAlignmentCenter;
         _coinLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium];
-        _coinLabel.textColor = UIColorFromRGB(0x185491);
+        _coinLabel.textColor = UIColorFromRGB(0x78330A);
     }
     return _coinLabel;
 }
-- (UIImageView *)arrowView{
-    if(!_arrowView){
-        _arrowView = [UIImageView new];
-        _arrowView.image = [kImage(@"ms_mine_purse_arrow") ms_SetImageForRTL];
-    }
-    return _arrowView;
-}
-
 
 @end

YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m

@@ -116,7 +116,7 @@
 - (UILabel *)numberLabel {
 	if (!_numberLabel) {
 		_numberLabel = [[UILabel alloc] init];
-		_numberLabel.font = kFontMedium(26);
+		_numberLabel.font = kFontMedium(18);
 		_numberLabel.textAlignment = NSTextAlignmentCenter;
 		_numberLabel.textColor = [DJDKMIMOMColor mainTextColor];
 	}
@@ -126,8 +126,8 @@
 - (UILabel *)titleLabel {
 	if (!_titleLabel) {
 		_titleLabel = [[UILabel alloc] init];
-		_titleLabel.font = kFontMedium(20);
-		_titleLabel.textColor = [DJDKMIMOMColor textThirdColor];
+		_titleLabel.font = kFontMedium(14);
+		_titleLabel.textColor = [DJDKMIMOMColor secondTextColor];
 		_titleLabel.textAlignment = NSTextAlignmentCenter;
 	}
 	return _titleLabel;

YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h

@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 #import "NobleInfo.h"
+@class ClanDetailMainInfoModel;
 NS_ASSUME_NONNULL_BEGIN
 typedef void(^CompletionHandler)(NSMutableAttributedString *);
 @class UserInfoModel,XPMineHeadView, WalletInfoModel,NobleCenterModel;
@@ -21,12 +22,15 @@ typedef void(^CompletionHandler)(NSMutableAttributedString *);
 - (void)xpMineHeadViewClickAccount;
 ///点击了VIP中心
 - (void)xPMineHeadViewClickNobleCenter;
+///点击了工会
+- (void)xPMineHeadViewClickAgency;
 @end
 @interface XPMineHeadView : UIView
 ///用户信息
 @property (nonatomic,strong) UserInfoModel *userInfo;
 @property (nonatomic, strong) WalletInfoModel *walletInfo;
 @property (nonatomic, strong) NobleCenterModel *nobleInfo;
+@property (nonatomic, strong) ClanDetailMainInfoModel *clanModel;
 @property(nonatomic,strong) NobleInfo *vipInfo;
 ///代理
 @property (nonatomic,assign) id<XPMineHeadViewDelegate> delegate;

YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m

@@ -18,9 +18,11 @@
 #import "UIImage+Utils.h"
 #import "XPMineFriendNumberView.h"
 #import "XPMineAccountView.h"
+#import "XPMineCenterAgencyView.h"
 ///Model
 #import "UserInfoModel.h"
 #import "WalletInfoModel.h"
+#import "ClanDetailInfoModel.h"
 
 @interface XPMineHeadView ()
 ///头像
@@ -49,6 +51,11 @@
 @property (nonatomic, strong) XPMineAccountView *accountView;
 ///VIP中心
 @property (nonatomic, strong) XPNobleCenterEntranceView *nobleEntranceView;
+
+@property (nonatomic, strong) XPMineCenterAgencyView *agencyView;
+
+@property (nonatomic, strong) UIStackView *stackView;
+
 //审核View
 @property (nonatomic,strong) UIImageView *reviewView;
 @end
@@ -75,15 +82,22 @@
 	[self.nameStackView addArrangedSubview:self.nameLabel];
     [self.nameStackView addArrangedSubview:self.sexImageView];
 	[self.idStackView addArrangedSubview:self.idLabel];
-//	[self.idStackView addArrangedSubview:self.sexImageView];
 	[self addSubview:self.levelLabel];
 
 	[self addSubview:self.attentionStackView];
 	[self.attentionStackView addArrangedSubview:self.attentionView];
 	[self.attentionStackView addArrangedSubview:self.fansView];
 
-	[self addSubview:self.accountView];
-    [self addSubview:self.nobleEntranceView];
+    _stackView = [[UIStackView alloc] init];
+    _stackView.distribution = UIStackViewDistributionFillEqually;
+    _stackView.alignment = UIStackViewAlignmentCenter;
+    _stackView.spacing = 8;
+    [self addSubview:_stackView];
+    [_stackView addArrangedSubview:self.accountView];
+    [_stackView addArrangedSubview:self.nobleEntranceView];
+    [_stackView addArrangedSubview:self.agencyView];
+
+
 	[self.avatarImageView addSubview:self.reviewView];
 	UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarImageView)];
 	[self.avatarImageView addGestureRecognizer:tap];
@@ -91,21 +105,20 @@
 
 - (void)initSubViewConstraints {
 	[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(84, 84));
+		make.size.mas_equalTo(CGSizeMake(70, 70));
 		make.leading.mas_equalTo(self).offset(15);
 		make.top.mas_equalTo(self).offset(49 + kStatusBarHeight);
 	}];
 
 	[self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12);
-        make.top.mas_equalTo(self.avatarImageView).mas_offset(4);
-		make.height.mas_equalTo(16);
-//		make.trailing.mas_equalTo(-15);
+        make.top.mas_equalTo(self.avatarImageView);//.mas_offset(4);
+		make.height.mas_equalTo(20);
 	}];
  
 	[self.idStackView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.leading.mas_equalTo(self.nameStackView);
-		make.top.mas_equalTo(self.nameStackView.mas_bottom).offset(13);
+		make.top.mas_equalTo(self.nameStackView.mas_bottom).offset(8);
 		make.height.mas_equalTo(18);
 	}];
 
@@ -123,30 +136,15 @@
 		make.height.mas_equalTo(60);
         make.centerX.mas_equalTo(self);
 		make.width.mas_equalTo(KScreenWidth);
-//		make.trailing.mas_equalTo(0);
 	}];
-	CGFloat width = (KScreenWidth - 30) / 4;
-	CGFloat height = 45;
-//	[self.attentionView mas_makeConstraints:^(MASConstraintMaker *make) {
-//		make.size.mas_equalTo(CGSizeMake(54, 34));
-//	}];
-//
-//	[self.fansView mas_makeConstraints:^(MASConstraintMaker *make) {
-//		make.size.mas_equalTo(CGSizeMake(54, 34));
-//	}];
 
-	width = (KScreenWidth - 30 - 13) * 0.5;
-	height = width * 60 / 166;
-	[self.accountView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.equalTo(self.attentionStackView.mas_bottom).mas_offset(23);
-		make.size.mas_equalTo(CGSizeMake(width, height));
-		make.leading.mas_equalTo(15);
-	}];
-    [self.nobleEntranceView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.accountView);
-        make.size.mas_equalTo(CGSizeMake(width, height));
-        make.trailing.mas_equalTo(-15);
+    [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.attentionStackView.mas_bottom).mas_offset(18);
+        make.left.mas_equalTo(14);
+        make.right.mas_equalTo(-14);
+        make.height.mas_equalTo(70);
     }];
+
 	[self.reviewView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.leading.trailing.bottom.equalTo(self.avatarImageView);
 		make.height.mas_equalTo(20);
@@ -173,18 +171,24 @@
 	}
 }
 ///账号中心
-- (void)tapAccountrecognizer {
-	if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineHeadViewClickAccountxpMineHeadViewClickAccount)]) {
+- (void)tapAccountRecognizer {
+	if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineHeadViewClickAccount)]) {
 		[self.delegate xpMineHeadViewClickAccount];
 	}
 }
 ///VIP中心
-- (void)tapNobleCenterrecognizer {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickNobleCenterxPMineHeadViewClickNobleCenter)]) {
+- (void)tapNobleCenterRecognizer {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickNobleCenter)]) {
         [self.delegate xPMineHeadViewClickNobleCenter];
     }
 }
 
+- (void)didTapAgency {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickAgency)]) {
+        [self.delegate xPMineHeadViewClickAgency];
+    }
+}
+
 #pragma mark - NSMutableAttributedString
 -(NSInteger) getMonth:(long )time
 {
@@ -204,8 +208,6 @@
 	return day;
 }
 
-
-
 /// 生成一个图片的富文本
 /// @param imageUrl 网络图片的地址
 - (NSMutableAttributedString *)createUrlImageAttribute:(NSString *)imageUrl {
@@ -241,8 +243,6 @@
 	return attribute;
 }
 
-
-
 ///铭牌
 - (NSMutableAttributedString *)createNameplateAttibuteWithImage:(NSString *)imageName{
     NetImageConfig *config = [[NetImageConfig alloc]init];
@@ -321,36 +321,35 @@
 	attachment.image = iconImage;
 	[textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:textAtt.length];
 	return textAtt;
-
-
 }
+
 ///当装扮铭牌时，我的页面中不需要显示铭牌标识
 - (void)createNamePlateLevelAttribute:(UserInfoModel *)userInfo complete:(nonnull CompletionHandler)complete{
-	NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
-	if (!userInfo) {
-		if(complete){
-			complete(attributedString);
-		}
-		return;
-	}
-
-    if(userInfo.isCertified == YES){
-        //主播认证
-        if (userInfo.nameplatePic.length > 0) {
-            [self createNameplateAttibuteWithImage:userInfo.nameplatePic];
-            [attributedString appendAttributedString:[self createSpaceAttribute:2]];
-        }
-    }else{
-        //主播认证
-        if (userInfo.nameplateWord.length > 0 && userInfo.nameplatePic.length>0) {
-            [self createNameplateAttibute:userInfo.nameplateWord image:userInfo.nameplatePic textFont:[UIFont systemFontOfSize:9]];
-            [attributedString appendAttributedString:[self createSpaceAttribute:2]];
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
+    if (!userInfo) {
+        if(complete){
+            complete(attributedString);
         }
+        return;
     }
 
+//    if(userInfo.isCertified == YES){
+//        //主播认证
+//        if (userInfo.nameplatePic.length > 0) {
+//            [self createNameplateAttibuteWithImage:userInfo.nameplatePic];
+//            [attributedString appendAttributedString:[self createSpaceAttribute:2]];
+//        }
+//    }else{
+//        //主播认证
+//        if (userInfo.nameplateWord.length > 0 && userInfo.nameplatePic.length>0) {
+//            [self createNameplateAttibute:userInfo.nameplateWord image:userInfo.nameplatePic textFont:[UIFont systemFontOfSize:9]];
+//            [attributedString appendAttributedString:[self createSpaceAttribute:2]];
+//        }
+//    }
+
     // userRank 用户级别
-    if (userInfo.userLevelVo.expertUrl) {
-        [attributedString appendAttributedString:[self createUrlImageAttribute:userInfo.userLevelVo.expertUrl]];
+    if (userInfo.userLevelVo.experUrl) {
+        [attributedString appendAttributedString:[self createUrlImageAttribute:userInfo.userLevelVo.experUrl]];
         [attributedString appendAttributedString:[self createSpaceAttribute:2]];
     }
 
@@ -365,7 +364,6 @@
     }
 }
 
-
 #pragma mark - Getters And Setters
 - (void)setUserInfo:(UserInfoModel *)userInfo {
 	_userInfo = userInfo;
@@ -398,13 +396,16 @@
 }
 - (void)setNobleInfo:(NobleCenterModel *)nobleInfo {
     self.nobleEntranceView.nobleInfo = nobleInfo;
-    
 }
 - (void)setVipInfo:(NobleInfo *)vipInfo{
     _vipInfo = vipInfo;
     self.nobleEntranceView.vipInfo = _vipInfo;
 }
 
+- (void)setClanModel:(ClanDetailMainInfoModel *)clanModel {
+    self.agencyView.model = clanModel;
+}
+
 - (NetImageView *)avatarImageView {
 	if (!_avatarImageView) {
 		NetImageConfig * config = [[NetImageConfig alloc]init];
@@ -413,7 +414,7 @@
 		_avatarImageView = [[NetImageView alloc] initWithConfig:config];
 		_avatarImageView.userInteractionEnabled = YES;
 		_avatarImageView.layer.masksToBounds = YES;
-		_avatarImageView.layer.cornerRadius = 37;
+		_avatarImageView.layer.cornerRadius = 35;
 	}
 	return _avatarImageView;
 }
@@ -429,12 +430,10 @@
 	return _nameStackView;
 }
 
-
-
 - (UILabel *)nameLabel {
 	if (!_nameLabel) {
 		_nameLabel = [[UILabel alloc] init];
-		_nameLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:24];
+		_nameLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:20];
 		_nameLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#1F1A4E"];
 	}
 	return _nameLabel;
@@ -512,6 +511,7 @@
 	if (!_fansView) {
 		_fansView = [[XPMineFriendNumberView alloc] init];
 		_fansView.title = YMLocalizedString(@"XPMineHeadView5");
+        _fansView.number = @"0";
 		UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapFansRecognizer)];
 		[_fansView addGestureRecognizer:tap];
 	}
@@ -521,7 +521,7 @@
 - (XPMineAccountView *)accountView {
 	if (!_accountView) {
 		_accountView = [[XPMineAccountView alloc] init];
-		UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAccountrecognizer)];
+		UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAccountRecognizer)];
 		[_accountView addGestureRecognizer:tap];
 	}
 	return _accountView;
@@ -529,11 +529,21 @@
 - (XPNobleCenterEntranceView *)nobleEntranceView {
     if (!_nobleEntranceView) {
         _nobleEntranceView = [[XPNobleCenterEntranceView alloc] init];
-        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapNobleCenterrecognizer)];
+        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapNobleCenterRecognizer)];
         [_nobleEntranceView addGestureRecognizer:tap];
     }
     return _nobleEntranceView;
 }
+
+- (XPMineCenterAgencyView *)agencyView {
+    if (!_agencyView) {
+        _agencyView = [[XPMineCenterAgencyView alloc] init];
+        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapAgency)];
+        [_agencyView addGestureRecognizer:tap];
+    }
+    return _agencyView;
+}
+
 - (UIImageView *)reviewView{
 	if (!_reviewView){
 		_reviewView = [UIImageView new];

YuMi/Modules/YMMine/View/XPMineViewController.m

@@ -97,7 +97,6 @@ UIKIT_EXTERN NSString *kRequestTicket;
 
 @implementation XPMineViewController
 
-
 - (void)dealloc {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 }
@@ -112,6 +111,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
 
 - (void)viewDidLoad {
 	[super viewDidLoad];
+//    [self showLoading];
 	[self initSubViews];
 	[self initSubViewConstraints];
 	self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -132,8 +132,8 @@ UIKIT_EXTERN NSString *kRequestTicket;
 }
 -(void)getDataInfo{
     [self.presenter getUserInfo];
-    
 }
+
 #pragma mark- 检查是否有转赠钻石权限
 
 -(void)checkHaveGiveDiamondsPermission{ 
@@ -341,20 +341,37 @@ UIKIT_EXTERN NSString *kRequestTicket;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-	if (section == 2){
-		return  self.functionArray.count;
-	}
-	return 1;
+    switch (section) {
+        case 0:
+            return 0;
+            break;
+        case 1:
+            return 0;
+            break;
+        case 2:
+            return self.functionArray.count;
+            break;
+        default:
+            return 0;
+            break;
+    }
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-	if (indexPath.section == 0) {
-		return 44;
-
-	}else if (indexPath.section == 1) {
-		return self.isHavePermission ? 134 : 99;
-	}
-	return 60;
+    switch (indexPath.section) {
+        case 0:
+            return 0; // 44
+            break;
+        case 1:
+            return 0; // self.isHavePermission ? 134 : 99
+            break;
+        case 2:
+            return 60;
+            break;
+        default:
+            return 0;
+            break;
+    }
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -450,9 +467,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
         }
         webViewVC.url = url;
         [self.navigationController pushViewController:webViewVC animated:YES];
-        
     }
-
 }
 ///转赠钻石
 -(void)pushGiveDiamondVC{
@@ -529,9 +544,16 @@ UIKIT_EXTERN NSString *kRequestTicket;
 	[self pushViewControllerWithType:XPMineItemType_Noble_Center functionItem:nil];
 }
 
+- (void)xPMineHeadViewClickAgency {
+    [self clickHallAction];
+}
+
 #pragma mark - XPMineProtocol
 ///获取个人中心功能
 - (void)onGetMineFuntionItemSuccess:(NSArray<XPMineFunctionItemModel *> *)items {
+
+    [self hideHUD];
+
 	[self.functionArray removeAllObjects];
 	[self.functionArray addObjectsFromArray:items];
     for (XPMineFunctionItemModel * _Nonnull obj in self.functionArray) {
@@ -541,20 +563,19 @@ UIKIT_EXTERN NSString *kRequestTicket;
         }
     }
 	[self.functionArray enumerateObjectsUsingBlock:^(XPMineFunctionItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-		if (obj.skipType == XPMineItemType_CP || obj.skipType == XPMineItemType_My_Room) {
+		if (obj.skipType == XPMineItemType_CP) {
 			[self.functionArray removeObject:obj];
 		}
         if([obj.centerName isEqualToString:@"切换分区"]){
             [self.functionArray removeObject:obj];
         }
-       
 	}];
 	NSMutableArray *array = [NSMutableArray array];
 	for (XPMineFunctionItemModel *item in self.functionArray) {
 		[array addObject:item.centerName];
 	}
 	NSString *trackName = [array componentsJoinedByString:@","];
-	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventusercenter_function_show eventAttributes:@{@"functionName" : trackName}];
+	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventUserCenter_function_show eventAttributes:@{@"functionName" : trackName}];
 #ifdef DEBUG
         XPMineFunctionItemModel *item =  [XPMineFunctionItemModel new];
         item.centerName = @"切换环境";
@@ -564,8 +585,9 @@ UIKIT_EXTERN NSString *kRequestTicket;
 #endif
     [self.tableView reloadData];
 }
-- (void)onGetMineFunctionsItemFail{
 
+- (void)onGetMineFunctionsItemFail{
+    [self hideHUD];
 }
 
 - (void)onGetLittleGameListFail{
@@ -583,34 +605,45 @@ UIKIT_EXTERN NSString *kRequestTicket;
 	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventUserCenter_banner_show eventAttributes:@{@"bannerId" : trackName}];
     [self.tableView reloadData];
 }
+
 -(void)onGetPersonalBannerListFail{
 
 }
 
 - (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo {
-		///防止重新注册时，获取到用户信息不全，调用接口时401
-		if (!userInfo.isBindPhone && [ClientConfig shareConfig].iOSPhoneBind) {
-			return;
-		}
-		if (userInfo.nick == nil || userInfo.avatar == nil ) {
-			return;
-		}
-        self.userInfo = userInfo;
+    ///防止重新注册时，获取到用户信息不全，调用接口时401
+    if (!userInfo.isBindPhone && [ClientConfig shareConfig].iOSPhoneBind) {
+        [self hideHUD];
+        return;
+    }
+    if (userInfo.nick == nil || userInfo.avatar == nil ) {
+        [self hideHUD];
+        return;
+    }
 
-        [self.presenter getClanDetailInfo];
-//        [self.presenter getUserWalletInfo];
-        [self.presenter getPersonItemList];
-//        [self.presenter getMineBannerList];
-        [self.presenter getNobleInfo];
+    [self checkHaveGiveDiamondsPermission];
 
-        [self checkHaveGiveDiamondsPermission];
+    self.userInfo = userInfo;
+    @kWeakify(self);
+    userInfo.idAtt = [self.headView createNamePlateIdLabelAttribute:userInfo];
+    [self.tableView reloadData];
 
-        userInfo.idAtt = [self.headView createNamePlateIdLabelAttribute:userInfo];
-        [self.headView createNamePlateLevelAttribute:userInfo complete:^(NSMutableAttributedString *textAtt) {
+    [self.headView createNamePlateLevelAttribute:userInfo complete:^(NSMutableAttributedString *textAtt) {
+        @kStrongify(self);
+        dispatch_async(dispatch_get_main_queue(), ^{
             userInfo.levelAtt = textAtt;
             self.headView.userInfo = userInfo;
-        }];
-        [self.tableView reloadData];
+        });
+    }];
+
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        @kStrongify(self);
+        [self.presenter getClanDetailInfo];
+        [self.presenter getUserWalletInfo];
+        [self.presenter getPersonItemList];
+        //        [self.presenter getMineBannerList];
+        [self.presenter getNobleInfo];
+    });
 }
 
 - (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo{
@@ -653,6 +686,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
 ///获取家族信息成功
 - (void)onGetClanDetailInfoSuccess:(ClanDetailMainInfoModel *)clanInfo {
 	self.clanInfo = clanInfo;
+    self.headView.clanModel = clanInfo;
     [self.tableView reloadData];
 }
 
@@ -710,8 +744,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
 
 - (XPMineHeadView *)headView {
 	if (!_headView) {
-		CGFloat height = (KScreenWidth - 30 - 13) * 0.5 * 60 / 166;
-        height = 300;
+		CGFloat height = 110;
 		_headView = [[XPMineHeadView alloc] initWithFrame:CGRectMake(0, 0,KScreenWidth , 146 + height + kStatusBarHeight)];
 		_headView.delegate = self;
 	}

YuMi/Modules/YMMonents/Protocol/XPMonentsLatestProtocol.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class MomentsListInfoModel;
 @protocol XPMonentsLatestProtocol <NSObject>
 ///获取最新列表从成功
-- (void)getMonentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state;
+- (void)getMomentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state;
 ///获取最新列表从失败
 - (void)getMonentsLatestListFail:(NSString *)msg state:(int)state;
 

YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m

@@ -56,7 +56,6 @@
             [self initSubViews];
             [self initSubViewConstraints];
         }
-        
     }
     return self;
 }
@@ -158,8 +157,6 @@
         make.top.mas_equalTo(self.stackView.mas_bottom);
         make.height.mas_equalTo(kMOMENTS_TOOL_BAR_HEIGHT);
     }];
-  
-    
 }
 #pragma mark - XPMomentsUserInfoViewDelegate
 - (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)momentsInfo {
@@ -238,26 +235,20 @@
         XPMomentTopicContainerViewController * topicListVC = [[XPMomentTopicContainerViewController alloc] init];
         topicListVC.worldId = [NSString stringWithFormat:@"%ld", worldId];
         [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicListVC animated:YES];
-    
     }
-    
-    
-    
 }
 
 #pragma mark - Getters And Setters
 - (void)setIsFillet:(BOOL)isFillet{
     _isFillet = isFillet;
-
     if(_isFillet == YES){
-        _lineView.hidden = YES;
-        [_backView setCornerWithLeftTopCorner:0 rightTopCorner:0 bottomLeftCorner:8 bottomRightCorner:8 size:CGSizeMake(KScreenWidth-30, self.frame.size.height)];
+        self.lineView.hidden = YES;
+        [self.backView setCornerWithLeftTopCorner:0 rightTopCorner:0 bottomLeftCorner:8 bottomRightCorner:8 size:CGSizeMake(KScreenWidth-30, self.frame.size.height)];
     }else{
-        _lineView.hidden = NO;
-        if(_backView.layer.mask != nil){
-            _backView.layer.mask = nil;
+        self.lineView.hidden = NO;
+        if(self.backView.layer.mask != nil){
+            self.backView.layer.mask = nil;
         }
-     
     }
 }
 -(void)setMineMomentsInfo:(MomentsInfoModel *)mineMonentsInfo{
@@ -283,7 +274,7 @@
 
         CGFloat contentHeight = [XPMomentsLayoutConfig momentsContentHeight:_mineMomentsInfo] + 24;
       
-            self.topicView.hidden = _mineMomentsInfo.worldId <= 0;
+        self.topicView.hidden = _mineMomentsInfo.worldId <= 0;
         
         if(_mineMomentsInfo.squareTop && _mineMomentsInfo.content.length == 0){
             [self.textView mas_updateConstraints:^(MASConstraintMaker *make) {

YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m

@@ -138,18 +138,16 @@
                 make.top.mas_equalTo(line * (itemWidth + kMOMENTS_PIC_SPACE));
             }];
         }
-        
     }
 }
 
-
-
 - (void)setDynamicResList:(NSArray<MomentsPicInfoModel *> *)dynamicResList {
     _dynamicResList = dynamicResList;
     [self hiddenAllImageView];
     if (_dynamicResList.count == 0) {
-        
-    } else  if (_dynamicResList.count == 1) {
+        return;
+    }
+    if (_dynamicResList.count == 1) {
         self.firstImageView.hidden = NO;
         [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.size.mas_equalTo(CGSizeMake(kMOMENTS_PIC_ONE_WIDTH, kMOMENTS_PIC_ONE_WIDTH));
@@ -200,7 +198,6 @@
                 make.top.mas_equalTo(line * (itemWidth + kMOMENTS_PIC_SPACE));
             }];
         }
-        
     }
 }
 

YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m

@@ -276,18 +276,20 @@
         }
 
         NSString * headwearUrl= _momentsInfo.headwearEffect.length > 0 ? _momentsInfo.headwearEffect : _momentsInfo.headwearPic;
-        self.headWearImageView.hidden = headwearUrl.length <= 0;
-        self.headWearSVGAImageView.hidden =  headwearUrl.length <= 0;
+        self.headWearImageView.hidden = YES;
+        self.headWearSVGAImageView.hidden = YES;
         if (headwearUrl.length > 0) {
             if (_momentsInfo.headwearType == 1) {
+                self.headWearSVGAImageView.hidden = NO;
                 [self.headWearSVGAImageView setImageName:headwearUrl];
             } else {
-                NSURL *url = [NSURL URLWithString:headwearUrl];
                 @kWeakify(self);
-                [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
+                [self.manager loadSpriteSheetImageWithURL:[NSURL URLWithString:headwearUrl] completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
                     @kStrongify(self);
+                    self.headWearImageView.hidden = NO;
                     self.headWearImageView.image = sprit;
                 } failureBlock:^(NSError * _Nullable error) {
+                    NSLog(@"%@", error);
                 }];
             }
         }
@@ -520,7 +522,7 @@
         _headWearSVGAImageView = [[SVGAImageView alloc]init];
         _headWearSVGAImageView.backgroundColor = [UIColor clearColor];
         _headWearSVGAImageView.frame = CGRectZero;
-        _headWearSVGAImageView.userInteractionEnabled = YES;
+        _headWearSVGAImageView.userInteractionEnabled = NO;
         _headWearSVGAImageView.autoPlay = YES;
     }
     return _headWearSVGAImageView;

YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.m

@@ -15,14 +15,14 @@
 ///Model
 #import "MomentsListInfoModel.h"
 ///P
-#import "XPMonentsLatestPresenter.h"
+#import "XPMomentsLatestPresenter.h"
 #import "XPMonentsLatestProtocol.h"
 ///View
 #import "XPMomentsTableViewCell.h"
 #import "XPMomentsEmptyTableViewCell.h"
 #import "XPMomentsDetailViewController.h"
 UIKIT_EXTERN NSString *kRequestTicket;
-@interface XPMomentsLatestViewController ()<UITableViewDelegate, UITableViewDataSource,XPMonentsLatestProtocol, XPMomentsTableViewCellDelegate,XPMomentsDetailViewControllerDelegate>
+@interface XPMomentsLatestViewController ()<UITableViewDelegate, UITableViewDataSource, XPMonentsLatestProtocol, XPMomentsTableViewCellDelegate,XPMomentsDetailViewControllerDelegate>
 ///列表
 @property (nonatomic,strong) UITableView *tableView;
 ///数据源
@@ -45,12 +45,12 @@ UIKIT_EXTERN NSString *kRequestTicket;
 }
 
 - (__kindof id)createPresenter {
-    return [[XPMonentsLatestPresenter alloc] init];
+    return [[XPMomentsLatestPresenter alloc] init];
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self initHeaderAndFooterRrfresh];
+    [self initHeaderAndFooterRefresh];
     [self initSubViews];
     [self initSubViewConstraints];
 }
@@ -69,7 +69,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
 
 
 #pragma mark - 下拉刷新
-- (void)initHeaderAndFooterRrfresh {
+- (void)initHeaderAndFooterRefresh {
     MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)];
     header.stateLabel.font = [UIFont systemFontOfSize:10.0];
     header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0];
@@ -85,7 +85,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
     [self headerRefresh];
 }
 
-#pragma mark - 刷新的fangfa
+#pragma mark - 刷新
 - (void)headerRefresh {
     if([AccountInfoStorage instance].isRequestTicket == YES){
         return;
@@ -112,12 +112,12 @@ UIKIT_EXTERN NSString *kRequestTicket;
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     if (self.datasource.count > 0) {
-        MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row];
-        [XPMomentsLayoutConfig layoutMomentsModel:monentInfo];
-        if(monentInfo.squareTop && monentInfo.content.length == 0){
-            return monentInfo.rowHeight + 20 ;
+        MomentsInfoModel * momentsInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row];
+        [XPMomentsLayoutConfig layoutMomentsModel:momentsInfo];
+        if(momentsInfo.squareTop && momentsInfo.content.length == 0){
+            return momentsInfo.rowHeight + 20 ;
         }else{
-            return monentInfo.rowHeight;
+            return momentsInfo.rowHeight;
         }
         
     }
@@ -127,8 +127,8 @@ UIKIT_EXTERN NSString *kRequestTicket;
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     if (self.datasource.count > 0) {
         XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])];
-        MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row];
-        cell.momentsInfo = monentsInfo;
+        MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row];
+        cell.momentsInfo = momentsInfo;
         cell.delegate = self;
         return cell;
     }
@@ -140,8 +140,8 @@ UIKIT_EXTERN NSString *kRequestTicket;
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     if (self.datasource.count > 0) {
         XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init];
-        MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row];
-        detailVC.momentsInfo = monentsInfo;
+        MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row];
+        detailVC.momentsInfo = momentsInfo;
         detailVC.delegate = self;
         [self.navigationController pushViewController:detailVC animated:YES];
     }
@@ -162,32 +162,32 @@ UIKIT_EXTERN NSString *kRequestTicket;
 }
 
 #pragma mark - XPMomentsTableViewCellDelegate
-- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{
+- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)momentsInfo{
     [self showLoading];
-    [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId];
+    [self.presenter requesstShieldingWtihType:@"0" objId:momentsInfo.dynamicId];
 }
-- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo {
-    [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
+- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentsInfo {
+    [self.presenter likeMonent:momentsInfo.dynamicId status:!momentsInfo.isLike likedUid:momentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]];
 }
 
-- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo {
+- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentsInfo {
     [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsLatestViewController1") confirmHandler:^{
-        [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
+        [self.presenter deleteMonents:momentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]];
     } cancelHandler:^{
         
     }];
 }
 
-- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo {
-    __block MomentsInfoModel * monentsInfos;
+- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo {
+    __block MomentsInfoModel * _momentsInfo;
     [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) {
-            monentsInfos = obj;
+        if (obj.dynamicId.integerValue == momentsInfo.dynamicId.integerValue) {
+            _momentsInfo = obj;
             *stop = YES;
         }
     }];
-    if (monentsInfos) {
-        NSInteger row = [self.datasource indexOfObject:monentsInfo];
+    if (_momentsInfo) {
+        NSInteger row = [self.datasource indexOfObject:_momentsInfo];
         [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationNone];
     }
 }
@@ -198,7 +198,7 @@ UIKIT_EXTERN NSString *kRequestTicket;
 }
 
 #pragma mark - XPMonentsLatestProtocol
-- (void)getMonentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state{
+- (void)getMomentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state{
     self.listInfo = listInfo;
     if (state == 0) {
         [self.datasource removeAllObjects];

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m

@@ -12,7 +12,6 @@
 ///背景
 @property(nonatomic,strong) NetImageView *avatarView;
 
-
 ///榜单
 @property(nonatomic,strong) NetImageView *rankImageView;
 ///类型
@@ -136,13 +135,10 @@
 - (void)setRoomInfo:(HomePlayRoomModel *)roomInfo{
     _roomInfo = roomInfo;
     _nameView.text = _roomInfo.title;
-    _avatarView.image = nil;
+    _avatarView.imageUrl = _roomInfo.avatar;
     @kWeakify(self);
-    [self.avatarView loadImageWithUrl:_roomInfo.avatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
-        @kStrongify(self);
-        self.avatarView.image = image;
-    }];
     [_tagavatarView loadImageWithUrl:_roomInfo.tagPict completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+        @kStrongify(self);
         self.tagavatarView.image = image;
         CGFloat width =  kGetScaleWidth(62);
         if (image.size.height > 0){
@@ -185,6 +181,7 @@
         NetImageConfig *config = [[NetImageConfig alloc]init];
         config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder];
         _avatarView = [[NetImageView alloc]initWithConfig:config];
+        _avatarView.contentMode = UIViewContentModeScaleAspectFill;
         [_avatarView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(72))];
     }
     return _avatarView;

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m

@@ -210,7 +210,7 @@
             }
         }
         
-        _wealthView.imageUrl = _roomInfo.userLevelVo.expertUrl;
+        _wealthView.imageUrl = _roomInfo.userLevelVo.experUrl;
         _charmView.imageUrl = _roomInfo.userLevelVo.charmUrl;
         if(_roomInfo.userVoice.length == 0 && _roomInfo.userDesc.length == 0){
             _roomInfo.userDesc = YMLocalizedString(@"XPMineFriendTableViewCell0");

YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m

@@ -57,7 +57,7 @@
         self.nickLabel.text = name.length > 8 ? [NSString stringWithFormat:@"%@...",[name substringToIndex:8]]:name;
 		self.idLabel.text = [NSString stringWithFormat:@"ID:%@", resultModel.erbanNo];
         self.charmImageView.imageUrl = resultModel.userLevelVo.charmUrl;
-        self.experImageView.imageUrl = resultModel.userLevelVo.expertUrl;
+        self.experImageView.imageUrl = resultModel.userLevelVo.experUrl;
 		if (type == SearchType_Users) {
 			self.numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell1");
 			self.numberView.hidden = resultModel.roomUid.length <= 0;

YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m

@@ -88,7 +88,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
 	extModel.charmUrl = userInfo.userLevelVo.charmUrl;
 	extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-	extModel.experUrl = userInfo.userLevelVo.expertUrl;
+	extModel.experUrl = userInfo.userLevelVo.experUrl;
 	extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
 	extModel.fromUid = userInfo.fromUid;

YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m

@@ -79,7 +79,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.androidBubbleUrl = userInfo.androidBubbleUrl;

YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m

@@ -370,7 +370,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.fromUid = userInfo.fromUid;

YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m

@@ -118,7 +118,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.androidBubbleUrl = userInfo.androidBubbleUrl;

YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m

@@ -89,7 +89,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.fromUid = userInfo.fromUid;

YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m

@@ -65,7 +65,7 @@
     extModel.isCustomWord = userInfo.isCustomWord;
     extModel.charmUrl = userInfo.userLevelVo.charmUrl;
     extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq;
-    extModel.experUrl = userInfo.userLevelVo.expertUrl;
+    extModel.experUrl = userInfo.userLevelVo.experUrl;
     extModel.newUser = userInfo.newUser;
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     extModel.androidBubbleUrl = userInfo.androidBubbleUrl;

YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m

@@ -195,7 +195,8 @@
     
     [self.collectButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.settingButton);
-        make.leading.equalTo(self.titleStackView.mas_trailing).mas_offset(5);
+        make.trailing.mas_equalTo(-75);
+//        make.trailing.equalTo(self.topicButton.mas_leading).mas_offset(-5);
         make.size.mas_equalTo(CGSizeMake(20, 20));
     }];
     
@@ -207,14 +208,14 @@
     [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self.settingButton);
         make.leading.equalTo(self.avatarView.mas_trailing).mas_offset(6);
-        
+        make.trailing.mas_equalTo(self.collectButton.mas_leading);
     }];
     [self.titleStackView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_greaterThanOrEqualTo(50);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_lessThanOrEqualTo(100);
-        make.height.mas_equalTo(12);
+        make.width.mas_lessThanOrEqualTo(150);
+//        make.height.mas_equalTo(12);
     }];
    
     [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -222,7 +223,7 @@
     }];
     
     [self.giftEffectImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.size.mas_equalTo(CGSizeMake(10,10));
+        make.size.mas_equalTo(CGSizeMake(20,20));
     }];
     
     [self.lockRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -238,35 +239,34 @@
 }
 #pragma mark - RoomGuestDelegate
 - (void)onRoomEntered {
+    [self handleRoomInfoChange:NO];
+}
+
+- (void)onRoomUpdate {
+    [self handleRoomInfoChange:YES];
+}
+
+- (void)handleRoomInfoChange:(BOOL)isUpdate {
     RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo;
-    self.idLabel.text = [NSString stringWithFormat:@"ID：%ld",(long)roomInfo.erbanNo];
-    self.avatarView.imageUrl = roomInfo.avatar;
     if (roomInfo) {
+        self.idLabel.text = [NSString stringWithFormat:@"ID：%ld",(long)roomInfo.erbanNo];
+        self.avatarView.imageUrl = roomInfo.avatar;
         self.titleLabel.text = roomInfo.title;
         self.giftEffectImageView.hidden = roomInfo.hasAnimationEffect;
         if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
             self.collectButton.hidden = YES;
         } else {
             self.collectButton.hidden = NO;
-            self.collectButton.selected = roomInfo.isRoomFans;
+        }
+        if (!isUpdate) {
+            self.collectButton.selected = roomInfo.isRoomFans; // 收藏后，房间数据没有及时更新到 room info，此时不需读 room info 状态
         }
         self.lockRoomImageView.hidden = roomInfo.roomPwd.length <= 0;
     }
 }
 
-- (void)onRoomUpdate {
-    RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo;
-    self.titleLabel.text = roomInfo.title;
-    self.avatarView.imageUrl = roomInfo.avatar;
-    self.idLabel.text = [NSString stringWithFormat:@"ID：%ld",(long)roomInfo.erbanNo];
-    self.giftEffectImageView.hidden = roomInfo.hasAnimationEffect;
-    if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
-        self.collectButton.hidden = YES;
-    } else {
-        self.collectButton.hidden = NO;
-//        self.collectButton.selected = roomInfo.isRoomFans; 收藏后，房间数据没有及时更新
-    }
-}
+
+
 #pragma mark - Event Response
 - (void)showSharePanel {
    
@@ -537,13 +537,10 @@
         _onlineStackView.distribution = UIStackViewDistributionFill;
         _onlineStackView.alignment = UIStackViewAlignmentCenter;
         _onlineStackView.spacing = 2;
-
     }
     return _onlineStackView;
 }
 
-
-
 - (YYLabel *)idLabel {
     if (!_idLabel) {
         _idLabel = [[YYLabel alloc] init];

YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m

@@ -158,10 +158,10 @@
     
     
     
-    if (userInfo.userLevelVo.expertUrl) {
-        self.experImageView.imageUrl = userInfo.userLevelVo.expertUrl;
+    if (userInfo.userLevelVo.experUrl) {
+        self.experImageView.imageUrl = userInfo.userLevelVo.experUrl;
     }
-    self.experImageView.hidden = userInfo.userLevelVo.expertUrl.length <= 0;
+    self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0;
     
     if (userInfo.userLevelVo.charmUrl) {
         self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl;

YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m

@@ -428,13 +428,21 @@
     return self.userInfo;
 }
 - (void)configUser:(UserInfoModel *)userInfo {
+
 	self.userInfo = userInfo;
 
 	self.nickLabel.hidden = NO;
 	self.sexImageView.hidden = YES;
     self.forbidKickView.hidden = YES;
     if (userInfo) {
-        self.avatarImageView.imageUrl = userInfo.avatar;
+        @kWeakify(self);
+        [self.avatarImageView loadImageWithUrl:userInfo.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+            @kStrongify(self);
+            self.avatarImageView.image = image;
+        } fail:^(NSError * _Nonnull error) {
+            @kStrongify(self);
+            self.avatarImageView.image = [UIImageConstant defaultAvatarPlaceholder];
+        }];
         NSString *nickStr = userInfo.nick;
 		self.nickLabel.text = nickStr.length > 0 ? nickStr : @"";
         if (userInfo.micNickColor.length) {

YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m

@@ -20,24 +20,24 @@
 - (void)configMicroView:(MicroQueueModel *)model {
     self.position = model.microState.position;
     [super configMicroView:model];
-    MicroStateModel * micState = model.microState;
-
-    UIImage *image;
-	if (micState.posState == MicroPosStateType_Free) {
-        image = [UIImage imageNamed:@"room_position_normal"];
-	} else {
-        image = [UIImage imageNamed:@"room_position_lock"];
-	}
-    
-    CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width);
-    UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0);
-    // 缩小 “1” 点儿，防止默认背景的边缘被裁减。
-    [image drawInRect:CGRectMake(1, 1, scaledToSize.width - 2, scaledToSize.height - 2)];
-    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:newImage];
-
-    [self.avatarImageView updateConfigPlaceHolder:image];
+//    MicroStateModel * micState = model.microState;
+//
+//    UIImage *image;
+//	if (micState.posState == MicroPosStateType_Free) {
+//        image = [UIImage imageNamed:@"room_position_normal"];
+//	} else {
+//        image = [UIImage imageNamed:@"room_position_lock"];
+//	}
+//    
+//    CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width);
+//    UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0);
+//    // 缩小 “1” 点儿，防止默认背景的边缘被裁减。
+//    [image drawInRect:CGRectMake(1, 1, scaledToSize.width - 2, scaledToSize.height - 2)];
+//    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+//    UIGraphicsEndImageContext();
+//    self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:newImage];
+//
+//    [self.avatarImageView updateConfigPlaceHolder:image];
 }
 
 - (void)configUser:(UserInfoModel *)userInfo {

YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m

@@ -547,10 +547,10 @@
             self.newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"];
         }
     }
-	if (userInfo.userLevelVo.expertUrl) {
-		self.experImageView.imageUrl = userInfo.userLevelVo.expertUrl;
+	if (userInfo.userLevelVo.experUrl) {
+		self.experImageView.imageUrl = userInfo.userLevelVo.experUrl;
 	}
-	self.experImageView.hidden = userInfo.userLevelVo.expertUrl.length <= 0;
+	self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0;
 	
 	if (userInfo.userLevelVo.charmUrl) {
 		self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl;

YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m

@@ -673,7 +673,9 @@
 }
 #pragma mark - VIP升级
 - (void)receiveNobleLevelUp:(AttachmentModel *)attachment {
+    @kWeakify(self);
     [[NetImageView new]loadImageWithUrl:attachment.data[@"avatar"] completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
+        @kStrongify(self);
         PIBaseAnimationViewModel *nobleModel = [PIBaseAnimationViewModel new];
         nobleModel.data = attachment.data;
         nobleModel.type = GiftBannerType_Nobleman;

YuMi/Modules/YMTabbar/View/TabbarViewController.m

@@ -855,12 +855,13 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
 
 #pragma mark - 快捷进房
 - (void)initQuickEnterRoom {
-    NSString * key = [NSString stringWithFormat:@"%@_%@", kUserFirstLoginKey, [AccountInfoStorage instance].getUid];
-    BOOL isNotFirstLogin = [[NSUserDefaults standardUserDefaults] boolForKey:key];
-    if (!isNotFirstLogin) {
+// MARK: API 成功后，没有后续动作，先屏蔽
+//    NSString * key = [NSString stringWithFormat:@"%@_%@", kUserFirstLoginKey, [AccountInfoStorage instance].getUid];
+//    BOOL isNotFirstLogin = [[NSUserDefaults standardUserDefaults] boolForKey:key];
+//    if (!isNotFirstLogin) {
         ///新用户
-        //		[self.presenter getNewUserGreetInfo];
-    }
+//        [self.presenter getNewUserGreetInfo];
+//    }
 }
 
 ///跳转优先级  闪屏→linkedMe→邀请码→新用户打招呼引导→渠道指定房间

YuMi/Structure/MVP/Model/UserLevelVo.h

@@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, UserLevelType) {
 };
 
 @interface UserLevelVo : PIBaseModel
-@property (nonatomic , copy) NSString              * expertUrl;
+@property (nonatomic , copy) NSString              * experUrl;
 @property (nonatomic , assign) NSInteger              charmLevelSeq;
 @property (nonatomic , copy) NSString              * experLevelName;
 @property (nonatomic , copy) NSString              * charmLevelName;

YuMi/Tools/StatisticsService/StatisticsServiceHelper.h

@@ -50,7 +50,7 @@ UIKIT_EXTERN NSString *const StatisticsServiceEventUserCenter_recharge_card_show
 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_recharge_card_click; ///个人中心充值卡片点击（跳转充值页）
 UIKIT_EXTERN NSString *const StatisticsServiceEventUserCenter_noble_card_show; ///个人中心VIP卡片曝光
 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_noble_card_click;///个人中心VIP卡片片点击（跳转VIP页）
-UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_function_show; ///个人中心功能板块曝光,曝光时统计功能的名称
+UIKIT_EXTERN NSString *const StatisticsServiceEventUserCenter_function_show; ///个人中心功能板块曝光,曝光时统计功能的名称
 UIKIT_EXTERN NSString *const StatisticsServiceEventUserCenter_function_click; ///个人中心功能板块点击,点击时统计功能的名称
 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_quick_entry_show; ///个人中心快捷进房曝光,曝光时统计房间的id
 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_quick_entrysuccess_click; ///个人中心快捷进房点击成功匹配,点击时统计房间的

YuMi/Tools/StatisticsService/StatisticsServiceHelper.m

@@ -46,7 +46,7 @@ NSString *const StatisticsServiceEventUserCenter_recharge_card_show = @"usercent
 NSString *const StatisticsServiceEventusercenter_recharge_card_click = @"usercenter_recharge_card_click"; ///个人中心充值卡片点击（跳转充值页）
 NSString *const StatisticsServiceEventUserCenter_noble_card_show = @"usercenter_noble_card_show"; ///个人中心VIP卡片曝光
 NSString *const StatisticsServiceEventusercenter_noble_card_click = @"usercenter_noble_card_click";///个人中心VIP卡片片点击（跳转VIP页）
-NSString *const StatisticsServiceEventusercenter_function_show = @"usercenter_function_show"; ///个人中心功能板块曝光,曝光时统计功能的名称
+NSString *const StatisticsServiceEventUserCenter_function_show = @"usercenter_function_show"; ///个人中心功能板块曝光,曝光时统计功能的名称
 NSString *const StatisticsServiceEventUserCenter_function_click = @"usercenter_function_click"; ///个人中心功能板块点击,点击时统计功能的名称
 NSString *const StatisticsServiceEventusercenter_quick_entry_show = @"usercenter_quick_entry_show"; ///个人中心快捷进房曝光,曝光时统计房间的id
 NSString *const StatisticsServiceEventusercenter_quick_entrysuccess_click = @"usercenter_quick_entrysuccess_click"; ///个人中心快捷进房点击成功匹配,点击时统计房间的id

YuMi/ar.lproj/Localizable.strings

@@ -3116,6 +3116,8 @@ ineHeadView12" = "الحمل";
 ///XPMineTheGuildCell.m
 "XPMineTheGuildCell0" = "وكالتي";
 "XPMineTheGuildCell1" = "انضم إلى الوكالة";
+"XPMineTheGuildCell2" = "مركزVIP";
+"XPMineTheGuildCell3" = "وكالتي";
 
 ///XPMineGiveDiamondVC
 "XPMineGiveDiamondVC0" = "تحويلاتي";

YuMi/en.lproj/Localizable.strings

@@ -2886,6 +2886,8 @@
 ///XPMineTheGuildCell.m
 "XPMineTheGuildCell0" = "Agnecy · Room";
 "XPMineTheGuildCell1" = "Join Agency";
+"XPMineTheGuildCell2" = "Join VIP";
+"XPMineTheGuildCell3" = "My agent";
 
 ///XPMineGiveDiamondVC
 "XPMineGiveDiamondVC0" = "Coins Gifting";

YuMi/pi_area_info.json

@@ -264,12 +264,6 @@
       "mcc": "219",
       "code": "385"
     },
-    {
-      "name": "Cuba",
-      "abbr": "CU",
-      "mcc": "368",
-      "code": "53"
-    },
     {
       "name": "Curaçao",
       "abbr": "CW",
@@ -486,12 +480,6 @@
       "mcc": "510",
       "code": "62"
     },
-    {
-      "name": "Iran, Islamic Republic of",
-      "abbr": "IR",
-      "mcc": "432",
-      "code": "98"
-    },
     {
       "name": "Iraq",
       "abbr": "IQ",
@@ -942,12 +930,6 @@
       "mcc": "228",
       "code": "41"
     },
-    {
-      "name": "Syrian Arab Republic",
-      "abbr": "SY",
-      "mcc": "417",
-      "code": "963"
-    },
     {
       "name": "Taiwan",
       "abbr": "TW",

YuMi/zh-Hans.lproj/Localizable.strings

@@ -2543,6 +2543,8 @@
 ///XPMineTheGuildCell.m
 "XPMineTheGuildCell0" = "公会·房间";
 "XPMineTheGuildCell1" = "加入公会";
+"XPMineTheGuildCell2" = "加入VIP";
+"XPMineTheGuildCell3" = "我的公會";
 
 ///XPMineGiveDiamondVC
 "XPMineGiveDiamondVC0" = "我的转赠";

YuMi/zh-Hant.lproj/Localizable.strings

@@ -2533,7 +2533,8 @@
 ///XPMineTheGuildCell.m
 "XPMineTheGuildCell0" = "公會·房間";
 "XPMineTheGuildCell1" = "加入公會";
-
+"XPMineTheGuildCell2" = "加入VIP";
+"XPMineTheGuildCell3" = "我的公會";
 ///XPMineGiveDiamondVC
 "XPMineGiveDiamondVC0" = "我的轉贈";
 "XPMineGiveDiamondVC1"="轉贈記錄";