更改logo

YuMi.xcodeproj/project.pbxproj

@@ -12217,7 +12217,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.7;
+				MARKETING_VERSION = 20.20.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12253,7 +12253,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.7;
+				MARKETING_VERSION = 20.20.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "1024＊1024.png",
+      "filename" : "1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json

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

YuMi/CustomUI/ShareView/XPShareView.m

@@ -143,12 +143,6 @@
         [TTPopup dismiss];
         return;
     };
-    
-    if([self isInstallClient:[self getSharePlatformType:item.type]] == NO){
-        [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView9")];
-        [TTPopup dismiss];
-        return;
-    }
     if (item.type == XPShareItemTagAppFriends) {
         [TTPopup dismiss];
         XPMineShareViewController * shareVC = [[XPMineShareViewController alloc] init];
@@ -165,7 +159,11 @@
         [TTPopup dismiss];
         return;
     }
-    
+    if([self isInstallClient:[self getSharePlatformType:item.type]] == NO){
+        [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView9")];
+        [TTPopup dismiss];
+        return;
+    }
     
     self.shareInfo.shareType = item.type;
     

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.5.0"
+#define PI_App_Version @"2.5.2"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"

YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m

@@ -175,7 +175,7 @@ UIKIT_EXTERN NSString * const kRoomReceivedCandyNotificationKey;
     self.isPicking = NO;
     [self.presenter getLoveSettingInfo];
     [result enumerateObjectsUsingBlock:^(CandyTreeGiftInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        if (obj.level > 0) {
+        if (obj.level > 2) {
             ///取消所有的延迟加载的方法
             [NSObject cancelPreviousPerformRequestsWithTarget:self];
             

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

@@ -463,7 +463,7 @@
         _inputButton.titleLabel.font = [UIFont systemFontOfSize:12];
         _inputButton.layer.masksToBounds = YES;
         _inputButton.layer.cornerRadius = 15;
-        [_inputButton setBackgroundImage:[UIImage imageNamed:@"room_menu_send_bg"] forState:UIControlStateNormal];
+        [_inputButton setBackgroundImage:[UIImage imageNamed:@"pi_room_menu_bottom_send_bg"] forState:UIControlStateNormal];
         _inputButton.tag = XPRoomMenuItemType_Input;
         [_inputButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }

YuMi/Modules/YMRoom/View/XPRoomViewController.m

@@ -280,7 +280,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
     [self initSubViews];
     [self initSubViewConstraints];
     if (self.isMiniEnter) {
-        [self initEnterRoomSuccess:[XPRoomMiniManager shareManager].getRoomInfo user:[XPRoomMiniManager shareManager].getUserInfo];
+        [XNDJTDDLoadingTool showAnchorLoading:self.navigationController.view];
+        [self.presenter initEnterRoom:self.roomUid user:[AccountInfoStorage instance].getUid];
     } else {
         [XNDJTDDLoadingTool showAnchorLoading:self.navigationController.view];
         [self.presenter initEnterRoom:self.roomUid user:[AccountInfoStorage instance].getUid];
@@ -1675,9 +1676,9 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
         if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen && attachment.second ==  Custom_Message_Sub_Star_Kitchen_FullScreen){
             isHave = YES;
         }else if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
-            
+            isHave = YES;
         }else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {  //夺宝精灵
-            
+            isHave = YES;
         }else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
             isHave = YES;
         }if (attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) {

YuMi/zh-Hans.lproj/Localizable.strings

@@ -541,7 +541,7 @@
 "XPIAPRechargeViewController7" = "提示";
 "XPIAPRechargeViewController8" = "储值失败，请联系客服处理~";
 "XPIAPRechargeViewController9" = "联系客服";
-"XPIAPRechargeViewController10" = "儲值失敗。當前僅支持運行iOS15及以上系統的手機進行儲值，請升級系統版本後重試。";
+"XPIAPRechargeViewController10" = "储值失败。当前仅支持运行iOS15及以上系统的手机进行储值，请升级系统版本后重试。";
 "XPIAPRechargeViewController11" = "请选择需要储值钻石的数量";
 
 
@@ -1152,7 +1152,7 @@
 
 "XPRoomMenuContainerView0" = "房间公屏已关闭";
 "XPRoomMenuContainerView1" = "PK已开始暂时无法排麦";
-"XPRoomMenuContainerView2" = "说点什麽...";
+"XPRoomMenuContainerView2" = "说点什么...";
 "XPRoomMenuContainerView3" = "快给大家打个招呼吧";
 
 "XPRoomSendTextView0" = "请输入消息...";
@@ -3097,8 +3097,8 @@
 ///SessionDiscoverNewTableViewCell.m
 "SessionDiscoverNewTableViewCell0" = "发现萌新";
 ///XPMineSimpleUserInfoHeaderView
-"XPMineSimpleUserInfoHeaderView0"="這個人很懶，還沒有簽名嗷~";
-"XPMineSimpleUserInfoHeaderView1"="這個人很懶，還沒有簽名嗷~";
+"XPMineSimpleUserInfoHeaderView0"="这个人很懒，还没有签名嗷~";
+"XPMineSimpleUserInfoHeaderView1"="这个人很懒，还没有签名嗷~";
 "XPMineSimpleUserInfoHeaderView2"="直播中";
 "XPMineSimpleUserInfoHeaderView3"="礼物墙";
 "XPMineSimpleUserInfoHeaderView4"="礼物墙";
@@ -3108,7 +3108,7 @@
 "PIRoomPhotoAlbumVC0"="房间相册";
 "PIRoomPhotoAlbumVC1"="我的照片";
 "PIRoomPhotoAlbumVC2"="普通照片";
-"PIRoomPhotoAlbumVC3"="解鎖照片";
+"PIRoomPhotoAlbumVC3"="解锁照片";
 ///PIRoomPhotoAlbumItemVC
 "PIRoomPhotoAlbumItemVC0"="上传照片";
 "PIRoomPhotoAlbumItemVC1"="上传失败，请重新上传";
@@ -3156,7 +3156,7 @@
 "PIRedPacketChooseTypeView4"="所有人均可参与";
 "PIRedPacketChooseTypeView5"="关注主播可参与";
 "PIRedPacketChooseTypeView6"="分享房间可参与";
-"PIRedPacketChooseTypeView7"="發指定彈幕內容";
+"PIRedPacketChooseTypeView7"="发指定弹幕内容";
 "PIRedPacketChooseTypeView8"="抢红包条件";
 ///PIRoomSendRedPacketVC
 "PIRoomSendRedPacketVC0"="厅内红包";