2.4.1版本发版 此commit置顶

Podfile

@@ -39,7 +39,7 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14445'
+  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
@@ -66,7 +66,6 @@ target 'YuMi' do
 	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
 	pod 'mob_sharesdk/ShareSDKPlatforms/Line'
 	pod 'mob_sharesdk/ShareSDKExtension'
-        pod 'mob_sharesdk/ShareSDKPlatforms/Facebook_Lite'
   
   pod 'UMCommon'
 	pod 'UMDevice'
@@ -83,6 +82,10 @@ post_install do |installer|
     project.targets.each do |target|
       target.build_configurations.each do |config|
             config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+           xcconfig_path = config.base_configuration_reference.real_path
+          xcconfig = File.read(xcconfig_path)
+          xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+          File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
        end
     end
   end

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

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

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -47,19 +47,21 @@ UIKIT_EXTERN NSString * adImageName;
 - (void) configBugly {
 
     BuglyConfig *config = [[BuglyConfig alloc] init];
-    config.channel = @"App Enterprise";
+    
-    config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
     config.blockMonitorTimeout = 5;
     config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录开关，默认关闭
 
 #ifdef DEBUG
     config.debugMode = YES; // debug 模式下，开启调试模式
+    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
     config.reportLogLevel = BuglyLogLevelVerbose; // 设置打印日志级别
     [Bugly startWithAppId:@"86cf73b8d5" config:config];
 #else
     config.debugMode = NO; // release 模式下，关闭调试模式
+    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = NO; // 卡顿监控开关，默认关闭
     config.reportLogLevel = BuglyLogLevelWarn; // 设置自定义日志上报的级别，默认不上报自定义日志
-    [Bugly startWithAppId:@"0fcba36f9a" config:config];
+    NSString *buylyKey = isEnterprise == NO ? @"5334684d86" : @"d65df59a68";
+    [Bugly startWithAppId:buylyKey config:config];
 #endif
     
 }
@@ -67,6 +69,7 @@ UIKIT_EXTERN NSString * adImageName;
 	//推荐在程序启动的时候初始化 NIMSDK
 	NSString *appKey        = KeyWithType(KeyType_NetEase);
 	NIMSDKOption *option    = [NIMSDKOption optionWithAppKey:appKey];
+    option.apnsCername = @"newPiko";
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化

YuMi/Appdelegate/AppDelegate.m

@@ -17,6 +17,8 @@
 #import <GoogleSignIn/GoogleSignIn.h>
 #import "GULAppDelegateSwizzler.h"
 #import <GoogleSignIn/GoogleSignIn.h>
+#import "XPLoginViewController.h"
+#import "AccountModel.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
@@ -27,10 +29,22 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    TabbarViewController *vc = [[TabbarViewController alloc] init];
+   
-    BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
+   
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    self.window.rootViewController = bnc;
+   
+    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
+    if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) {
+        XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
+        BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc];
+        nav.modalPresentationStyle = UIModalPresentationFullScreen;
+        self.window.rootViewController = nav;
+    }else{
+        TabbarViewController *vc = [[TabbarViewController alloc] init];
+        BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
+        self.window.rootViewController = bnc;
+    }
+    
     [self.window makeKeyAndVisible];
 	///设置广告页
 	[self setupLaunchADView];

YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.h

@@ -0,0 +1,16 @@
+//
+//  YYTextAsyncLayer+PITextAsyncLayer.h
+//  YuMi
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import <YYText/YYTextAsyncLayer.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YYTextAsyncLayer (PITextAsyncLayer)
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.m

@@ -0,0 +1,26 @@
+//
+//  YYTextAsyncLayer+PITextAsyncLayer.m
+//  YuMi
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import "YYTextAsyncLayer+PITextAsyncLayer.h"
+
+@implementation YYTextAsyncLayer (PITextAsyncLayer)
+///iOS17bug，如果不把方法替换会闪退
++(void)load {
+    Method displayMethod = class_getInstanceMethod(self, @selector(display));
+    Method swizzingMethod = class_getInstanceMethod(self, @selector(swizzing_display));
+    method_exchangeImplementations(displayMethod, swizzingMethod);
+}
+-(void)swizzing_display{
+    //通过变量名称获取类中的实例成员变量
+    if (self.bounds.size.width <= 0 || self.bounds.size.height <= 0) {
+        self.contents = nil;
+        return;
+    } else {
+        [self swizzing_display];
+    }
+}
+@end

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_treasure_fairy_buy_elf_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_treasure_fairy_buy_elf_bg@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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

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

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

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

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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

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

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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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_new_userinfo_bg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_treasure_fairy_new_userinfo_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_treasure_fairy_new_userinfo_bg@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

@@ -0,0 +1,22 @@
+{
+  "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_trials_high_ball_bg.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_treasure_fairy_trials_high_ball_bg.png",
+      "filename" : "room_treasure_fairy_trials_high_ball_bg@3x.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.png",
+      "filename" : "room_treasure_fairy_trials_middle_ball_bg@3x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },