结构整理

jangocheng · Mar 7, 2018 · 24386fd · 24386fd
1 parent 240f18d
commit 24386fd
Show file tree

Hide file tree

Showing 99 changed files with 162 additions and 381 deletions.
diff --git a/TLChat.xcodeproj/project.pbxproj b/TLChat.xcodeproj/project.pbxproj
diff --git a/...tViewController/TLAccountViewController.h → ...tViewController/TLAccountViewController.h b/...tViewController/TLAccountViewController.h → ...tViewController/TLAccountViewController.h
diff --git a/...tViewController/TLAccountViewController.m → ...tViewController/TLAccountViewController.m b/...tViewController/TLAccountViewController.m → ...tViewController/TLAccountViewController.m
@@ -20,12 +20,6 @@ typedef NS_ENUM(NSInteger, TLAccountButtonType) {
     TLAccountButtonTypeTest,
 };
 
-@interface TLAccountViewController ()
-
-@property (nonatomic, strong) UIImageView *imageView;
-
-@end
-
 @implementation TLAccountViewController
 
 - (void)loadView {
@@ -41,21 +35,19 @@ - (void)loadView {
             launchImageName = dict[@"UILaunchImageName"];
         }
     }
-    [self.imageView setImage:[UIImage imageNamed:launchImageName]];
-    [self.view addSubview:self.imageView];
-    [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) {
+
+    self.view.addImageView(1).image(TLImage(launchImageName))
+    .masonry(^(MASConstraintMaker *make) {
         make.edges.mas_equalTo(0);
-    }];
+    });
 
     UIButton *(^createButton)(NSString *title, UIColor *bgColor, NSInteger tag) = ^UIButton *(NSString *title, UIColor *bgColor, NSInteger tag) {
-        UIButton *button = [[UIButton alloc] init];
-        [button setTag:tag];
-        [button setTitle:title forState:UIControlStateNormal];
-        [button setBackgroundColor:bgColor];
-        [button.titleLabel setFont:[UIFont systemFontOfSize:19]];
+        UIButton *button = UIButton.zz_create(tag)
+        .backgroundColor(bgColor)
+        .title(title).titleFont([UIFont systemFontOfSize:19])
+        .cornerRadius(5.0f)
+        .view;
         [button addTarget:self action:@selector(buttonClicked:) forControlEvents:UIControlEventTouchUpInside];
-        [button.layer setMasksToBounds:YES];
-        [button.layer setCornerRadius:5.0f];
         return button;
     };
 
@@ -90,7 +82,6 @@ - (void)loadView {
     }];
 }
 
-
 #pragma mark - # Event Response
 - (void)buttonClicked:(UIButton *)sender
 {
@@ -126,16 +117,4 @@ - (void)buttonClicked:(UIButton *)sender
     }
 }
 
-
-#pragma mark - # Getter
-- (UIImageView *)imageView
-{
-    if (!_imageView) {
-        _imageView = [[UIImageView alloc] init];
-    }
-    return _imageView;
-}
-
-
-
 @end
diff --git a/...ginViewController/TLLoginViewController.h → ...ginViewController/TLLoginViewController.h b/...ginViewController/TLLoginViewController.h → ...ginViewController/TLLoginViewController.h
diff --git a/...ginViewController/TLLoginViewController.m → ...ginViewController/TLLoginViewController.m b/...ginViewController/TLLoginViewController.m → ...ginViewController/TLLoginViewController.m
diff --git a/...ViewController/TLRegisterViewController.h → ...ViewController/TLRegisterViewController.h b/...ViewController/TLRegisterViewController.h → ...ViewController/TLRegisterViewController.h
diff --git a/...ViewController/TLRegisterViewController.m → ...ViewController/TLRegisterViewController.m b/...ViewController/TLRegisterViewController.m → ...ViewController/TLRegisterViewController.m
diff --git a/TLChat/Modules/Common/TLImageBrowser/TLImageBrowserController.h b/TLChat/Modules/Common/TLImageBrowser/TLImageBrowserController.h
diff --git a/TLChat/Modules/Common/TLImageBrowser/TLImageBrowserController.m b/TLChat/Modules/Common/TLImageBrowser/TLImageBrowserController.m
diff --git a/TLChat/Modules/Common/TLImagePicker/TLImagePickerController.h b/TLChat/Modules/Common/TLImagePicker/TLImagePickerController.h
diff --git a/TLChat/Modules/Common/TLImagePicker/TLImagePickerController.m b/TLChat/Modules/Common/TLImagePicker/TLImagePickerController.m
diff --git a/...nav_menu_addfriend.imageset/Contents.json → ...nav_menu_addfriend.imageset/Contents.json b/...nav_menu_addfriend.imageset/Contents.json → ...nav_menu_addfriend.imageset/Contents.json
diff --git a/...riend.imageset/[email protected] → ...riend.imageset/[email protected] b/...riend.imageset/[email protected] → ...riend.imageset/[email protected]
diff --git a/...riend.imageset/[email protected] → ...riend.imageset/[email protected] b/...riend.imageset/[email protected] → ...riend.imageset/[email protected]
diff --git a/...nav_menu_audiocall.imageset/Contents.json → ...nav_menu_audiocall.imageset/Contents.json b/...nav_menu_audiocall.imageset/Contents.json → ...nav_menu_audiocall.imageset/Contents.json
diff --git a/...ll.imageset/[email protected] → ...ll.imageset/[email protected] b/...ll.imageset/[email protected] → ...ll.imageset/[email protected]
diff --git a/...ts/nav_menu_bottle.imageset/Contents.json → ...ts/nav_menu_bottle.imageset/Contents.json b/...ts/nav_menu_bottle.imageset/Contents.json → ...ts/nav_menu_bottle.imageset/Contents.json
diff --git a/...ottle.imageset/[email protected] → ...ottle.imageset/[email protected] b/...ottle.imageset/[email protected] → ...ottle.imageset/[email protected]
diff --git a/...av_menu_facefriend.imageset/Contents.json → ...av_menu_facefriend.imageset/Contents.json b/...av_menu_facefriend.imageset/Contents.json → ...av_menu_facefriend.imageset/Contents.json
diff --git a/...d.imageset/[email protected] → ...d.imageset/[email protected] b/...d.imageset/[email protected] → ...d.imageset/[email protected]
diff --git a/...nav_menu_favourite.imageset/Contents.json → ...nav_menu_favourite.imageset/Contents.json b/...nav_menu_favourite.imageset/Contents.json → ...nav_menu_favourite.imageset/Contents.json
diff --git a/...te.imageset/[email protected] → ...te.imageset/[email protected] b/...te.imageset/[email protected] → ...te.imageset/[email protected]
diff --git a/...sets/nav_menu_game.imageset/Contents.json → ...sets/nav_menu_game.imageset/Contents.json b/...sets/nav_menu_game.imageset/Contents.json → ...sets/nav_menu_game.imageset/Contents.json
diff --git a/...nu_game.imageset/[email protected] → ...nu_game.imageset/[email protected] b/...nu_game.imageset/[email protected] → ...nu_game.imageset/[email protected]
diff --git a/...nav_menu_groupchat.imageset/Contents.json → ...nav_menu_groupchat.imageset/Contents.json b/...nav_menu_groupchat.imageset/Contents.json → ...nav_menu_groupchat.imageset/Contents.json
diff --git a/...t.imageset/[email protected] → ...t.imageset/[email protected] b/...t.imageset/[email protected] → ...t.imageset/[email protected]
diff --git a/...t.imageset/[email protected] → ...t.imageset/[email protected] b/...t.imageset/[email protected] → ...t.imageset/[email protected]
diff --git a/..._menu_groupmessage.imageset/Contents.json → ..._menu_groupmessage.imageset/Contents.json b/..._menu_groupmessage.imageset/Contents.json → ..._menu_groupmessage.imageset/Contents.json
diff --git a/...imageset/[email protected] → ...imageset/[email protected] b/...imageset/[email protected] → ...imageset/[email protected]
diff --git a/...ts/nav_menu_moment.imageset/Contents.json → ...ts/nav_menu_moment.imageset/Contents.json b/...ts/nav_menu_moment.imageset/Contents.json → ...ts/nav_menu_moment.imageset/Contents.json
diff --git a/...oment.imageset/[email protected] → ...oment.imageset/[email protected] b/...oment.imageset/[email protected] → ...oment.imageset/[email protected]
diff --git a/...s/nav_menu_myablum.imageset/Contents.json → ...s/nav_menu_myablum.imageset/Contents.json b/...s/nav_menu_myablum.imageset/Contents.json → ...s/nav_menu_myablum.imageset/Contents.json
diff --git a/...blum.imageset/[email protected] → ...blum.imageset/[email protected] b/...blum.imageset/[email protected] → ...blum.imageset/[email protected]
diff --git a/...ts/nav_menu_mycard.imageset/Contents.json → ...ts/nav_menu_mycard.imageset/Contents.json b/...ts/nav_menu_mycard.imageset/Contents.json → ...ts/nav_menu_mycard.imageset/Contents.json
diff --git a/...ycard.imageset/[email protected] → ...ycard.imageset/[email protected] b/...ycard.imageset/[email protected] → ...ycard.imageset/[email protected]
diff --git a/.../nav_menu_myqrcode.imageset/Contents.json → .../nav_menu_myqrcode.imageset/Contents.json b/.../nav_menu_myqrcode.imageset/Contents.json → .../nav_menu_myqrcode.imageset/Contents.json
diff --git a/...ode.imageset/[email protected] → ...ode.imageset/[email protected] b/...ode.imageset/[email protected] → ...ode.imageset/[email protected]
diff --git a/...ts/nav_menu_nearby.imageset/Contents.json → ...ts/nav_menu_nearby.imageset/Contents.json b/...ts/nav_menu_nearby.imageset/Contents.json → ...ts/nav_menu_nearby.imageset/Contents.json
diff --git a/...earby.imageset/[email protected] → ...earby.imageset/[email protected] b/...earby.imageset/[email protected] → ...earby.imageset/[email protected]
diff --git a/...ets/nav_menu_photo.imageset/Contents.json → ...ets/nav_menu_photo.imageset/Contents.json b/...ets/nav_menu_photo.imageset/Contents.json → ...ets/nav_menu_photo.imageset/Contents.json
diff --git a/..._photo.imageset/[email protected] → ..._photo.imageset/[email protected] b/..._photo.imageset/[email protected] → ..._photo.imageset/[email protected]
diff --git a/...ets/nav_menu_radar.imageset/Contents.json → ...ets/nav_menu_radar.imageset/Contents.json b/...ets/nav_menu_radar.imageset/Contents.json → ...ets/nav_menu_radar.imageset/Contents.json
diff --git a/..._radar.imageset/[email protected] → ..._radar.imageset/[email protected] b/..._radar.imageset/[email protected] → ..._radar.imageset/[email protected]
diff --git a/...sets/nav_menu_scan.imageset/Contents.json → ...sets/nav_menu_scan.imageset/Contents.json b/...sets/nav_menu_scan.imageset/Contents.json → ...sets/nav_menu_scan.imageset/Contents.json
diff --git a/...nu_scan.imageset/[email protected] → ...nu_scan.imageset/[email protected] b/...nu_scan.imageset/[email protected] → ...nu_scan.imageset/[email protected]
diff --git a/...nu_scan.imageset/[email protected] → ...nu_scan.imageset/[email protected] b/...nu_scan.imageset/[email protected] → ...nu_scan.imageset/[email protected]
diff --git a/...ets/nav_menu_shake.imageset/Contents.json → ...ets/nav_menu_shake.imageset/Contents.json b/...ets/nav_menu_shake.imageset/Contents.json → ...ets/nav_menu_shake.imageset/Contents.json
diff --git a/..._shake.imageset/[email protected] → ..._shake.imageset/[email protected] b/..._shake.imageset/[email protected] → ..._shake.imageset/[email protected]
diff --git a/...s/nav_menu_sticker.imageset/Contents.json → ...s/nav_menu_sticker.imageset/Contents.json b/...s/nav_menu_sticker.imageset/Contents.json → ...s/nav_menu_sticker.imageset/Contents.json
diff --git a/...cker.imageset/[email protected] → ...cker.imageset/[email protected] b/...cker.imageset/[email protected] → ...cker.imageset/[email protected]
diff --git a/...sets/nav_menu_voip.imageset/Contents.json → ...sets/nav_menu_voip.imageset/Contents.json b/...sets/nav_menu_voip.imageset/Contents.json → ...sets/nav_menu_voip.imageset/Contents.json
diff --git a/...nu_voip.imageset/[email protected] → ...nu_voip.imageset/[email protected] b/...nu_voip.imageset/[email protected] → ...nu_voip.imageset/[email protected]
diff --git a/...ts/nav_menu_wallet.imageset/Contents.json → ...ts/nav_menu_wallet.imageset/Contents.json b/...ts/nav_menu_wallet.imageset/Contents.json → ...ts/nav_menu_wallet.imageset/Contents.json
diff --git a/...llet.imageset/[email protected] → ...llet.imageset/[email protected] b/...llet.imageset/[email protected] → ...llet.imageset/[email protected]
diff --git a/...llet.imageset/[email protected] → ...llet.imageset/[email protected] b/...llet.imageset/[email protected] → ...llet.imageset/[email protected]
diff --git a/...nav_menu_wechatout.imageset/Contents.json → ...nav_menu_wechatout.imageset/Contents.json b/...nav_menu_wechatout.imageset/Contents.json → ...nav_menu_wechatout.imageset/Contents.json
diff --git a/...ut.imageset/[email protected] → ...ut.imageset/[email protected] b/...ut.imageset/[email protected] → ...ut.imageset/[email protected]
diff --git a/...ut.imageset/[email protected] → ...ut.imageset/[email protected] b/...ut.imageset/[email protected] → ...ut.imageset/[email protected]
diff --git a/.../Conversation/AddMenuView/TLAddMenuCell.h → ...wController/TLAddMenuView/TLAddMenuCell.h b/.../Conversation/AddMenuView/TLAddMenuCell.h → ...wController/TLAddMenuView/TLAddMenuCell.h
diff --git a/.../Conversation/AddMenuView/TLAddMenuCell.m → ...wController/TLAddMenuView/TLAddMenuCell.m b/.../Conversation/AddMenuView/TLAddMenuCell.m → ...wController/TLAddMenuView/TLAddMenuCell.m
diff --git a/.../Conversation/AddMenuView/TLAddMenuItem.h → ...wController/TLAddMenuView/TLAddMenuItem.h b/.../Conversation/AddMenuView/TLAddMenuItem.h → ...wController/TLAddMenuView/TLAddMenuItem.h
diff --git a/.../Conversation/AddMenuView/TLAddMenuItem.m → ...wController/TLAddMenuView/TLAddMenuItem.m b/.../Conversation/AddMenuView/TLAddMenuItem.m → ...wController/TLAddMenuView/TLAddMenuItem.m
diff --git a/.../Conversation/AddMenuView/TLAddMenuView.h → ...wController/TLAddMenuView/TLAddMenuView.h b/.../Conversation/AddMenuView/TLAddMenuView.h → ...wController/TLAddMenuView/TLAddMenuView.h
diff --git a/.../Conversation/AddMenuView/TLAddMenuView.m → ...wController/TLAddMenuView/TLAddMenuView.m b/.../Conversation/AddMenuView/TLAddMenuView.m → ...wController/TLAddMenuView/TLAddMenuView.m
diff --git a/...odules/Conversation/TLConversationAngel.h → ...ationViewController/TLConversationAngel.h b/...odules/Conversation/TLConversationAngel.h → ...ationViewController/TLConversationAngel.h
diff --git a/...odules/Conversation/TLConversationAngel.m → ...ationViewController/TLConversationAngel.m b/...odules/Conversation/TLConversationAngel.m → ...ationViewController/TLConversationAngel.m
diff --git a/...nversation/TLConversationViewController.h → ...Controller/TLConversationViewController.h b/...nversation/TLConversationViewController.h → ...Controller/TLConversationViewController.h
diff --git a/...nversation/TLConversationViewController.m → ...Controller/TLConversationViewController.m b/...nversation/TLConversationViewController.m → ...Controller/TLConversationViewController.m
diff --git a/...on/ConversationViews/TLConversationCell.h → ...ViewController/Views/TLConversationCell.h b/...on/ConversationViews/TLConversationCell.h → ...ViewController/Views/TLConversationCell.h
diff --git a/...on/ConversationViews/TLConversationCell.m → ...ViewController/Views/TLConversationCell.m b/...on/ConversationViews/TLConversationCell.m → ...ViewController/Views/TLConversationCell.m
diff --git a/...nversationViews/TLConversationNoNetCell.h → ...ontroller/Views/TLConversationNoNetCell.h b/...nversationViews/TLConversationNoNetCell.h → ...ontroller/Views/TLConversationNoNetCell.h
diff --git a/...nversationViews/TLConversationNoNetCell.m → ...ontroller/Views/TLConversationNoNetCell.m b/...nversationViews/TLConversationNoNetCell.m → ...ontroller/Views/TLConversationNoNetCell.m
diff --git a/...deViewController/TLQRCodeViewController.h → ...deViewController/TLQRCodeViewController.h b/...deViewController/TLQRCodeViewController.h → ...deViewController/TLQRCodeViewController.h
diff --git a/...deViewController/TLQRCodeViewController.m → ...deViewController/TLQRCodeViewController.m b/...deViewController/TLQRCodeViewController.m → ...deViewController/TLQRCodeViewController.m
diff --git a/TLChat/Modules/Moments/Resources/TestData/Moments.json b/TLChat/Modules/Moments/Resources/TestData/Moments.json
@@ -109,7 +109,7 @@
          "user" : { "userID" : "1002", "nikeName" : "陈美嘉", "avatarURL" : "http://i04.pic.sogou.com/d44a3766422d4930"},
         "date" : "1520168008",
          "detail" : {
-            "images" : ["http://p2.gexing.com/G1/M00/0C/3A/rBACE1MBs8_QSeZpAAChVX3kQcI875.jpg"],
+            "images" : ["http://imgbdb2.bendibao.com/beijing/20137/30/2013730154430304.jpg"],
          },
          "extension" : {
              "likedFriends" : [

diff --git a/...eCarouselView/TLPictureCarouselProtocol.h → ...eCarouselView/TLPictureCarouselProtocol.h b/...eCarouselView/TLPictureCarouselProtocol.h → ...eCarouselView/TLPictureCarouselProtocol.h
diff --git a/...ctureCarouselView/TLPictureCarouselView.h → ...ctureCarouselView/TLPictureCarouselView.h b/...ctureCarouselView/TLPictureCarouselView.h → ...ctureCarouselView/TLPictureCarouselView.h
diff --git a/...ctureCarouselView/TLPictureCarouselView.m → ...ctureCarouselView/TLPictureCarouselView.m b/...ctureCarouselView/TLPictureCarouselView.m → ...ctureCarouselView/TLPictureCarouselView.m
diff --git a/...eCarouselView/TLPictureCarouselViewCell.h → ...eCarouselView/TLPictureCarouselViewCell.h b/...eCarouselView/TLPictureCarouselViewCell.h → ...eCarouselView/TLPictureCarouselViewCell.h
diff --git a/...eCarouselView/TLPictureCarouselViewCell.m → ...eCarouselView/TLPictureCarouselViewCell.m b/...eCarouselView/TLPictureCarouselViewCell.m → ...eCarouselView/TLPictureCarouselViewCell.m
diff --git a/...n/Resoueces/Common.xcassets/Contents.json → ...UIUtilities/Common.xcassets/Contents.json b/...n/Resoueces/Common.xcassets/Contents.json → ...UIUtilities/Common.xcassets/Contents.json
diff --git a/...fault_company_head.imageset/Contents.json → ...fault_company_head.imageset/Contents.json b/...fault_company_head.imageset/Contents.json → ...fault_company_head.imageset/Contents.json
diff --git a/...y_head.imageset/[email protected] → ...y_head.imageset/[email protected] b/...y_head.imageset/[email protected] → ...y_head.imageset/[email protected]
diff --git a/...ssets/default_head.imageset/Contents.json → ...ssets/default_head.imageset/Contents.json b/...ssets/default_head.imageset/Contents.json → ...ssets/default_head.imageset/Contents.json
diff --git a/.../default_head.imageset/[email protected] → .../default_head.imageset/[email protected] b/.../default_head.imageset/[email protected] → .../default_head.imageset/[email protected]
diff --git a/....xcassets/nav_back.imageset/Contents.json → ....xcassets/nav_back.imageset/Contents.json b/....xcassets/nav_back.imageset/Contents.json → ....xcassets/nav_back.imageset/Contents.json
diff --git a/.../nav_back.imageset/barbuttonicon_back.png → .../nav_back.imageset/barbuttonicon_back.png b/.../nav_back.imageset/barbuttonicon_back.png → .../nav_back.imageset/barbuttonicon_back.png
diff --git a/...v_back.imageset/[email protected] → ...v_back.imageset/[email protected] b/...v_back.imageset/[email protected] → ...v_back.imageset/[email protected]
diff --git a/...v_back.imageset/[email protected] → ...v_back.imageset/[email protected] b/...v_back.imageset/[email protected] → ...v_back.imageset/[email protected]
diff --git a/....xcassets/nav_more.imageset/Contents.json → ....xcassets/nav_more.imageset/Contents.json b/....xcassets/nav_more.imageset/Contents.json → ....xcassets/nav_more.imageset/Contents.json
diff --git a/.../nav_more.imageset/barbuttonicon_more.png → .../nav_more.imageset/barbuttonicon_more.png b/.../nav_more.imageset/barbuttonicon_more.png → .../nav_more.imageset/barbuttonicon_more.png
diff --git a/...v_more.imageset/[email protected] → ...v_more.imageset/[email protected] b/...v_more.imageset/[email protected] → ...v_more.imageset/[email protected]
diff --git a/...v_more.imageset/[email protected] → ...v_more.imageset/[email protected] b/...v_more.imageset/[email protected] → ...v_more.imageset/[email protected]
diff --git a/...assets/right_arrow.imageset/Contents.json → ...assets/right_arrow.imageset/Contents.json b/...assets/right_arrow.imageset/Contents.json → ...assets/right_arrow.imageset/Contents.json
diff --git a/...sets/right_arrow.imageset/right_arrow.png → ...sets/right_arrow.imageset/right_arrow.png b/...sets/right_arrow.imageset/right_arrow.png → ...sets/right_arrow.imageset/right_arrow.png
diff --git a/...ts/searchBar_voice.imageset/Contents.json → ...ts/searchBar_voice.imageset/Contents.json b/...ts/searchBar_voice.imageset/Contents.json → ...ts/searchBar_voice.imageset/Contents.json
diff --git a/...voice.imageset/[email protected] → ...voice.imageset/[email protected] b/...voice.imageset/[email protected] → ...voice.imageset/[email protected]
diff --git a/...searchBar_voice_HL.imageset/Contents.json → ...searchBar_voice_HL.imageset/Contents.json b/...searchBar_voice_HL.imageset/Contents.json → ...searchBar_voice_HL.imageset/Contents.json
diff --git a/..._HL.imageset/[email protected] → ..._HL.imageset/[email protected] b/..._HL.imageset/[email protected] → ..._HL.imageset/[email protected]