修正 bugs

YuMi.xcodeproj/project.pbxproj

@@ -528,6 +528,9 @@
 		545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */; };
 		545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */; };
 		547853A12C258F2A00F45E60 /* XPMineUserViewHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */; };
+		548E01C52C3F78360071C83D /* FeedBackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 548E01C22C3F78360071C83D /* FeedBackViewController.xib */; };
+		548E01C62C3F78360071C83D /* FeedBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C42C3F78360071C83D /* FeedBackViewController.m */; };
+		548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C82C3F78600071C83D /* FeedBackConfigModel.m */; };
 		54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */; };
 		54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */; };
 		54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; };
@@ -2590,6 +2593,11 @@
 		545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPaneAvatarView.m; sourceTree = "<group>"; };
 		5478539F2C258F2A00F45E60 /* XPMineUserViewHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserViewHeader.h; sourceTree = "<group>"; };
 		547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserViewHeader.m; sourceTree = "<group>"; };
+		548E01C22C3F78360071C83D /* FeedBackViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FeedBackViewController.xib; sourceTree = "<group>"; };
+		548E01C32C3F78360071C83D /* FeedBackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedBackViewController.h; sourceTree = "<group>"; };
+		548E01C42C3F78360071C83D /* FeedBackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedBackViewController.m; sourceTree = "<group>"; };
+		548E01C72C3F78600071C83D /* FeedBackConfigModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedBackConfigModel.h; sourceTree = "<group>"; };
+		548E01C82C3F78600071C83D /* FeedBackConfigModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedBackConfigModel.m; sourceTree = "<group>"; };
 		54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineViewController.h; sourceTree = "<group>"; };
 		54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeMineViewController.m; sourceTree = "<group>"; };
 		54C3895D2C2189DD00FD47B1 /* XPHomeMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMinePresenter.h; sourceTree = "<group>"; };
@@ -5047,6 +5055,9 @@
 		189DD58A26DF978700AB55B1 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				548E01C32C3F78360071C83D /* FeedBackViewController.h */,
+				548E01C42C3F78360071C83D /* FeedBackViewController.m */,
+				548E01C22C3F78360071C83D /* FeedBackViewController.xib */,
 				14DCAD12299B9B0B00A7DD31 /* NewLogin */,
 				E872308A26E89D5100B90D4F /* CustomView */,
 				E8B825C926EA1231009E8E9F /* LoginVerifCodeViewController.h */,
@@ -10397,6 +10408,8 @@
 		E8B825BC26E9E520009E8E9F /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				548E01C72C3F78600071C83D /* FeedBackConfigModel.h */,
+				548E01C82C3F78600071C83D /* FeedBackConfigModel.m */,
 				E81C27A926EF2D920031E639 /* ThirdUserInfo.h */,
 				E81C27AA26EF2D920031E639 /* ThirdUserInfo.m */,
 				E818DD1D2A48974300F163F7 /* LoginAreaModel.h */,
@@ -11148,6 +11161,7 @@
 				E80EC83228ACD84000D133C5 /* emoji_00@2x.png in Resources */,
 				E80EC89C28ACD84000D133C5 /* emoji_50@2x.png in Resources */,
 				E80EC87A28ACD84000D133C5 /* emoji_113@2x.png in Resources */,
+				548E01C52C3F78360071C83D /* FeedBackViewController.xib in Resources */,
 				23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */,
 				23FF42672AA5CFBB0055733C /* home_sound_wave.gif in Resources */,
 				E80EC88A28ACD84000D133C5 /* emoji_25@2x.png in Resources */,
@@ -12444,6 +12458,7 @@
 				E852D74428633A08001465ED /* MonentsCommentModel.m in Sources */,
 				238B37C42AC55A2C00BFC9D5 /* XPTreasureFairyBallContentView.m in Sources */,
 				E8C1CD6D27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m in Sources */,
+				548E01C62C3F78360071C83D /* FeedBackViewController.m in Sources */,
 				E8C1CD7627D8AE3D00376F83 /* XPRoomFacePresenter.m in Sources */,
 				E85E7B362A4EB0D300B6D00A /* XPClanRoomCollectionViewCell.m in Sources */,
 				18F4043A275E20D900A6C548 /* TRTCRtcImpl.m in Sources */,
@@ -12573,6 +12588,7 @@
 				23E9EB152A84D02400B792F2 /* XPMineUserInfoEditPickView.m in Sources */,
 				9BA812D628BF52E100783EA7 /* XPRoomSendRedPacketViewController.m in Sources */,
 				E86E79D328A4E94E006DAF48 /* SessionRiskView.m in Sources */,
+				548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */,
 				E85E7B1F2A4EB0D300B6D00A /* XPMineGuildIncomeStatisViewController.m in Sources */,
 				E85E7B412A4EB0D300B6D00A /* XPMineGuildEmptyTableViewCell.m in Sources */,
 				E8133916273E532D00708B66 /* XPGiftItemCollectionViewCell.m in Sources */,

YuMi/Modules/YMLogin/View/FeedBackViewController.m

@@ -194,7 +194,7 @@
         _titleLabel.numberOfLines = 1;
         [self.contentView addSubview:_titleLabel];
         [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.mas_equalTo(self.contentView);
+            make.edges.mas_equalTo(self.contentView).insets(UIEdgeInsetsMake(9, 10, 9, 10));
         }];
     }
     return self;
@@ -218,6 +218,7 @@
 @property (nonatomic, strong) UIImage *selectedImage;
 @property (nonatomic, strong) FeedBackConfigModel *configModel;
 @property (nonatomic, strong) FeedBackTypeModel *selectTypeModel;
+@property (nonatomic, strong) NSLayoutConstraint *collectionViewHeightConstraint;
 
 @end
 
@@ -241,6 +242,15 @@
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+
+//    [self.submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xa5eec8),UIColorFromRGB(0xabf5e3)]
+//                                                                   gradientType:GradientTypeTopToBottom
+//                                                                        imgSize:CGSizeMake(300, 50)]
+//                                 forState:UIControlStateNormal];
+//    [self.submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x57e193),UIColorFromRGB(0x1402a6)]
+//                                                                   gradientType:GradientTypeTopToBottom
+//                                                                        imgSize:CGSizeMake(300, 50)]
+//                                 forState:UIControlStateSelected];
 }
 
 - (LoginPresenter *)createPresenter {
@@ -258,6 +268,8 @@
     [self setupFakeTopBar];
 
     [self.closeKeyboardButton setTitle:@"" forState:UIControlStateNormal];
+    
+//    self.typeCollectionLayout.estimatedItemSize = UICollectionViewFlowLayoutAutomaticSize;
 
     self.typeCollectionView.delegate = self;
     self.typeCollectionView.dataSource = self;
@@ -423,6 +435,8 @@
         make.height.mas_greaterThanOrEqualTo(31);
         make.width.mas_equalTo(KScreenWidth - 32);
     }];
+//    self.collectionViewHeightConstraint = [self.typeCollectionView.heightAnchor constraintEqualToConstant:1];
+//    self.collectionViewHeightConstraint.active = YES;
 
     [self.closeKeyboardButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.typeCollectionView.mas_bottom);
@@ -681,6 +695,7 @@
     [self.typeCollectionView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_greaterThanOrEqualTo(contentSize.height);
     }];
+
 }
 
 // 返回 section 中的 item 数量

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

@@ -63,7 +63,7 @@
 }
 
 - (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error {
-    
+
 }
 
 #pragma mark - Response