Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1064ff8

Browse filesBrowse files
wanghenghengwanghengheng
committed
UIMessageInputView - 代码整理
新用户进来无项目的情况下提示语改下
1 parent f84fa3c commit 1064ff8
Copy full SHA for 1064ff8

File tree

Expand file treeCollapse file tree

12 files changed

+261
-170
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

12 files changed

+261
-170
lines changed
Open diff view settings
Collapse file

‎Coding_iOS.xcodeproj/project.pbxproj‎

Copy file name to clipboardExpand all lines: Coding_iOS.xcodeproj/project.pbxproj
+32-6Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@
204204
4EA7F1651A6D192B00A046BD /* UIImageView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA7F1531A6D192B00A046BD /* UIImageView+WebCache.m */; };
205205
4EA7F1661A6D192B00A046BD /* UIView+WebCacheOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA7F1551A6D192B00A046BD /* UIView+WebCacheOperation.m */; };
206206
4EA7F1671A6D192B00A046BD /* ODRefreshControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA7F1581A6D192B00A046BD /* ODRefreshControl.m */; };
207+
4EABD2541AD3CA7E005E515F /* UIMessageInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EABD2531AD3CA7E005E515F /* UIMessageInputView.m */; };
208+
4EABD2571AD3CAAC005E515F /* UIMessageInputView_Add.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EABD2561AD3CAAC005E515F /* UIMessageInputView_Add.m */; };
209+
4EABD25A1AD3CB4A005E515F /* UIMessageInputView_CCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EABD2591AD3CB4A005E515F /* UIMessageInputView_CCell.m */; };
210+
4EABD25D1AD3CBB9005E515F /* UIMessageInputView_Media.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EABD25C1AD3CBB9005E515F /* UIMessageInputView_Media.m */; };
207211
4EACB43F1A2C448F0097ABB3 /* button_file_createFolder_unable@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EACB43C1A2C448F0097ABB3 /* button_file_createFolder_unable@2x.png */; };
208212
4EACB4401A2C448F0097ABB3 /* button_file_download_unable@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EACB43D1A2C448F0097ABB3 /* button_file_download_unable@2x.png */; };
209213
4EACB4411A2C448F0097ABB3 /* button_file_move_unable@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EACB43E1A2C448F0097ABB3 /* button_file_move_unable@2x.png */; };
@@ -530,7 +534,6 @@
530534
8EA6D23819E240C40076D59C /* ProjectTasksView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6D0F419E240C40076D59C /* ProjectTasksView.m */; };
531535
8EA6D23A19E240C40076D59C /* ProjectTopicListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6D0F819E240C40076D59C /* ProjectTopicListView.m */; };
532536
8EA6D23B19E240C40076D59C /* ProjectTopicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6D0FA19E240C40076D59C /* ProjectTopicsView.m */; };
533-
8EA6D25019E240C40076D59C /* UIMessageInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6D12419E240C40076D59C /* UIMessageInputView.m */; };
534537
8EABB20119EE7A85009EB53A /* AddUserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EABB20019EE7A85009EB53A /* AddUserViewController.m */; };
535538
8EABE3C819F10D2400A17784 /* TaskComment.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EABE3C719F10D2400A17784 /* TaskComment.m */; };
536539
8EABE3CB19F1211D00A17784 /* topic.html in Resources */ = {isa = PBXBuildFile; fileRef = 8EABE3C919F1211D00A17784 /* topic.html */; };
@@ -911,6 +914,14 @@
911914
4EA7F1551A6D192B00A046BD /* UIView+WebCacheOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+WebCacheOperation.m"; sourceTree = "<group>"; };
912915
4EA7F1571A6D192B00A046BD /* ODRefreshControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ODRefreshControl.h; sourceTree = "<group>"; };
913916
4EA7F1581A6D192B00A046BD /* ODRefreshControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ODRefreshControl.m; sourceTree = "<group>"; };
917+
4EABD2521AD3CA7E005E515F /* UIMessageInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMessageInputView.h; sourceTree = "<group>"; };
918+
4EABD2531AD3CA7E005E515F /* UIMessageInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMessageInputView.m; sourceTree = "<group>"; };
919+
4EABD2551AD3CAAC005E515F /* UIMessageInputView_Add.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMessageInputView_Add.h; sourceTree = "<group>"; };
920+
4EABD2561AD3CAAC005E515F /* UIMessageInputView_Add.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMessageInputView_Add.m; sourceTree = "<group>"; };
921+
4EABD2581AD3CB4A005E515F /* UIMessageInputView_CCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMessageInputView_CCell.h; sourceTree = "<group>"; };
922+
4EABD2591AD3CB4A005E515F /* UIMessageInputView_CCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMessageInputView_CCell.m; sourceTree = "<group>"; };
923+
4EABD25B1AD3CBB9005E515F /* UIMessageInputView_Media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMessageInputView_Media.h; sourceTree = "<group>"; };
924+
4EABD25C1AD3CBB9005E515F /* UIMessageInputView_Media.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMessageInputView_Media.m; sourceTree = "<group>"; };
914925
4EACB43C1A2C448F0097ABB3 /* button_file_createFolder_unable@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_createFolder_unable@2x.png"; sourceTree = "<group>"; };
915926
4EACB43D1A2C448F0097ABB3 /* button_file_download_unable@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_download_unable@2x.png"; sourceTree = "<group>"; };
916927
4EACB43E1A2C448F0097ABB3 /* button_file_move_unable@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_move_unable@2x.png"; sourceTree = "<group>"; };
@@ -1394,8 +1405,6 @@
13941405
8EA6D0F819E240C40076D59C /* ProjectTopicListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectTopicListView.m; sourceTree = "<group>"; };
13951406
8EA6D0F919E240C40076D59C /* ProjectTopicsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectTopicsView.h; sourceTree = "<group>"; };
13961407
8EA6D0FA19E240C40076D59C /* ProjectTopicsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectTopicsView.m; sourceTree = "<group>"; };
1397-
8EA6D12319E240C40076D59C /* UIMessageInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMessageInputView.h; sourceTree = "<group>"; };
1398-
8EA6D12419E240C40076D59C /* UIMessageInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMessageInputView.m; sourceTree = "<group>"; };
13991408
8EA6D12719E240C40076D59C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
14001409
8EABB1FF19EE7A85009EB53A /* AddUserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddUserViewController.h; sourceTree = "<group>"; };
14011410
8EABB20019EE7A85009EB53A /* AddUserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddUserViewController.m; sourceTree = "<group>"; };
@@ -1899,6 +1908,21 @@
18991908
path = ODRefreshControl;
19001909
sourceTree = "<group>";
19011910
};
1911+
4EABD2511AD3CA7E005E515F /* UIMessageInputView */ = {
1912+
isa = PBXGroup;
1913+
children = (
1914+
4EABD2521AD3CA7E005E515F /* UIMessageInputView.h */,
1915+
4EABD2531AD3CA7E005E515F /* UIMessageInputView.m */,
1916+
4EABD2551AD3CAAC005E515F /* UIMessageInputView_Add.h */,
1917+
4EABD2561AD3CAAC005E515F /* UIMessageInputView_Add.m */,
1918+
4EABD2581AD3CB4A005E515F /* UIMessageInputView_CCell.h */,
1919+
4EABD2591AD3CB4A005E515F /* UIMessageInputView_CCell.m */,
1920+
4EABD25B1AD3CBB9005E515F /* UIMessageInputView_Media.h */,
1921+
4EABD25C1AD3CBB9005E515F /* UIMessageInputView_Media.m */,
1922+
);
1923+
path = UIMessageInputView;
1924+
sourceTree = "<group>";
1925+
};
19021926
4EBB62471A6F526C0045DAEF /* NJKWebViewProgress */ = {
19031927
isa = PBXGroup;
19041928
children = (
@@ -2866,6 +2890,7 @@
28662890
children = (
28672891
8EF6436319FF7E2900F7EEB0 /* Cell */,
28682892
8EF6435419FF7E2900F7EEB0 /* CCell */,
2893+
4EABD2511AD3CA7E005E515F /* UIMessageInputView */,
28692894
8EA6D0ED19E240C40076D59C /* ProjectListView.h */,
28702895
8EA6D0EE19E240C40076D59C /* ProjectListView.m */,
28712896
8EA6D0E519E240C40076D59C /* ProjectActivitiesView.h */,
@@ -2884,8 +2909,6 @@
28842909
8E59F0ED1A00F34E009A905F /* ProjectCodeListView.m */,
28852910
8E59F0EF1A00F38A009A905F /* ProjectFolderListView.h */,
28862911
8E59F0F01A00F38A009A905F /* ProjectFolderListView.m */,
2887-
8EA6D12319E240C40076D59C /* UIMessageInputView.h */,
2888-
8EA6D12419E240C40076D59C /* UIMessageInputView.m */,
28892912
4E2906A01A403B7D008A5B97 /* FileDownloadView.h */,
28902913
4E2906A11A403B7D008A5B97 /* FileDownloadView.m */,
28912914
4E07D30F1A4D1484009EDDF2 /* EaseStartView.h */,
@@ -3491,6 +3514,7 @@
34913514
8EA6D1B219E240C40076D59C /* Depot.m in Sources */,
34923515
4ED6731E1A8DD38C00DF2D1A /* ReportIllegalViewController.m in Sources */,
34933516
8EF643CE19FF7E2900F7EEB0 /* TweetDetailCell.m in Sources */,
3517+
4EABD2571AD3CAAC005E515F /* UIMessageInputView_Add.m in Sources */,
34943518
8E59F0E21A0098BA009A905F /* UIScrollView+SVInfiniteScrolling.m in Sources */,
34953519
4E15C7D01A26D2F000FB8DAD /* FolderToMoveViewController.m in Sources */,
34963520
4EA7F1621A6D192B00A046BD /* UIImage+GIF.m in Sources */,
@@ -3517,6 +3541,7 @@
35173541
8EA6D1B719E240C40076D59C /* PrivateMessage.m in Sources */,
35183542
8EF643BE19FF7E2900F7EEB0 /* ProjectTaskListViewCell.m in Sources */,
35193543
4ECE8AE31A3943E80021E29C /* UIDevice+Info.m in Sources */,
3544+
4EABD25D1AD3CBB9005E515F /* UIMessageInputView_Media.m in Sources */,
35203545
4E6BA2E31A1EE6AF005FD721 /* UIAlertView+AFNetworking.m in Sources */,
35213546
4EA7F15F1A6D192B00A046BD /* SDWebImageManager.m in Sources */,
35223547
8E64ED8519ED0CE3006E99DA /* QBImagePickerThumbnailView.m in Sources */,
@@ -3555,6 +3580,7 @@
35553580
8E97CE481A0A2DF8006F9AD7 /* AGEmojiPageView.m in Sources */,
35563581
4E9113A31A1C426000AC9431 /* ASProgressPopUpView.m in Sources */,
35573582
4ECE8AFE1A3946C10021E29C /* Coding_FileManager.m in Sources */,
3583+
4EABD2541AD3CA7E005E515F /* UIMessageInputView.m in Sources */,
35583584
4ECE8AE51A3943E80021E29C /* UIImageView+Common.m in Sources */,
35593585
8EF643CA19FF7E2900F7EEB0 /* TopicContentCell.m in Sources */,
35603586
4ECE8AE81A3943E80021E29C /* UIView+Common.m in Sources */,
@@ -3593,7 +3619,6 @@
35933619
8EA6D14419E240C40076D59C /* TopicDetailViewController.m in Sources */,
35943620
4EA7F1641A6D192B00A046BD /* UIImageView+HighlightedWebCache.m in Sources */,
35953621
8EA6D23B19E240C40076D59C /* ProjectTopicsView.m in Sources */,
3596-
8EA6D25019E240C40076D59C /* UIMessageInputView.m in Sources */,
35973622
E7A046A01A47279E00528C12 /* Helper.m in Sources */,
35983623
8E64ED8019ED0CE3006E99DA /* QBAssetsCollectionViewController.m in Sources */,
35993624
4E996BD71ABA776500C704F1 /* UserInfoDetailTagCell.m in Sources */,
@@ -3626,6 +3651,7 @@
36263651
4E6C41201A846AC30098DC17 /* RFToolbarButton.m in Sources */,
36273652
4ECE8B011A3946C10021E29C /* ImageSizeManager.m in Sources */,
36283653
8EA6D1B319E240C40076D59C /* File.m in Sources */,
3654+
4EABD25A1AD3CB4A005E515F /* UIMessageInputView_CCell.m in Sources */,
36293655
8EF643C019FF7E2900F7EEB0 /* TaskCommentBlankCell.m in Sources */,
36303656
4E6BA2E11A1EE6AF005FD721 /* AFNetworkActivityIndicatorManager.m in Sources */,
36313657
8EA6D1B619E240C40076D59C /* Login.m in Sources */,
Collapse file

‎Coding_iOS/Controllers/ProjectSetting/ProjectSetting.storyboard‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/ProjectSetting/ProjectSetting.storyboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1514" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="iOS"/>
55
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
Collapse file

‎Coding_iOS/Util/OC_Category/UIView+Common.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Util/OC_Category/UIView+Common.m
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ - (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData ha
471471
imageName = @"blankpage_image_Sleep";
472472
tipStr = @"您还木有项目呢，赶快起来创建吧～";
473473
}
474+
break;
474475
case EaseBlankPageTypeProjectOther:
475476
{
476477
imageName = @"blankpage_image_Sleep";
Collapse file

‎Coding_iOS/Views/ProjectListView.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Views/ProjectListView.m
+8-1Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,14 @@ - (void)sendRequest{
122122
[weakSelf updateFilteredContentForSearchString:weakSelf.searchString];
123123
[weakSelf.myTableView reloadData];
124124
}
125-
[weakSelf configBlankPage:([weakSelf.myProjects.curUser.global_key isEqualToString:[Login curLoginUser].global_key]? EaseBlankPageTypeProject: EaseBlankPageTypeProjectOther) hasData:(weakSelf.myProjects.list.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
125+
EaseBlankPageType blankPageType;
126+
if (weakSelf.myProjects.type < ProjectsTypeTaProject
127+
|| [weakSelf.myProjects.curUser.global_key isEqualToString:[Login curLoginUser].global_key]) {
128+
blankPageType = EaseBlankPageTypeProject;
129+
}else{
130+
blankPageType = EaseBlankPageTypeProjectOther;
131+
}
132+
[weakSelf configBlankPage:blankPageType hasData:(weakSelf.myProjects.list.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
126133
[weakSelf refresh];
127134
}];
128135
}];
Collapse file

‎Coding_iOS/Views/UIMessageInputView.h‎ ‎…/UIMessageInputView/UIMessageInputView.h‎Coding_iOS/Views/UIMessageInputView.h renamed to Coding_iOS/Views/UIMessageInputView/UIMessageInputView.h Coding_iOS/Views/UIMessageInputView.h renamed to Coding_iOS/Views/UIMessageInputView/UIMessageInputView.h

Copy file name to clipboardExpand all lines: Coding_iOS/Views/UIMessageInputView/UIMessageInputView.h
-27Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#import <UIKit/UIKit.h>
1010
#import "AGEmojiKeyBoardView.h"
1111
#import "Projects.h"
12-
#import "YLImageView.h"
1312

1413

1514
typedef NS_ENUM(NSInteger, UIMessageInputViewContentType) {
@@ -52,29 +51,3 @@ typedef NS_ENUM(NSInteger, UIMessageInputViewState) {
5251
- (void)messageInputView:(UIMessageInputView *)inputView addIndexClicked:(NSInteger)index;
5352
- (void)messageInputView:(UIMessageInputView *)inputView heightToBottomChenged:(CGFloat)heightToBottom;
5453
@end
55-
56-
57-
@interface UIMessageInputView_Add : UIView
58-
@property (copy, nonatomic) void(^addIndexBlock)(NSInteger);
59-
@end
60-
61-
typedef NS_ENUM(NSInteger, UIMessageInputView_MediaState) {
62-
UIMessageInputView_MediaStateInit,
63-
UIMessageInputView_MediaStateUploading,
64-
UIMessageInputView_MediaStateUploadSucess,
65-
UIMessageInputView_MediaStateUploadFailed
66-
};
67-
@interface UIMessageInputView_Media : NSObject
68-
@property (strong, nonatomic) ALAsset *curAsset;
69-
@property (strong, nonatomic) NSURL *assetURL;
70-
@property (strong, nonatomic) NSString *urlStr;
71-
@property (assign, nonatomic) UIMessageInputView_MediaState state;
72-
+ (id)mediaWithAsset:(ALAsset *)asset urlStr:(NSString *)urlStr;
73-
@end
74-
75-
#define kCCellIdentifier_UIMessageInputView_CCell @"UIMessageInputView_CCell"
76-
77-
@interface UIMessageInputView_CCell : UICollectionViewCell
78-
@property (copy, nonatomic) void (^deleteBlock)(UIMessageInputView_Media *toDelete);
79-
- (void)setCurMedia:(UIMessageInputView_Media *)curMedia andTotalCount:(NSInteger)totalCount;
80-
@end

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.