更换图片logo

Podfile

@@ -4,13 +4,14 @@ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 target 'YuMi' do
   use_frameworks!
   #pag动画
-  pod 'libpag'
+  pod 'libpag', '~> 4.3.21'
   pod 'Bugly'
   pod 'Adjust', '~> 4.31.0'
   pod 'Firebase/Analytics'
   pod 'FBSDKLoginKit'
   pod 'FBSDKCoreKit'
   pod 'FBSDKShareKit'
+  pod 'LineSDKSwift'
   # 滑动标签栏
   pod 'JXCategoryView'
   pod 'JXPagingView/Pager'
@@ -39,42 +40,38 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14445'
+  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
   pod 'CocoaAsyncSocket',:modular_headers => true
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'
+  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'	
-	#上传图片
-	pod 'Qiniu'
-	#内购
-	pod 'IAPHelper'
 	#持久化存储
-	pod 'SSKeychain'
+  pod 'SSKeychain'
-	pod 'Base64'
+  pod 'Base64'
   #pop动画
   pod 'pop', '~> 1.0.12'
   #云信
   pod 'NIMSDK_LITE', '~> 9.2.8'
-	pod 'GKCycleScrollView', '~> 1.2.0'
+  pod 'GKCycleScrollView', '~> 1.2.0'
-	pod 'SVGAPlayer'
+  pod 'SVGAPlayer'
-
+  pod 'GoogleSignIn'
-	pod 'GoogleSignIn'
+  pod 'mob_linksdk_pro'
-	pod 'mob_linksdk_pro'
+  pod 'mob_sharesdk'
-	pod 'mob_sharesdk'
+  pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
+  #pod 'mob_sharesdk/ShareSDKPlatforms/Line'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Line'
+  pod 'mob_sharesdk/ShareSDKExtension'
-	pod 'mob_sharesdk/ShareSDKExtension'
   
   pod 'UMCommon'
-	pod 'UMDevice'
+  pod 'UMDevice'
   pod 'lottie-ios'
   pod 'WeexSDK'
   pod 'ZLCollectionViewFlowLayout'
   pod 'WMZDropDownMenu'
   pod 'TABAnimated'
-  pod 'YuMi',:path=>'yum'	
+  pod 'YuMi',:path=>'yum'
+  pod 'QCloudCOSXML'	
 end
 
 post_install do |installer|
@@ -82,6 +79,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

@@ -10,6 +10,8 @@
 #import <NIMSDK/NIMSDK.h>
 #import <ShareSDK/ShareSDK.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
+#import <UserNotifications/UserNotifications.h>
+#import <MOBFoundation/MobSDK+Privacy.h>
 ///Tool
 #import "YUMIConstant.h"
 #import "CustomAttachmentDecoder.h"
@@ -23,13 +25,18 @@
 #import "XCCurrentVCStackManager.h"
 #import "ClientConfig.h"
 #import <Adjust/Adjust.h>
+#import <UserNotifications/UserNotifications.h>
 
 #import <Bugly/Bugly.h>
 
+#import "YuMi-swift.h"
+
 
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
+
+
 @implementation AppDelegate (ThirdConfig)
 
 
@@ -40,7 +47,27 @@ UIKIT_EXTERN NSString * adImageName;
 	[self initEmojiData];
     [self configAdjust];
     [self configBugly];
+    [self registerNot];
+  
 }
+-(void)registerNot{
+    if (@available(iOS 10.0, *)) {
+                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+                [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+                    if (granted) {
+                        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                            if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
+                                dispatch_async(dispatch_get_main_queue(), ^{
+                                    [[UIApplication sharedApplication] registerForRemoteNotifications];
+                                });
+                            }
+                        }];
+                    }
+                }];
+            }
+   
+}
+
 /**
  崩溃收集 Bugly
  */
@@ -69,7 +96,15 @@ UIKIT_EXTERN NSString * adImageName;
 	//推荐在程序启动的时候初始化 NIMSDK
 	NSString *appKey        = KeyWithType(KeyType_NetEase);
 	NIMSDKOption *option    = [NIMSDKOption optionWithAppKey:appKey];
+#ifdef DEBUG
+    option.apnsCername = @"pikoDevelopPush";
+#else
     option.apnsCername = @"newPiko";
+#endif
+ 
+    
+
+    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -103,14 +138,22 @@ UIKIT_EXTERN NSString * adImageName;
    [Adjust appDidLaunch:adjustConfig];
 }
 - (void)configShareSDK {
-    
+
-  
+    [PILineLoginManager registerLine];
-    
+
 	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
 		///faceBook
 //		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
 		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
 	}];
+    NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
+    if (isUpload == nil){
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
+            
+        }];
+        [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
 }
 
 #pragma mark - 表情

YuMi/Appdelegate/AppDelegate.m

@@ -5,6 +5,8 @@
 //  Created by admin on 2023/3/9.
 //
 
+#import <MobLinkPro/MobLink.h>
+#import <MobLinkPro/MLSDKScene.h>
 #import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
@@ -19,10 +21,13 @@
 #import <GoogleSignIn/GoogleSignIn.h>
 #import "XPLoginViewController.h"
 #import "AccountModel.h"
+#import "YuMi-swift.h"
+#import "SessionViewController.h"
+#import "LoginFullInfoViewController.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
-@interface AppDelegate ()
+@interface AppDelegate ()<IMLSDKRestoreDelegate>
 
 @end
 
@@ -57,12 +62,23 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 	}
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FIRApp configure];
-   
+    [MobLink setDelegate:self];
+
    
     return YES;
 }
 
+- (void) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler
+{
+    NSString *inviteCode = scene.params[@"inviteCode"];
+    if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
+        ClientConfig *config = [ClientConfig shareConfig];
+        config.inviteCode = inviteCode;
+    }
 
+    restoreHandler(YES, MLDefault);
+
+}
 
 
 
@@ -101,13 +117,45 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 - (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 	// 上传devicetoken至云信服务器。
-	[[NIMSDK sharedSDK] updateApnsToken:deviceToken];
+	[[NIMSDK sharedSDK] updateApnsToken:deviceToken ];
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+   
+    NSString *data = userInfo[@"data"];
+    if(data){
+        NSDictionary *dataDic = [data mj_JSONObject];
+        NSString *userId = dataDic[@"uid"];
+        if(userId){
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+           
+            });
+            return;
+        }
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NSString *userId = userInfo[@"uid"];
+        if(userId){
+            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+        }
+       });
+   
+   
+    
 }
 
 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
-   
+    NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
-    
+    if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
+            return [PILineLoginManager applicationOpenurl:app open:url];
+        }
     
     NSString *text = [url query];
     if(text.length){
@@ -133,6 +181,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
                 [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":uid}];
                 ClientConfig *config = [ClientConfig shareConfig];
                 config.chatId = uid;
+            }else if (type == 8){
+                NSString *inviteCode = paramsDict[@"inviteCode"];
+                if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
+                    ClientConfig *config = [ClientConfig shareConfig];
+                    config.inviteCode = inviteCode;
+                }
             }
             return YES;
         }

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/Guild/mine_give_diamond_search.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_diamond.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_bg.imageset/Contents.json

@@ -1,16 +1,15 @@
 {
   "images" : [
     {
+      "filename" : "noble_privilege_list_bg.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "noble_privilege_list_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "noble_privilege_list_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_left_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_noble_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_rebate_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Noble/noble_privilege_list_rigth_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/Contents.json

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

YuMi/Assets.xcassets/middle/pi_gift_gold.imageset/Contents.json

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

YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/pi_webView_code_bottom.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/pi_webView_code_btn_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/pi_webView_code_code_text.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/pi_webView_code_top.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/share_save_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_across_pk_assist.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "redPacket_entrance.png",
+      "filename" : "room_across_pk_assist.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_across_pk_onlookers.imageset/Contents.json

@@ -1,16 +1,15 @@
 {
   "images" : [
     {
+      "filename" : "room_across_pk_onlookers.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "send_redpacket_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "send_redpacket_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/yna/Activity/pi_room_activity_click_arrow.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_activity_choose_play_arrow.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_gift_broadcast_high_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_gift_broadcast_low_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_gift_broadcast_middle_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_gift_broadcast_room_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_gift_broadcast_window_no_select.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_gift_broadcast_window_select.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/room_gift_broadcast_high/room_gift_broadcast_high_avatar_board.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/room_gift_broadcast_high/room_gift_broadcast_high_bg.imageset/Contents.json

@@ -1,25 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_gift_broadcast_high_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_gift_broadcast_high_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "localizable" : true
-  }
-}

YuMi/Assets.xcassets/yna/Broadcast/room_gift_broadcast_high/room_gift_broadcast_high_normal_id_nick_bg.imageset/Contents.json

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