add RedirectURI param

JimLiu · Jan 4, 2016 · 740a55f · 740a55f
1 parent c1be24a
commit 740a55f
Show file tree

Hide file tree

Showing 34 changed files with 82 additions and 289 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ WeiboSDK
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
 	// ...
-    Weibo *weibo = [[Weibo alloc] initWithAppKey:@"您的AppKey" withAppSecret:@"您的AppSecret"];
+    Weibo *weibo = [[Weibo alloc] initWithAppKey:@"您的AppKey" withAppSecret:@"您的AppSecret" withRedirectURI:@"您的AppSecret RedirectURI"];
     [Weibo setWeibo:weibo];
     // ...
     return YES;

diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/TimelineQuery.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/TimelineQuery.h
diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/User.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/User.h
@@ -30,7 +30,7 @@ typedef enum {
 @property (nonatomic, copy) NSString *province; //用户所在省级
 @property (nonatomic, copy) NSString *city; //用户所在城市
 @property (nonatomic, copy) NSString *location; //用户所在地
-@property (nonatomic, copy) NSString *description; //用户个人描述
+@property (nonatomic, copy) NSString *userDescription; //用户个人描述
 @property (nonatomic, copy) NSString *url; //用户博客地址
 @property (nonatomic, copy) NSString *profileImageUrl; //用户头像地址
 @property (nonatomic, copy) NSString *profileLargeImageUrl; //用户大头像地址

diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/Weibo.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/Weibo.h
@@ -32,13 +32,16 @@ typedef enum {
 
 @interface Weibo : NSObject
 
-- (id)initWithAppKey:(NSString *)appKey withAppSecret:(NSString *)appSecret;
+- (id)initWithAppKey:(NSString *)appKey withAppSecret:(NSString *)appSecret withRedirectURI: (NSString *)redirectURI;
 + (Weibo*)weibo;
+// Used for Swift
++ (Weibo*)getWeibo;
 + (Weibo*)setWeibo:(Weibo*)weibo;
 
 
 @property (nonatomic, copy) NSString *appKey;
 @property (nonatomic, copy) NSString *appSecret;
+@property (nonatomic, copy) NSString *redirectURI;
 
 #pragma mark - Auth
 

diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboAuthentication.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboAuthentication.h
@@ -11,7 +11,7 @@
 @interface WeiboAuthentication : NSObject 
 
 - (id)initWithAuthorizeURL:(NSString *)authorizeURL accessTokenURL:(NSString *)accessTokenURL
-                    AppKey:(NSString *)appKey appSecret:(NSString *)appSecret;
+                    appKey:(NSString *)appKey appSecret:(NSString *)appSecret redirectURI:(NSString *)redirectURI;
 
 @property (nonatomic, copy) NSString *appKey;
 @property (nonatomic, copy) NSString *appSecret;

diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboConfig.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboConfig.h
@@ -8,6 +8,7 @@
 
 #define kAppKey @"3326691039"
 #define kAppSecret @"75dd27596a081b28651d214e246c1b15"
+#define kRedirectURI @"http://api.weibo.com/oauth2/default.html"
 
 #define kWeiboAuthorizeURL          @"https://api.weibo.com/oauth2/authorize"
 #define kWeiboAccessTokenURL        @"https://api.weibo.com/oauth2/access_token"

diff --git a/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboQuery.h b/build/WeiboSDK.framework/Versions/A/DeprecatedHeaders/WeiboQuery.h
diff --git a/build/WeiboSDK.framework/Versions/A/Headers/TimelineQuery.h b/build/WeiboSDK.framework/Versions/A/Headers/TimelineQuery.h
diff --git a/build/WeiboSDK.framework/Versions/A/Headers/User.h b/build/WeiboSDK.framework/Versions/A/Headers/User.h
@@ -30,7 +30,7 @@ typedef enum {
 @property (nonatomic, copy) NSString *province; //用户所在省级
 @property (nonatomic, copy) NSString *city; //用户所在城市
 @property (nonatomic, copy) NSString *location; //用户所在地
-@property (nonatomic, copy) NSString *description; //用户个人描述
+@property (nonatomic, copy) NSString *userDescription; //用户个人描述
 @property (nonatomic, copy) NSString *url; //用户博客地址
 @property (nonatomic, copy) NSString *profileImageUrl; //用户头像地址
 @property (nonatomic, copy) NSString *profileLargeImageUrl; //用户大头像地址

diff --git a/build/WeiboSDK.framework/Versions/A/Headers/Weibo.h b/build/WeiboSDK.framework/Versions/A/Headers/Weibo.h
@@ -32,13 +32,16 @@ typedef enum {
 
 @interface Weibo : NSObject
 
-- (id)initWithAppKey:(NSString *)appKey withAppSecret:(NSString *)appSecret;
+- (id)initWithAppKey:(NSString *)appKey withAppSecret:(NSString *)appSecret withRedirectURI: (NSString *)redirectURI;
 + (Weibo*)weibo;
+// Used for Swift
++ (Weibo*)getWeibo;
 + (Weibo*)setWeibo:(Weibo*)weibo;
 
 
 @property (nonatomic, copy) NSString *appKey;
 @property (nonatomic, copy) NSString *appSecret;
+@property (nonatomic, copy) NSString *redirectURI;
 
 #pragma mark - Auth
 

diff --git a/build/WeiboSDK.framework/Versions/A/Headers/WeiboAuthentication.h b/build/WeiboSDK.framework/Versions/A/Headers/WeiboAuthentication.h
@@ -11,7 +11,7 @@
 @interface WeiboAuthentication : NSObject 
 
 - (id)initWithAuthorizeURL:(NSString *)authorizeURL accessTokenURL:(NSString *)accessTokenURL
-                    AppKey:(NSString *)appKey appSecret:(NSString *)appSecret;
+                    appKey:(NSString *)appKey appSecret:(NSString *)appSecret redirectURI:(NSString *)redirectURI;
 
 @property (nonatomic, copy) NSString *appKey;
 @property (nonatomic, copy) NSString *appSecret;

diff --git a/build/WeiboSDK.framework/Versions/A/Headers/WeiboConfig.h b/build/WeiboSDK.framework/Versions/A/Headers/WeiboConfig.h
@@ -8,6 +8,7 @@
 
 #define kAppKey @"3326691039"
 #define kAppSecret @"75dd27596a081b28651d214e246c1b15"
+#define kRedirectURI @"http://api.weibo.com/oauth2/default.html"
 
 #define kWeiboAuthorizeURL          @"https://api.weibo.com/oauth2/authorize"
 #define kWeiboAccessTokenURL        @"https://api.weibo.com/oauth2/access_token"

diff --git a/build/WeiboSDK.framework/Versions/A/Headers/WeiboQuery.h b/build/WeiboSDK.framework/Versions/A/Headers/WeiboQuery.h
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
@@ -307,7 +307,7 @@
 		1510082917AEACA9006F9275 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = openlab;
 			};
 			buildConfigurationList = 1510082C17AEACA9006F9275 /* Build configuration list for PBXProject "HelloWeiboSample" */;
@@ -424,6 +424,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -479,6 +480,7 @@
 				GCC_PREFIX_HEADER = "HelloWeiboSample/HelloWeiboSample-Prefix.pch";
 				INFOPLIST_FILE = "HelloWeiboSample/HelloWeiboSample-Info.plist";
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.openlab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -495,6 +497,7 @@
 				GCC_PREFIX_HEADER = "HelloWeiboSample/HelloWeiboSample-Prefix.pch";
 				INFOPLIST_FILE = "HelloWeiboSample/HelloWeiboSample-Info.plist";
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.openlab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/samples/HelloWeiboSample/HelloWeiboSample/AppDelegate.m b/samples/HelloWeiboSample/HelloWeiboSample/AppDelegate.m
@@ -12,7 +12,7 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    Weibo *weibo = [[Weibo alloc] initWithAppKey:@"3326691039" withAppSecret:@"75dd27596a081b28651d214e246c1b15"];
+    Weibo *weibo = [[Weibo alloc] initWithAppKey:@"3326691039" withAppSecret:@"75dd27596a081b28651d214e246c1b15" withRedirectURI:@"http://api.weibo.com/oauth2/default.html"];
     [Weibo setWeibo:weibo];
     // Override point for customization after application launch.
 

diff --git a/samples/HelloWeiboSample/HelloWeiboSample/HelloWeiboSample-Info.plist b/samples/HelloWeiboSample/HelloWeiboSample/HelloWeiboSample-Info.plist
@@ -20,7 +20,7 @@
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.openlab.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -49,6 +49,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/samples/HelloWeiboSample/HelloWeiboSample/en.lproj/MainStoryboard_iPhone.storyboard b/samples/HelloWeiboSample/HelloWeiboSample/en.lproj/MainStoryboard_iPhone.storyboard
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="si7-Lv-qIu">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="si7-Lv-qIu">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <scenes>
-        <!--View Controller - Home-->
+        <!--Home-->
         <scene sceneID="ASP-y6-lPn">
             <objects>
                 <tableViewController id="o4H-oO-zWY" customClass="ViewController" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Rvf-Cf-d73">
-                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Rvf-Cf-d73">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="X9V-w1-PEw">
-                                <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="86" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
-                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X9V-w1-PEw" id="VbE-CE-ASD">
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                </view>
+                                </tableViewCellContentView>
                             </tableViewCell>
                         </prototypes>
                     </tableView>
@@ -46,9 +46,4 @@
             <point key="canvasLocation" x="-489" y="30"/>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
+</document>