diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 77de5594..d3df5db3 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -12217,7 +12217,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.7; + MARKETING_VERSION = 20.20.8; 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.8; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json similarity index 74% rename from YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/Contents.json rename to YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json index c4a46974..72f73640 100644 --- a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/Contents.json +++ b/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" } diff --git a/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png new file mode 100644 index 00000000..e0a2831b Binary files /dev/null and b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@2x.png deleted file mode 100644 index 32dfa82e..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@3x.png deleted file mode 100644 index 7c290c64..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@3x.png and /dev/null differ diff --git a/YuMi/CustomUI/ShareView/XPShareView.m b/YuMi/CustomUI/ShareView/XPShareView.m index 28912e42..1ddfba03 100644 --- a/YuMi/CustomUI/ShareView/XPShareView.m +++ b/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; diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index b658a135..e4ee7e2c 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/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.1" ///渠道 #define PI_App_Source @"appstore" //#define PI_App_Source @"pi_tf" diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m index bd3b2972..14c518cf 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/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]; } diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index a4efafeb..c36621ed 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/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]; @@ -983,7 +984,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } } -- (void)initEnterRoomSuccess:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo { +- (void)enterRoomFail:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo { [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; [XPSkillCardPlayerManager shareInstance].roomUid = @(roomInfo.uid).stringValue; userInfo.fromUid = self.fromUid; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index a94098fa..02261b22 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/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"="厅内红包";