From 9fddcc83ad40b072be4a7f80db0b792d428bf880 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Fri, 9 Aug 2024 17:28:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=AD=A3=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AC=E8=B5=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi/Modules/YMMine/Presenter/XPMinePresent.m  |  2 +-
 .../Modules/YMMine/View/XPMineViewController.m | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m b/YuMi/Modules/YMMine/Presenter/XPMinePresent.m
index 90c3741d..516f2914 100644
--- a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m
+++ b/YuMi/Modules/YMMine/Presenter/XPMinePresent.m
@@ -93,7 +93,7 @@
 	[Api requestPersonalFunctionItem:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         @kStrongify(self);
 		NSArray *array = [XPMineFunctionItemModel modelsWithArray:data.data];
-		[[self getView] onGetMineFuntionItemSuccess:array ];
+		[[self getView] onGetMineFuntionItemSuccess:array];
 	}fail:^(NSInteger code, NSString * _Nullable msg) {
         @kStrongify(self);
 		[[self getView] onGetMineFunctionsItemFail];
diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m
index 207d128e..0f58212d 100644
--- a/YuMi/Modules/YMMine/View/XPMineViewController.m
+++ b/YuMi/Modules/YMMine/View/XPMineViewController.m
@@ -132,9 +132,6 @@ UIKIT_EXTERN NSString *kRequestTicket;
 }
 
 -(void)getDataInfo{
-    if (self.functionArray.count < 2) {
-        [self.presenter getPersonItemList];
-    }
     [self.presenter getUserInfo];
 }
 
@@ -636,22 +633,19 @@ UIKIT_EXTERN NSString *kRequestTicket;
     if (userInfo.nick == nil || userInfo.avatar == nil ) {
         return;
     }
+    self.userInfo = userInfo;
 
     [self checkHaveGiveDiamondsPermission];
 
-    self.userInfo = userInfo;
-    @kWeakify(self);
-
     [self.tableView reloadData];
     [self.headView createNamePlateIdLabelAttribute:userInfo];
     self.headView.userInfo = userInfo;
 
-    dispatch_async(dispatch_get_global_queue(0, 0), ^{
-        @kStrongify(self);
-        [self.presenter getClanDetailInfo];
-        [self.presenter getUserWalletInfo];
-        [self.presenter getNobleInfo];
-    });
+    // MARK: 获取配置列表前，需要先执行 checkHaveGiveDiamondsPermission 确认权限
+    [self.presenter getPersonItemList];
+    [self.presenter getClanDetailInfo];
+    [self.presenter getUserWalletInfo];
+    [self.presenter getNobleInfo];
 }
 
 - (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo{