增加发微博功能

JimLiu · Aug 12, 2013 · 8f6ba1e · 8f6ba1e
1 parent 3992ef8
commit 8f6ba1e
Show file tree

Hide file tree

Showing 21 changed files with 349 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ WeiboSDK
 
 - 在你项目App的target设置, 找到 "Build Phases" 选项并打开 "Link Binary With Libraries":
 - 点击 "+" 按钮，然后点击 "Add Other...", 浏览到WeiboSDK根目录的"build"目录，选择 "WeiboSDK.framework" 并添加到项目中
-- 在你项目设置, 找到 "Build Settings" 选项，找到 "Other Linker Flags" 项，添加 `-ObjC` 值
+- 在你项目设置, 找到 "Build Settings" 选项，找到 "Other Linker Flags" 项，添加值 `-ObjC` 
 
 #### 引用头文件
 
@@ -101,6 +101,34 @@ WeiboSDK
 ```
 
 
+#### 发新微博
+通过Weibo实例中的newStatus方法可以发表微博
+
+不带附件发微博
+```objective-c
+    [weibo newStatus:@"test weibo" pic:nil completed:^(Status *status, NSError *error) {
+        if (error) {
+            NSLog(@"failed to post:%@", error);
+        }
+        else {
+            NSLog(@"success: %lld.%@", status.statusId, status.text);
+        }
+    }];
+```
+
+带附件发微博
+```objective-c
+    NSData *img = UIImagePNGRepresentation([UIImage imageNamed:@"Icon"]);
+    [weibo newStatus:@"test weibo with image" pic:img completed:^(Status *status, NSError *error) {
+        if (error) {
+            NSLog(@"failed to upload:%@", error);
+        }
+        else {
+            StatusImage *statusImage = [status.images objectAtIndex:0];
+            NSLog(@"success: %lld.%@.%@", status.statusId, status.text, statusImage.originalImageUrl);
+        }
+    }];
+```
 
 项目参考代码
 ----------

diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/Weibo.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/Weibo.h
@@ -21,6 +21,7 @@ enum {
 typedef void(^WeiboTimelineQueryCompletedBlock)(NSMutableArray *statuses, NSError *error);
 typedef void(^WeiboUserQueryCompletedBlock)(User *user, NSError *error);
 typedef void(^WeiboUserAuthenticationCompletedBlock)(WeiboAccount *account, NSError *error);
+typedef void(^WeiboNewStatusCompletedBlock)(Status *status, NSError *error);
 
 
 typedef enum {
@@ -76,5 +77,10 @@ typedef enum {
                                completed:(WeiboTimelineQueryCompletedBlock)completedBlock;
 
 
+#pragma mark - Post
+
+- (WeiboRequestOperation *)newStatus:(NSString *)status
+                                 pic:(NSData *)picData
+                           completed:(WeiboNewStatusCompletedBlock)completedBlock;
 
 @end
diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboConfig.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboConfig.h
@@ -12,5 +12,7 @@
 #define kWeiboAuthorizeURL          @"https://api.weibo.com/oauth2/authorize"
 #define kWeiboAccessTokenURL        @"https://api.weibo.com/oauth2/access_token"
 #define kWeiboAPIBaseUrl            @"https://api.weibo.com/2/"
+#define kWeiboUploadAPIBaseUrl            @"https://upload.api.weibo.com/2/"
+
 
 
diff --git a/build/WeiboSDK.framework/Versions/A/Headers/Weibo.h b/build/WeiboSDK.framework/Versions/A/Headers/Weibo.h
@@ -21,6 +21,7 @@ enum {
 typedef void(^WeiboTimelineQueryCompletedBlock)(NSMutableArray *statuses, NSError *error);
 typedef void(^WeiboUserQueryCompletedBlock)(User *user, NSError *error);
 typedef void(^WeiboUserAuthenticationCompletedBlock)(WeiboAccount *account, NSError *error);
+typedef void(^WeiboNewStatusCompletedBlock)(Status *status, NSError *error);
 
 
 typedef enum {
@@ -76,5 +77,10 @@ typedef enum {
                                completed:(WeiboTimelineQueryCompletedBlock)completedBlock;
 
 
+#pragma mark - Post
+
+- (WeiboRequestOperation *)newStatus:(NSString *)status
+                                 pic:(NSData *)picData
+                           completed:(WeiboNewStatusCompletedBlock)completedBlock;
 
 @end
diff --git a/build/WeiboSDK.framework/Versions/A/Headers/WeiboConfig.h b/build/WeiboSDK.framework/Versions/A/Headers/WeiboConfig.h
@@ -12,5 +12,7 @@
 #define kWeiboAuthorizeURL          @"https://api.weibo.com/oauth2/authorize"
 #define kWeiboAccessTokenURL        @"https://api.weibo.com/oauth2/access_token"
 #define kWeiboAPIBaseUrl            @"https://api.weibo.com/2/"
+#define kWeiboUploadAPIBaseUrl            @"https://upload.api.weibo.com/2/"
+
 
 
diff --git a/build/WeiboSDK.framework/Versions/A/WeiboSDK b/build/WeiboSDK.framework/Versions/A/WeiboSDK
diff --git a/samples/HelloWeiboSample/HelloWeiboSample.xcodeproj/project.pbxproj b/samples/HelloWeiboSample/HelloWeiboSample.xcodeproj/project.pbxproj
diff --git a/samples/HelloWeiboSample/HelloWeiboSample/AppDelegate.h b/samples/HelloWeiboSample/HelloWeiboSample/AppDelegate.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <WeiboSDK/WeiboSDK.h>
+#import "Weibo.h"
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 

diff --git a/samples/HelloWeiboSample/HelloWeiboSample/AppDelegate.m b/samples/HelloWeiboSample/HelloWeiboSample/AppDelegate.m
@@ -15,6 +15,32 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     Weibo *weibo = [[Weibo alloc] initWithAppKey:@"3326691039" withAppSecret:@"75dd27596a081b28651d214e246c1b15"];
     [Weibo setWeibo:weibo];
     // Override point for customization after application launch.
+
+    if (weibo.isAuthenticated) {
+        /*
+        [weibo newStatus:@"test weibo" pic:nil completed:^(Status *status, NSError *error) {
+            if (error) {
+                NSLog(@"failed to post:%@", error);
+            }
+            else {
+                NSLog(@"success: %lld.%@", status.statusId, status.text);
+            }
+        }];
+        
+        NSData *img = UIImagePNGRepresentation([UIImage imageNamed:@"Icon"]);
+        [weibo newStatus:@"test weibo with image" pic:img completed:^(Status *status, NSError *error) {
+            if (error) {
+                NSLog(@"failed to upload:%@", error);
+            }
+            else {
+                StatusImage *statusImage = [status.images objectAtIndex:0];
+                NSLog(@"success: %lld.%@.%@", status.statusId, status.text, statusImage.originalImageUrl);
+            }
+        }];
+         */
+    }
+
+
     return YES;
 }
 

diff --git a/samples/HelloWeiboSample/HelloWeiboSample/HelloWeiboSample-Info.plist b/samples/HelloWeiboSample/HelloWeiboSample/HelloWeiboSample-Info.plist
@@ -8,6 +8,17 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>Icon.png</string>
+				<string>Icon@2x.png</string>
+			</array>
+		</dict>
+	</dict>
 	<key>CFBundleIdentifier</key>
 	<string>com.openlab.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git a/samples/HelloWeiboSample/HelloWeiboSample/Icon.png b/samples/HelloWeiboSample/HelloWeiboSample/Icon.png
diff --git a/samples/HelloWeiboSample/HelloWeiboSample/Icon@2x.png b/samples/HelloWeiboSample/HelloWeiboSample/Icon@2x.png
diff --git a/samples/HelloWeiboSample/HelloWeiboSample/ViewController.h b/samples/HelloWeiboSample/HelloWeiboSample/ViewController.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <WeiboSDK/WeiboSDK.h>
+#import "Weibo.h"
 
 @interface ViewController : UITableViewController
 

diff --git a/samples/HelloWeiboSample/Icon.png b/samples/HelloWeiboSample/Icon.png
diff --git a/samples/HelloWeiboSample/Icon@2x.png b/samples/HelloWeiboSample/Icon@2x.png
diff --git a/src/WeiboSDK/Engine/WeiboRequest.m b/src/WeiboSDK/Engine/WeiboRequest.m
@@ -126,7 +126,7 @@ - (WeiboRequestOperation*)getFromPath:(NSString *)apiPath
 - (WeiboRequestOperation*)postToPath:(NSString *)apiPath
                               params:(NSDictionary *)params
                            completed:(WeiboRequestCompletedBlock)completedBlock {
-    NSString * fullURL = [kWeiboAPIBaseUrl stringByAppendingString:apiPath];
+    NSString * fullURL = [apiPath hasSuffix:@"upload.json"] ? [kWeiboUploadAPIBaseUrl stringByAppendingString:apiPath] : [kWeiboAPIBaseUrl stringByAppendingString:apiPath];
     return [self postToUrl:fullURL params:params completed:completedBlock];
 }
 

diff --git a/src/WeiboSDK/Engine/WeiboRequestOperation.m b/src/WeiboSDK/Engine/WeiboRequestOperation.m
@@ -218,6 +218,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)aConnection
         dispatch_async(self.queue, ^
         {
             NSError* error = nil;
+            //NSString *responseString = [[NSString alloc] initWithData:self.responseData encoding:NSUTF8StringEncoding];
             id result = [self parseJsonResponse:self.responseData error:&error];
 
             dispatch_async(dispatch_get_main_queue(), ^
@@ -236,7 +237,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)aConnection
 
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
 {
-
+    //NSString *responseString = [[NSString alloc] initWithData:self.responseData encoding:NSUTF8StringEncoding];
     if (self.completedBlock)
     {
         self.completedBlock(nil, nil, error);

diff --git a/src/WeiboSDK/Utilities/URLRequestHelper.m b/src/WeiboSDK/Utilities/URLRequestHelper.m
@@ -129,9 +129,9 @@ + (NSMutableURLRequest *)getRequestWithUrl:(NSString *)url
 
 + (NSMutableURLRequest *)postRequestWithUrl:(NSString *)url
                                      params:(NSDictionary *)params {
-    NSString* urlString = [self serializeURL:url params:params];
+    NSURL* postURL = [NSURL URLWithString:url];
 
-    NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL: [NSURL URLWithString:urlString] cachePolicy: NSURLRequestReloadIgnoringCacheData timeoutInterval: 30.f];
+    NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:postURL  cachePolicy: NSURLRequestReloadIgnoringCacheData timeoutInterval: 30.f];
     [request setHTTPMethod: @"POST"];
     [request setValue: kUserAgent forHTTPHeaderField: @"User-Agent"];
 
@@ -159,7 +159,7 @@ + (NSMutableURLRequest *)postRequestWithUrl:(NSString *)url
         requestData = [self buildURLEncodedPostBodyWithPostData:postData forRequest:request];
     }
     [request setValue: [NSString stringWithFormat: @"%d", [requestData length]] forHTTPHeaderField: @"Content-Length"];
-
+    [request setHTTPBody:requestData];
     return request;
 }
 

diff --git a/src/WeiboSDK/Weibo.h b/src/WeiboSDK/Weibo.h
@@ -21,6 +21,7 @@ enum {
 typedef void(^WeiboTimelineQueryCompletedBlock)(NSMutableArray *statuses, NSError *error);
 typedef void(^WeiboUserQueryCompletedBlock)(User *user, NSError *error);
 typedef void(^WeiboUserAuthenticationCompletedBlock)(WeiboAccount *account, NSError *error);
+typedef void(^WeiboNewStatusCompletedBlock)(Status *status, NSError *error);
 
 
 typedef enum {
@@ -76,5 +77,10 @@ typedef enum {
                                completed:(WeiboTimelineQueryCompletedBlock)completedBlock;
 
 
+#pragma mark - Post
+
+- (WeiboRequestOperation *)newStatus:(NSString *)status
+                                 pic:(NSData *)picData
+                           completed:(WeiboNewStatusCompletedBlock)completedBlock;
 
 @end
diff --git a/src/WeiboSDK/Weibo.m b/src/WeiboSDK/Weibo.m
@@ -119,7 +119,9 @@ - (WeiboRequestOperation *)queryUserWithPath:(NSString *)path
                                          completedBlock(user, nil);
                                      }
                                      @catch (NSException *exception) {
-                                         completedBlock(nil, [NSError errorWithDomain:WeiboErrorDomain code:kJsonParseUserErrorCode userInfo:@{NSLocalizedDescriptionKey: @"Failed to parse responsed object."}]);
+                                         NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+                                         NSString *msg = [NSString stringWithFormat:@"Failed to parse responsed object. responseString: %@", responseString];
+                                         completedBlock(nil, [NSError errorWithDomain:WeiboErrorDomain code:kJsonParseUserErrorCode userInfo:@{NSLocalizedDescriptionKey: msg}]);
                                      }
                                      @finally {
 
@@ -236,4 +238,55 @@ - (WeiboRequestOperation *)queryTimeline:(StatusTimeline)timeline
 }
 
 
+#pragma mark - Post
+
+
+- (WeiboRequestOperation *)newStatus:(NSString *)status
+                                 pic:(NSData *)picData
+                           completed:(WeiboNewStatusCompletedBlock)completedBlock {
+    NSString *path = picData.length ? @"statuses/upload.json" : @"statuses/update.json";
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [params setObject:status forKey:@"status"];
+    if (picData.length) {
+        [params setObject:picData forKey:@"pic"];
+    }
+    WeiboRequestOperation *operation =
+    [[WeiboRequest shared] postToPath:path
+                               params:params
+                            completed:^(id result, NSData *data, NSError *error) {
+                                 if (error) {
+                                     completedBlock(nil, error);
+                                 }
+                                 else {
+                                     Status *status = nil;
+                                     if ([result isKindOfClass:[NSDictionary class]]) {
+                                         @try {
+                                             status = [[Status alloc] initWithJsonDictionary:result];
+                                         }
+                                         @catch (NSException *exception) {
+                                             NSLog(@"newStatus exception: %@", exception);
+                                         }
+                                         @finally {
+
+                                         }
+                                     }
+                                     if (status) {
+                                         completedBlock(status, nil);
+                                     }
+                                     else {
+                                         NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+                                         NSString *msg = [NSString stringWithFormat:@"Failed to parse responsed object. responseString: %@", responseString];
+
+                                         completedBlock(nil, [NSError errorWithDomain:WeiboErrorDomain code:kJsonParseTimelineErrorCode userInfo:@{NSLocalizedDescriptionKey: msg}]);
+                                     }
+                                 }
+
+
+                             }];
+    return operation;
+
+
+}
+
+
 @end
diff --git a/src/WeiboSDK/WeiboConfig.h b/src/WeiboSDK/WeiboConfig.h
@@ -12,5 +12,7 @@
 #define kWeiboAuthorizeURL          @"https://api.weibo.com/oauth2/authorize"
 #define kWeiboAccessTokenURL        @"https://api.weibo.com/oauth2/access_token"
 #define kWeiboAPIBaseUrl            @"https://api.weibo.com/2/"
+#define kWeiboUploadAPIBaseUrl            @"https://upload.api.weibo.com/2/"
+