Merge pull request #7 from MC-Studio/develop

Develop
BinaryParadise · Nov 6, 2017 · 72a87c5 · 72a87c5
2 parents df8db27 + 8b78031
commit 72a87c5
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 258 deletions.
diff --git a/Example/MCJSONKit.xcodeproj/project.pbxproj b/Example/MCJSONKit.xcodeproj/project.pbxproj
@@ -33,7 +33,6 @@
 		C599F3DE1FAD93CF00D19382 /* WeiboModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C599F3C01FAD902D00D19382 /* WeiboModel.m */; };
 		C599F3DF1FAD93D300D19382 /* StatuseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C599F3C31FAD902D00D19382 /* StatuseModel.m */; };
 		C599F3E01FAD93D800D19382 /* WeiboViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C599F3D01FAD90A900D19382 /* WeiboViewModel.m */; };
-		C599F3E61FAD9E6C00D19382 /* UIViewExt.m in Sources */ = {isa = PBXBuildFile; fileRef = C599F3E51FAD9E6C00D19382 /* UIViewExt.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -91,8 +90,6 @@
 		C599F3D11FAD90A900D19382 /* WeiboViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeiboViewModel.h; sourceTree = "<group>"; };
 		C599F3D31FAD923B00D19382 /* HomeTimelineController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTimelineController.m; sourceTree = "<group>"; };
 		C599F3D41FAD923B00D19382 /* HomeTimelineController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeTimelineController.h; sourceTree = "<group>"; };
-		C599F3E41FAD9E6B00D19382 /* UIViewExt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIViewExt.h; sourceTree = "<group>"; };
-		C599F3E51FAD9E6C00D19382 /* UIViewExt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIViewExt.m; sourceTree = "<group>"; };
 		D5B912EE3065C14B8A80CAB6 /* Pods_MCJSONKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MCJSONKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F1AEBAA5FD906C82235EAAE5 /* Pods_MCJSONKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MCJSONKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F6BB5D2C14E6D372E0B9ECCD /* Pods-MCJSONKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MCJSONKit_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MCJSONKit_Tests/Pods-MCJSONKit_Tests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -256,8 +253,6 @@
 		C599F3CD1FAD902D00D19382 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				C599F3E41FAD9E6B00D19382 /* UIViewExt.h */,
-				C599F3E51FAD9E6C00D19382 /* UIViewExt.m */,
 				C599F3BD1FAD902D00D19382 /* WeiboRequest.h */,
 				C599F3C51FAD902D00D19382 /* WeiboRequest.m */,
 				C599F3C71FAD902D00D19382 /* LoadingView.h */,
@@ -338,7 +333,7 @@
 			attributes = {
 				CLASSPREFIX = MC;
 				LastUpgradeCheck = 0720;
-				ORGANIZATIONNAME = mylcode;
+				ORGANIZATIONNAME = "MC-Studio";
 				TargetAttributes = {
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
@@ -415,6 +410,7 @@
 				"${BUILT_PRODUCTS_DIR}/DACircularProgress/DACircularProgress.framework",
 				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MCJSONKit/MCJSONKit.framework",
+				"${BUILT_PRODUCTS_DIR}/MCUIKit/MCUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MWPhotoBrowser/MWPhotoBrowser.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
@@ -424,6 +420,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DACircularProgress.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MCJSONKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MCUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MWPhotoBrowser.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
@@ -515,7 +512,6 @@
 				C599F3DB1FAD93C600D19382 /* WeiboContentCell.m in Sources */,
 				C599F3E01FAD93D800D19382 /* WeiboViewModel.m in Sources */,
 				C599F3D51FAD929700D19382 /* HomeTimelineController.m in Sources */,
-				C599F3E61FAD9E6C00D19382 /* UIViewExt.m in Sources */,
 				C599F3DC1FAD93CA00D19382 /* UserModel.m in Sources */,
 				C599F3DD1FAD93CD00D19382 /* WBUser.m in Sources */,
 				C599F3DF1FAD93D300D19382 /* StatuseModel.m in Sources */,

diff --git a/Example/MCJSONKit/Classes/Views/LoadingView.h b/Example/MCJSONKit/Classes/Views/LoadingView.h
@@ -7,12 +7,12 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "UIViewExt.h"
+#import "MCView.h"
 
 /**
  加载试图
  */
-@interface LoadingView : UIView
+@interface LoadingView : MCView
 
 /**
  当前进度

diff --git a/Example/MCJSONKit/Classes/Views/UIViewExt.h b/Example/MCJSONKit/Classes/Views/UIViewExt.h
diff --git a/Example/MCJSONKit/Classes/Views/UIViewExt.m b/Example/MCJSONKit/Classes/Views/UIViewExt.m
diff --git a/Example/MCJSONKit/Classes/Views/WeiboContentCell.h b/Example/MCJSONKit/Classes/Views/WeiboContentCell.h
@@ -2,13 +2,15 @@
 //  WeiboContentCell.h
 //  iOSExample
 //
-//  Created by maintoco on 16/12/21.
-//  Copyright © 2016年 maintoco. All rights reserved.
+//  Created by mylcode on 16/12/21.
+//  Copyright © 2016年 MC-Studio. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
-#import "UIViewExt.h"
+#import "MCView.h"
 #import "StatuseModel.h"
+#import "UIImageView+WebCache.h"
+#import "MBProgressHUD.h"
 
 #define kInsets 12.0    //距离屏幕间距
 

diff --git a/Example/MCJSONKit/Classes/Views/WeiboContentCell.m b/Example/MCJSONKit/Classes/Views/WeiboContentCell.m
@@ -110,7 +110,6 @@ - (void)initView {
     _lblContent = [[UILabel alloc] initWithFrame:CGRectMake(kInsets, _headImageView.bottom+kInsets, ScreenWidth-kInsets*2, 0)];
     _lblContent.font = [UIFont systemFontOfSize:16];
     _lblContent.numberOfLines = 5;
-    _lblContent.lineBreakMode = NSLineBreakByCharWrapping;
     [self.contentView addSubview:_lblContent];
 
     _lblReposts = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth/3, 30)];
@@ -179,8 +178,8 @@ + (CGFloat)getCellHeithWithObject:(StatuseModel *)statuse {
     CGFloat cellHeight = kInsets+40+kInsets+kInsets+0.5+30+0.5;
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
-    CGFloat contentHeight = [statuse.text boundingRectWithSize:CGSizeMake(ScreenWidth-kInsets, MAXFLOAT) options:NSStringDrawingUsesFontLeading|NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16],NSParagraphStyleAttributeName:paragraphStyle} context:nil].size.height;
-    return cellHeight+contentHeight;
+    CGFloat contentHeight = [statuse.text boundingRectWithSize:CGSizeMake(ScreenWidth-kInsets*2, MAXFLOAT) options:NSStringDrawingUsesFontLeading|NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16],NSParagraphStyleAttributeName:paragraphStyle} context:nil].size.height;
+    return cellHeight+MIN(contentHeight, 100);
 }
 
 @end
diff --git a/Example/MCJSONKit/MCAppDelegate.m b/Example/MCJSONKit/MCAppDelegate.m
@@ -62,4 +62,9 @@ - (void)didReceiveWeiboResponse:(WBBaseResponse *)response {
     }
 }
 
+- (void)didReceiveWeiboRequest:(WBBaseRequest *)request {
+
+}
+
+
 @end
diff --git a/Example/MCJSONKit/MCJSONKit-Info.plist b/Example/MCJSONKit/MCJSONKit-Info.plist
@@ -38,6 +38,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/Example/Podfile b/Example/Podfile
@@ -5,6 +5,7 @@ target 'MCJSONKit_Example' do
   pod 'MWPhotoBrowser'
   pod 'Weibo_SDK'
   pod 'MJExtension'
+  pod 'MCUIKit'
 
   target 'MCJSONKit_Tests' do
     inherit! :search_paths