diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m index ef05ccc5..914a1a89 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m @@ -57,12 +57,12 @@ UIImage* image = cell.imageView.image; if (image) { - CGFloat scale = image.size.width / image.size.height; + CGFloat scale = image.size.width / (image.size.height > 0 ?image.size.height : 1) ; return CGSizeMake(20 * scale, height); } else { NSURL *imgUrl = [NSURL URLWithString:[self.dataArray safeObjectAtIndex1:indexPath.item]]; UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat scale = myImage.size.width / myImage.size.height; + CGFloat scale = myImage.size.width / (myImage.size.height > 0 ? myImage.size.height : 1); if (scale == 0) { return CGSizeMake(60, height); }else { diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 5acedf94..6f46f835 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -3616,7 +3616,7 @@ ///MSRoomGameQuitGameView "MSRoomGameQuitGameView0"="The game has started. Exiting the room will be considered a game failure. Are you sure you want to exit the room?"; "MSRoomGameQuitGameView1"="Exit"; -"MSRoomGameQuitGameView2"="Continue the game"; +"MSRoomGameQuitGameView2"="Continue"; "MSRoomGameQuit tGameView3"="Match failed, do you want to rematch? "; "MSRoomGameQuitGameView4"="Game in progress, do you want to return to the room? "; "MSRoomGameQuitGameView5"="During a match, exiting a room will end the match. Do you want to exit?";