修复bug

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_bottom_buy.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_but_btn.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_choose.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_no_choose.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_price.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_title.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_draw_diamond_rebrush.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_my_middle_title_normal.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_treasure_fairy_bottom_icon@2x.png",
+      "filename" : "room_treasure_fairy_my_middle_title_normal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_treasure_fairy_bottom_icon@3x.png",
+      "filename" : "room_treasure_fairy_my_middle_title_normal@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_my_middle_title_select.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_treasure_fairy_buy_elf_bg@2x.png",
+      "filename" : "room_treasure_fairy_my_middle_title_select@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_treasure_fairy_buy_elf_bg@3x.png",
+      "filename" : "room_treasure_fairy_my_middle_title_select@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_add.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_subtract.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_title.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_shop_new_exchange_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_treasure_bg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_treasure_fairy_bottom_bg@2x.png",
+      "filename" : "room_treasure_fairy_treasure_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_treasure_fairy_bottom_bg@3x.png",
+      "filename" : "room_treasure_fairy_treasure_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_trials_high_ball_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_trials_middle_ball_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_trials_salvage_bg.imageset/Contents.json

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

YuMi/Config/ClientConfig.h

@@ -23,6 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
 ///开箱子 大于等级  展示
 @property (nonatomic, assign) NSInteger openCandyTreeLimitLevel;
 @property (nonatomic,assign) BOOL canOpen;
+///是否刷新了
+@property (nonatomic,assign) BOOL isLoad;
 ///房间id，用于分享房间跳转到房间
 @property (nonatomic, copy) NSString *__nullable roomId;
 ///用户id，用于外部h5跳转到聊天页面

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 
-#define PI_App_Version @"2.0.7"
+#define PI_App_Version @"2.0.8"
 #ifdef DEBUG
 #define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]
 

YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m

@@ -327,7 +327,7 @@
         if (@available(iOS 15.0, *)) {
             
             PIIAPRegulate *iap = [PIIAPRegulate shared];
-            [iap demandShopedThingWithProductId:chargeProdId uuid:uuid completionHandler:^(NSError * _Nullable error) {
+            [iap demandCommodityThingWithProductId:chargeProdId uuid:uuid completionHandler:^(NSError * _Nullable error) {
                 
             }];
             @kWeakify(self);
@@ -406,7 +406,7 @@
     [XNDJTDDLoadingTool hideOnlyView:kWindow];
     if (@available(iOS 15.0, *)) {
         PIIAPRegulate *iap = [PIIAPRegulate shared];
-        [iap verifyBusinessFinishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
+        [iap verifyBusinessAccomplishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
             
         }];
     }
@@ -425,7 +425,7 @@
     if(code == 1444){
         if (@available(iOS 15.0, *)) {
             PIIAPRegulate *iap = [PIIAPRegulate shared];
-            [iap verifyBusinessFinishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
+            [iap verifyBusinessAccomplishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
                 
             }];
         }

YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m

@@ -355,7 +355,7 @@
         if (@available(iOS 15.0, *)) {
             
             PIIAPRegulate *iap = [PIIAPRegulate shared];
-            [iap demandShopedThingWithProductId:chargeProdId uuid:uuid completionHandler:^(NSError * _Nullable error) {
+            [iap demandCommodityThingWithProductId:chargeProdId uuid:uuid completionHandler:^(NSError * _Nullable error) {
                 
             }];
             @kWeakify(self);
@@ -430,7 +430,7 @@
     [XNDJTDDLoadingTool hideHUDInView:kWindow];
     if (@available(iOS 15.0, *)) {
         PIIAPRegulate *iap = [PIIAPRegulate shared];
-        [iap verifyBusinessFinishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
+        [iap verifyBusinessAccomplishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
             
         }];
     }
@@ -448,7 +448,7 @@
     if(code == 1444){
         if (@available(iOS 15.0, *)) {
             PIIAPRegulate *iap = [PIIAPRegulate shared];
-            [iap verifyBusinessFinishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
+            [iap verifyBusinessAccomplishWithTransaction:[NSString stringWithFormat:@"%@",transcationId] completionHandler:^{
                 
             }];
         }

YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m

@@ -25,7 +25,7 @@
 #import "XPMonentsPublishViewController.h"
 
 @interface XPMonentTopicContainerViewController ()<JXPagerViewDelegate,JXCategoryViewDelegate>
-@property (nonatomic,strong) JXCategoryTitleView *categoryView;
+@property (nonatomic,strong) JXCategoryTitleView *pi_categoryView;
 @property (nonatomic,strong) JXCategoryIndicatorLineView *lineView;
 @property (nonatomic,strong) JXPagerListRefreshView *pagerContentView;
 @property (nonatomic,strong) NSArray<NSString *> *titles;
@@ -101,7 +101,7 @@
 }
 
 - (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
-	return self.categoryView;
+	return self.pi_categoryView;
 }
 
 - (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView {
@@ -137,27 +137,27 @@
 	self.latestVC.worldId = _worldId;
 }
 
-- (JXCategoryTitleView *)categoryView {
-	if (!_categoryView) {
-		_categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 46)];
-		_categoryView.titles = self.titles;
-		_categoryView.backgroundColor = [UIColor whiteColor];
-		_categoryView.delegate = self;
-		_categoryView.titleSelectedColor = [DJDKMIMOMColor mainTextColor];
-		_categoryView.titleColor = [DJDKMIMOMColor secondTextColor];
-		_categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:18];
-		_categoryView.titleFont = [UIFont systemFontOfSize:15];
-		_categoryView.titleColorGradientEnabled = YES;
-		_categoryView.titleLabelZoomEnabled = NO;
-		_categoryView.indicators = @[self.lineView];
-		_categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerContentView.listContainerView;
-		_categoryView.averageCellSpacingEnabled = NO;
-		_categoryView.contentEdgeInsetLeft = 20;
-		_categoryView.contentEdgeInsetRight = 20;
-		_categoryView.cellSpacing = 30;
+- (JXCategoryTitleView *)pi_categoryView {
+	if (!_pi_categoryView) {
+		_pi_categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 46)];
+		_pi_categoryView.titles = self.titles;
+		_pi_categoryView.backgroundColor = [UIColor whiteColor];
+		_pi_categoryView.delegate = self;
+		_pi_categoryView.titleSelectedColor = [DJDKMIMOMColor mainTextColor];
+		_pi_categoryView.titleColor = [DJDKMIMOMColor secondTextColor];
+		_pi_categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:18];
+		_pi_categoryView.titleFont = [UIFont systemFontOfSize:15];
+		_pi_categoryView.titleColorGradientEnabled = YES;
+		_pi_categoryView.titleLabelZoomEnabled = NO;
+		_pi_categoryView.indicators = @[self.lineView];
+		_pi_categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerContentView.listContainerView;
+		_pi_categoryView.averageCellSpacingEnabled = NO;
+		_pi_categoryView.contentEdgeInsetLeft = 20;
+		_pi_categoryView.contentEdgeInsetRight = 20;
+		_pi_categoryView.cellSpacing = 30;
 
 	}
-	return _categoryView;
+	return _pi_categoryView;
 }
 
 - (JXCategoryIndicatorLineView *)lineView {