yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了几处不规范的类名和不规范的注释

Browse Source
This commit is contained in:
fengshuo
2021-12-06 17:00:15 +08:00
parent c7d7a98990
commit d79202c555
13 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xplan-ios.xcodeproj/project.pbxproj
View File

@@ -193,7 +193,7 @@
E87A26F927587C62002DDC7A /* XPHomeContainerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A26F827587C62002DDC7A /* XPHomeContainerPresenter.m */; };
E87A26FD27587E17002DDC7A /* HomeTagModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A26FC27587E17002DDC7A /* HomeTagModel.m */; };
E87A270027588445002DDC7A /* XPHomeListEmptyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A26FF27588445002DDC7A /* XPHomeListEmptyCollectionViewCell.m */; };
E87A27032758BC81002DDC7A /* XPRoomSearchContaierViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A27022758BC81002DDC7A /* XPRoomSearchContaierViewController.m */; };
E87A27032758BC81002DDC7A /* XPRoomSearchContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A27022758BC81002DDC7A /* XPRoomSearchContainerViewController.m */; };
E884C36C2743951B00E1EBED /* GiftReceiveInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E884C36B2743951B00E1EBED /* GiftReceiveInfoModel.m */; };
E884C36F2743AAC800E1EBED /* AttachmentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E884C36E2743AAC800E1EBED /* AttachmentModel.m */; };
E884C3722743AEDE00E1EBED /* CustomAttachmentDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = E884C3712743AEDE00E1EBED /* CustomAttachmentDecoder.m */; };
@@ -267,7 +267,7 @@
E8C6FFCC27548120004DC9F0 /* Api+Home.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFC827548120004DC9F0 /* Api+Home.m */; };
E8C6FFD027548256004DC9F0 /* XPHomeListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFCF27548256004DC9F0 /* XPHomeListCollectionViewCell.m */; };
E8C6FFD42754AA87004DC9F0 /* XPNoteView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFD32754AA87004DC9F0 /* XPNoteView.m */; };
E8C6FFD72754BC61004DC9F0 /* XPHoneNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFD62754BC61004DC9F0 /* XPHoneNavView.m */; };
E8C6FFD72754BC61004DC9F0 /* XPHomeNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFD62754BC61004DC9F0 /* XPHomeNavView.m */; };
E8C6FFDA2754BE81004DC9F0 /* ThemeColor+Home.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFD92754BE81004DC9F0 /* ThemeColor+Home.m */; };
E8C6FFDD2754CF5D004DC9F0 /* HomeRecommendRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFDC2754CF5D004DC9F0 /* HomeRecommendRoomModel.m */; };
E8C6FFE02754EEF9004DC9F0 /* XPHomeSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFDF2754EEF9004DC9F0 /* XPHomeSearchViewController.m */; };
@@ -678,8 +678,8 @@
E87A26FC27587E17002DDC7A /* HomeTagModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTagModel.m; sourceTree = "<group>"; };
E87A26FE27588445002DDC7A /* XPHomeListEmptyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeListEmptyCollectionViewCell.h; sourceTree = "<group>"; };
E87A26FF27588445002DDC7A /* XPHomeListEmptyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeListEmptyCollectionViewCell.m; sourceTree = "<group>"; };
E87A27012758BC81002DDC7A /* XPRoomSearchContaierViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSearchContaierViewController.h; sourceTree = "<group>"; };
E87A27022758BC81002DDC7A /* XPRoomSearchContaierViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSearchContaierViewController.m; sourceTree = "<group>"; };
E87A27012758BC81002DDC7A /* XPRoomSearchContainerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSearchContainerViewController.h; sourceTree = "<group>"; };
E87A27022758BC81002DDC7A /* XPRoomSearchContainerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSearchContainerViewController.m; sourceTree = "<group>"; };
E884C36A2743951B00E1EBED /* GiftReceiveInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftReceiveInfoModel.h; sourceTree = "<group>"; };
E884C36B2743951B00E1EBED /* GiftReceiveInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftReceiveInfoModel.m; sourceTree = "<group>"; };
E884C36D2743AAC800E1EBED /* AttachmentModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AttachmentModel.h; sourceTree = "<group>"; };
@@ -820,8 +820,8 @@
E8C6FFCF27548256004DC9F0 /* XPHomeListCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeListCollectionViewCell.m; sourceTree = "<group>"; };
E8C6FFD22754AA87004DC9F0 /* XPNoteView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNoteView.h; sourceTree = "<group>"; };
E8C6FFD32754AA87004DC9F0 /* XPNoteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNoteView.m; sourceTree = "<group>"; };
E8C6FFD52754BC61004DC9F0 /* XPHoneNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHoneNavView.h; sourceTree = "<group>"; };
E8C6FFD62754BC61004DC9F0 /* XPHoneNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHoneNavView.m; sourceTree = "<group>"; };
E8C6FFD52754BC61004DC9F0 /* XPHomeNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeNavView.h; sourceTree = "<group>"; };
E8C6FFD62754BC61004DC9F0 /* XPHomeNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeNavView.m; sourceTree = "<group>"; };
E8C6FFD82754BE81004DC9F0 /* ThemeColor+Home.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+Home.h"; sourceTree = "<group>"; };
E8C6FFD92754BE81004DC9F0 /* ThemeColor+Home.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ThemeColor+Home.m"; sourceTree = "<group>"; };
E8C6FFDB2754CF5D004DC9F0 /* HomeRecommendRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeRecommendRoomModel.h; sourceTree = "<group>"; };
@@ -2252,8 +2252,8 @@
E87A26F527587C48002DDC7A /* XPHomeContainerViewController.m */,
E8C6FFDE2754EEF9004DC9F0 /* XPHomeSearchViewController.h */,
E8C6FFDF2754EEF9004DC9F0 /* XPHomeSearchViewController.m */,
E87A27012758BC81002DDC7A /* XPRoomSearchContaierViewController.h */,
E87A27022758BC81002DDC7A /* XPRoomSearchContaierViewController.m */,
E87A27012758BC81002DDC7A /* XPRoomSearchContainerViewController.h */,
E87A27022758BC81002DDC7A /* XPRoomSearchContainerViewController.m */,
);
path = View;
sourceTree = "<group>";
@@ -2285,8 +2285,8 @@
children = (
E8C6FFD22754AA87004DC9F0 /* XPNoteView.h */,
E8C6FFD32754AA87004DC9F0 /* XPNoteView.m */,
E8C6FFD52754BC61004DC9F0 /* XPHoneNavView.h */,
E8C6FFD62754BC61004DC9F0 /* XPHoneNavView.m */,
E8C6FFD52754BC61004DC9F0 /* XPHomeNavView.h */,
E8C6FFD62754BC61004DC9F0 /* XPHomeNavView.m */,
E8C6FFE82755040B004DC9F0 /* XPHomeSearchNavView.h */,
E8C6FFE92755040B004DC9F0 /* XPHomeSearchNavView.m */,
);
@@ -2647,7 +2647,7 @@
E824545C26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m in Sources */,
E8AC723726F49982007D6E91 /* XPMineNotificaProtocol.h in Sources */,
E89D60BD271D647A001F8895 /* XPRoomPresenter.m in Sources */,
E8C6FFD72754BC61004DC9F0 /* XPHoneNavView.m in Sources */,
E8C6FFD72754BC61004DC9F0 /* XPHomeNavView.m in Sources */,
E8AC723226F49710007D6E91 /* XPMineNotificationTableViewCell.m in Sources */,
E8AC722926F488DA007D6E91 /* XPMineFeedbackProtocol.h in Sources */,
E8AC721E26F472BF007D6E91 /* XPMineSettingProtocol.h in Sources */,
@@ -2840,7 +2840,7 @@
E81366FC26F0D2980076364C /* UIButton+EnlargeTouchArea.m in Sources */,
E824546426F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m in Sources */,
E8C6FFE32754F349004DC9F0 /* XPSearchListTableViewCell.m in Sources */,
E87A27032758BC81002DDC7A /* XPRoomSearchContaierViewController.m in Sources */,
E87A27032758BC81002DDC7A /* XPRoomSearchContainerViewController.m in Sources */,
E884C3722743AEDE00E1EBED /* CustomAttachmentDecoder.m in Sources */,
18EE3FEE2750CE6D00A452BF /* NIMMessageUtils.m in Sources */,
9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */,

28
xplan-ios/Main/Home/View/SubViews/XPHomeNavView.h Normal file
View File

@@ -0,0 +1,28 @@
//
// XPHoneNavView.h
// xplan-ios
//
// Created by 冯硕 on 2021/11/29.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@class XPHomeNavView;
@protocol XPHomeNavViewDelegate <NSObject>
///点击了搜索按钮
- (void)xPHomeNavView:(XPHomeNavView *)view didClickSearch:(UIButton *)sender;
@end
@interface XPHomeNavView : UIView
///代理
@property (nonatomic,weak) id<XPHomeNavViewDelegate> delegat;
@end
NS_ASSUME_NONNULL_END

10
xplan-ios/Main/Home/View/SubViews/XPHoneNavView.m → xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m
View File

@@ -5,7 +5,7 @@
// Created by 冯硕 on 2021/11/29.
//
#import "XPHoneNavView.h"
#import "XPHomeNavView.h"
///Third
#import <Masonry/Masonry.h>
///Tool
@@ -13,7 +13,7 @@
#import "XPMacro.h"
#import "UIImage+Utils.h"
@interface XPHoneNavView ()
@interface XPHomeNavView ()
///搜索按钮
@property (nonatomic,strong) UIButton *searchButton;
///标题
@@ -22,7 +22,7 @@
@property (nonatomic,strong) UIImageView *backImageView;
@end
@implementation XPHoneNavView
@implementation XPHomeNavView
- (instancetype)initWithFrame:(CGRect)frame
{
@@ -61,8 +61,8 @@
#pragma mark - Event Response
- (void)searchButtonAction:(UIButton *)sender {
if (self.delegat && [self.delegat respondsToSelector:@selector(xPHoneNavView:didClickSearch:)]) {
[self.delegat xPHoneNavView:self didClickSearch:sender];
if (self.delegat && [self.delegat respondsToSelector:@selector(xPHomeNavView:didClickSearch:)]) {
[self.delegat xPHomeNavView:self didClickSearch:sender];
}
}

28
xplan-ios/Main/Home/View/SubViews/XPHoneNavView.h
View File

@@ -1,28 +0,0 @@
//
// XPHoneNavView.h
// xplan-ios
//
// Created by 冯硕 on 2021/11/29.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@class XPHoneNavView;
@protocol XPHoneNavViewDelegate <NSObject>
///点击了搜索按钮
- (void)xPHoneNavView:(XPHoneNavView *)view didClickSearch:(UIButton *)sender;
@end
@interface XPHoneNavView : UIView
///代理
@property (nonatomic,weak) id<XPHoneNavViewDelegate> delegat;
@end
NS_ASSUME_NONNULL_END

16
xplan-ios/Main/Home/View/XPHomeContainerViewController.m
View File

@@ -16,17 +16,17 @@
///Model
#import "HomeTagModel.h"
///View
#import "XPHoneNavView.h"
#import "XPRoomSearchContaierViewController.h"
#import "XPHomeNavView.h"
#import "XPRoomSearchContainerViewController.h"
#import "XPHomeViewController.h"
///P
#import "XPHomeContainerPresenter.h"
#import "XPHomeContainerProtocol.h"
@interface XPHomeContainerViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeContainerProtocol,XPHoneNavViewDelegate>
@interface XPHomeContainerViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeContainerProtocol,XPHomeNavViewDelegate>
///导航栏
@property (nonatomic,strong) XPHoneNavView *navView;
@property (nonatomic,strong) XPHomeNavView *navView;
///背景图
@property (nonatomic,strong) UIView * backView;
///分页标题
@@ -132,8 +132,8 @@
}
#pragma mark - XPHoneNavViewDelegate
- (void)xPHoneNavView:(XPHoneNavView *)view didClickSearch:(UIButton *)sender {
XPRoomSearchContaierViewController * searchVC = [[XPRoomSearchContaierViewController alloc] init];
- (void)xPHoneNavView:(XPHomeNavView *)view didClickSearch:(UIButton *)sender {
XPRoomSearchContainerViewController * searchVC = [[XPRoomSearchContainerViewController alloc] init];
[self.navigationController presentViewController:searchVC animated:YES completion:nil];
}
@@ -172,9 +172,9 @@
}
return _backView;
}
- (XPHoneNavView *)navView {
- (XPHomeNavView *)navView {
if (!_navView) {
_navView = [[XPHoneNavView alloc] init];
_navView = [[XPHomeNavView alloc] init];
_navView.delegat = self;
}
return _navView;

2
xplan-ios/Main/Home/View/XPRoomSearchContaierViewController.h → xplan-ios/Main/Home/View/XPRoomSearchContainerViewController.h
View File

@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface XPRoomSearchContaierViewController : BaseViewController
@interface XPRoomSearchContainerViewController : BaseViewController
@end

6
xplan-ios/Main/Home/View/XPRoomSearchContaierViewController.m → xplan-ios/Main/Home/View/XPRoomSearchContainerViewController.m
View File

@@ -5,7 +5,7 @@
// Created by 冯硕 on 2021/12/2.
//
#import "XPRoomSearchContaierViewController.h"
#import "XPRoomSearchContainerViewController.h"
///Third
#import <Masonry/Masonry.h>
#import <JXCategoryView/JXCategoryView.h>
@@ -16,7 +16,7 @@
#import "XPHomeSearchNavView.h"
///View
#import "XPHomeSearchViewController.h"
@interface XPRoomSearchContaierViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeSearchNavViewDelegate,UITextFieldDelegate>
@interface XPRoomSearchContainerViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeSearchNavViewDelegate,UITextFieldDelegate>
///分页标题
@property (nonatomic, strong) NSArray<NSString *> *titles;
///分页控件
@@ -31,7 +31,7 @@
@property (nonatomic,strong) XPHomeSearchViewController *userVC;
@end
@implementation XPRoomSearchContaierViewController
@implementation XPRoomSearchContainerViewController
- (BOOL)isHiddenNavBar {
return YES;

2
xplan-ios/Main/IM/Model/AttachmentModel.h
View File

@@ -17,7 +17,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
///队列操作
CustomMessageType_Queue = 8,
///全麦送
CustomMessageType_ALLMicroSend = 12,
CustomMessageType_AllMicroSend = 12,
///踢出房间
CustomMessageType_Kick_User = 18,
///福袋消息

8
xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
View File

@@ -99,7 +99,7 @@
NSMutableDictionary *data = [NSMutableDictionary dictionary];
[data addEntriesFromDictionary:dict];
if (receiveModel.gift.giftType == GiftType_Lucky) { // 如果是福袋 需要分开发送消息
attachement.first = CustomMessageType_ALLMicroSend;
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllMicroLuckySend;
NSArray *luckyBagGifts = (NSArray *)[data objectForKey:@"luckyBagGifts"];
if (luckyBagGifts.count >0) {
@@ -116,7 +116,7 @@
}];
}
}else { // 全麦赠送普通礼物 包含背包礼物
attachement.first = CustomMessageType_ALLMicroSend;
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllMicroSend;
[data setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
attachement.data = data;
@@ -126,7 +126,7 @@
NSMutableDictionary *data = [NSMutableDictionary dictionary];
[data addEntriesFromDictionary:dict];
if (receiveModel.gift.giftType == GiftType_Lucky) { // 多人非全麦 福袋礼物
attachement.first = CustomMessageType_ALLMicroSend;
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllBatchMicroLuckySend;
NSArray *luckyBagGifts = (NSArray *)[data objectForKey:@"luckyBagGifts"];
if (luckyBagGifts.count >0) {
@@ -144,7 +144,7 @@
}];
}
}else { // 多人非全麦 普通礼物
attachement.first = CustomMessageType_ALLMicroSend;
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllBatchSend;
attachement.data = data;
[self sendCustomMessage:attachement];

2
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m
View File

@@ -147,7 +147,7 @@
receiveInfo.isLuckyBagGift = attachment.second == Custom_Message_Sub_Gift_LuckySend;
receiveInfo.isBatch = YES;
[self receiveGift:receiveInfo];
} else if (attachment.first == CustomMessageType_ALLMicroSend) { //发送全麦礼物 或者多人礼物
} else if (attachment.first == CustomMessageType_AllMicroSend) { //发送全麦礼物 或者多人礼物
GiftReceiveInfoModel * receiveInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data];
receiveInfo.isLuckyBagGift = (attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend);
receiveInfo.isBatch = (attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend);

2
xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m
View File

@@ -57,7 +57,7 @@
int first = attachment.first;
if (first == CustomMessageType_Gift) {///单人送
return [self createSendGiftAttribute:attachment sendInfo:model];
} else if(first == CustomMessageType_ALLMicroSend) {///全麦送 多人送
} else if(first == CustomMessageType_AllMicroSend) {///全麦送 多人送
return [self createBatchMicroSendGiftAttribute:attachment sendInfo:model];
} else if(first == CustomMessageType_Room_Tip) {///分享/收藏房间
return [self createShareOrAttentionRoomAttribute:attachment sendInfo:model uid:message.from];

2
xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.m
View File

@@ -153,7 +153,7 @@
- (NSDictionary *)supportMessageDic {
return @{
@(CustomMessageType_ALLMicroSend):
@(CustomMessageType_AllMicroSend):
[NSSet setWithObjects:
@(Custom_Message_Sub_AllMicroSend),
@(Custom_Message_Sub_AllMicroLuckySend),

4
xplan-ios/Main/Room/View/StageView/StageView.m
View File

@@ -302,7 +302,7 @@
NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
if (attachment.first == CustomMessageType_Gift || attachment.first == CustomMessageType_ALLMicroSend) {
if (attachment.first == CustomMessageType_Gift || attachment.first == CustomMessageType_AllMicroSend) {
[self receiveGift:attachment];
} else if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Invite) {
NSDictionary * dic = attachment.data;
@@ -320,7 +320,7 @@
NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
if (attachment.first == CustomMessageType_Gift || attachment.first == CustomMessageType_ALLMicroSend) {
if (attachment.first == CustomMessageType_Gift || attachment.first == CustomMessageType_AllMicroSend) {
[self receiveGift:attachment];
}
}