Skip to content

Commit 6b78db4

Browse files
wanghenghengwanghengheng
committed
evernote
1 parent 1b74bbc commit 6b78db4

File tree

13 files changed

+79
-460
lines changed

13 files changed

+79
-460
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@
572572
8BDF9AA61B7456060093BF2C /* HotTopicBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BDF9AA51B7456060093BF2C /* HotTopicBannerView.m */; };
573573
8BDF9AB51B7474990093BF2C /* keyboard_topic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB01B7474990093BF2C /* keyboard_topic@2x.png */; };
574574
8BDF9AB91B7474990093BF2C /* user_info_topic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB41B7474990093BF2C /* user_info_topic@2x.png */; };
575-
8E03D4A219F695FE0092F8C8 /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */; };
576575
8E03D4A419F696970092F8C8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D4A319F696970092F8C8 /* libz.dylib */; };
577576
8E1C3DEA19E7D58A00EF3032 /* AbstractActionSheetPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1C3DDA19E7D58A00EF3032 /* AbstractActionSheetPicker.m */; };
578577
8E1C3DEB19E7D58A00EF3032 /* ActionSheetCustomPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1C3DDC19E7D58A00EF3032 /* ActionSheetCustomPicker.m */; };
@@ -1760,9 +1759,6 @@
17601759
8BDF9AA51B7456060093BF2C /* HotTopicBannerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotTopicBannerView.m; sourceTree = "<group>"; };
17611760
8BDF9AB01B7474990093BF2C /* keyboard_topic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "keyboard_topic@2x.png"; sourceTree = "<group>"; };
17621761
8BDF9AB41B7474990093BF2C /* user_info_topic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "user_info_topic@2x.png"; sourceTree = "<group>"; };
1763-
8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = "<group>"; };
1764-
8E03D4A019F695FE0092F8C8 /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = "<group>"; };
1765-
8E03D4A119F695FE0092F8C8 /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = "<group>"; };
17661762
8E03D4A319F696970092F8C8 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
17671763
8E1C3DD919E7D58A00EF3032 /* AbstractActionSheetPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractActionSheetPicker.h; sourceTree = "<group>"; };
17681764
8E1C3DDA19E7D58A00EF3032 /* AbstractActionSheetPicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AbstractActionSheetPicker.m; sourceTree = "<group>"; };
@@ -2265,7 +2261,6 @@
22652261
8E477014198770E700997D05 /* Foundation.framework in Frameworks */,
22662262
68D9A2AD062641F5BCA573C5 /* libPods.a in Frameworks */,
22672263
4EF818241B09D8D8005F974B /* WebP.framework in Frameworks */,
2268-
8E03D4A219F695FE0092F8C8 /* libMobClickLibrary.a in Frameworks */,
22692264
);
22702265
runOnlyForDeploymentPostprocessing = 0;
22712266
};
@@ -3371,16 +3366,6 @@
33713366
path = AudioView;
33723367
sourceTree = "<group>";
33733368
};
3374-
8E03D49E19F695FE0092F8C8 /* UMENG */ = {
3375-
isa = PBXGroup;
3376-
children = (
3377-
8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */,
3378-
8E03D4A019F695FE0092F8C8 /* MobClick.h */,
3379-
8E03D4A119F695FE0092F8C8 /* MobClickSocialAnalytics.h */,
3380-
);
3381-
path = UMENG;
3382-
sourceTree = "<group>";
3383-
};
33843369
8E1C3DD819E7D58A00EF3032 /* ActionSheetPicker */ = {
33853370
isa = PBXGroup;
33863371
children = (
@@ -4248,7 +4233,6 @@
42484233
8E97CE421A0A2DF8006F9AD7 /* AGEmojiKeyboard */,
42494234
8E59F0DC1A0098BA009A905F /* SVPullToRefresh */,
42504235
8ED0D87119FBA6EA00FBA818 /* NSStringEmojize */,
4251-
8E03D49E19F695FE0092F8C8 /* UMENG */,
42524236
8E64ED8619EE484A006E99DA /* NSDate+Helper */,
42534237
8E64ED6519ED0CE3006E99DA /* QBImagePickerController */,
42544238
8E1C3DD819E7D58A00EF3032 /* ActionSheetPicker */,
@@ -5662,7 +5646,6 @@
56625646
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMENG",
56635647
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
56645648
"$(PROJECT_DIR)/Coding_iOS/Util/Audio/opencore-amr-iOS/lib",
5665-
"$(PROJECT_DIR)/Coding_iOS/Vendor/SinaSSO",
56665649
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMSocial_Sdk_4.2.3_Extra/SinaSSO",
56675650
);
56685651
PRODUCT_BUNDLE_IDENTIFIER = net.coding.CodingForiOS;
@@ -5699,7 +5682,6 @@
56995682
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMENG",
57005683
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
57015684
"$(PROJECT_DIR)/Coding_iOS/Util/Audio/opencore-amr-iOS/lib",
5702-
"$(PROJECT_DIR)/Coding_iOS/Vendor/SinaSSO",
57035685
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMSocial_Sdk_4.2.3_Extra/SinaSSO",
57045686
);
57055687
PRODUCT_BUNDLE_IDENTIFIER = net.coding.CodingForiOS;

‎Coding_iOS/.DS_Store‎

0 Bytes
Binary file not shown.

‎Coding_iOS/AppDelegate.m‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#import <UMengSocial/UMSocial.h>
2929
#import <UMengSocial/UMSocialWechatHandler.h>
3030
#import <UMengSocial/UMSocialQQHandler.h>
31-
#import <UMengSocial/UMSocialSinaHandler.h>
31+
#import <evernote-cloud-sdk-ios/ENSDK/ENSDK.h>
3232
#import "UMSocialSinaSSOHandler.h"
3333

3434
#import "Tweet.h"
@@ -119,17 +119,11 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
119119
[MobClick startWithAppkey:kUmeng_AppKey reportPolicy:BATCH channelId:nil];
120120

121121
// UMENG Social
122-
// [UMSocialData setAppKey:@"507fcab25270157b37000010"];
123-
// [UMSocialWechatHandler setWXAppId:@"wxd930ea5d5a258f4f" appSecret:@"db426a9829e4b49a0dcac7b4162da6b6" url:[NSObject baseURLStr]];
124-
// [UMSocialQQHandler setQQWithAppId:@"100424468" appKey:@"c7394704798a158208a74ab60104f0ba" url:[NSObject baseURLStr]];
125-
// [UMSocialSinaHandler openSSOWithRedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
126-
127122
[UMSocialData setAppKey:kUmeng_AppKey];
128123
[UMSocialWechatHandler setWXAppId:kSocial_WX_ID appSecret:kSocial_WX_Secret url:[NSObject baseURLStr]];
129124
[UMSocialQQHandler setQQWithAppId:kSocial_QQ_ID appKey:kSocial_QQ_Secret url:[NSObject baseURLStr]];
130-
131-
[UMSocialSinaHandler openSSOWithRedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
132-
// [UMSocialSinaSSOHandler openNewSinaSSOWithRedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
125+
[ENSession setSharedSessionConsumerKey:kSocial_EN_Key consumerSecret:kSocial_EN_Secret optionalHost:ENSessionHostSandbox];
126+
[UMSocialSinaSSOHandler openNewSinaSSOWithRedirectURL:kSocial_Sina_RedirectURL];
133127

134128
// 信鸽推送
135129
[XGPush startApp:kXGPush_Id appKey:kXGPush_Key];
@@ -250,6 +244,9 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
250244
[BaseViewController presentLinkStr:url.absoluteString];
251245
}
252246
return YES;
247+
}else if ([url.absoluteString hasPrefix:@"en-:"]){
248+
return [[ENSession sharedSession] handleOpenURL:url];
249+
return NO;
253250
}else{
254251
return [UMSocialSnsService handleOpenURL:url];
255252
}

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
<key>CFBundleURLSchemes</key>
2929
<array>
3030
<string>coding-net</string>
31-
<string>wb126663232</string>
31+
<string>wb600921819</string>
3232
<string>QQ41C16356</string>
3333
<string>wx261aca93a0e9893c</string>
34+
<string>en-</string>
3435
</array>
3536
</dict>
3637
</array>

‎Coding_iOS/Coding_iOS-Prefix.pch.example‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
#define kSocial_WX_Secret @""
6060
#define kSocial_QQ_ID @""
6161
#define kSocial_QQ_Secret @""
62+
#define kSocial_EN_Key @""
63+
#define kSocial_EN_Secret @""
64+
#define kSocial_Sina_RedirectURL @""
6265

6366
//信鸽推送
6467
#define kXGPush_Id 123456

‎Coding_iOS/Util/OC_Category/NSObject+Common.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- (void)showHudTipStr:(NSString *)tipStr;
1717
- (void)showStatusBarQueryStr:(NSString *)tipStr;
1818
- (void)showStatusBarSuccessStr:(NSString *)tipStr;
19+
- (void)showStatusBarErrorStr:(NSString *)errorStr;
1920
- (void)showStatusBarError:(NSError *)error;
2021
- (void)showStatusBarProgress:(CGFloat)progress;
2122
- (void)hideStatusBarProgress;

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,22 @@ - (void)showStatusBarSuccessStr:(NSString *)tipStr{
8080
[JDStatusBarNotification showWithStatus:tipStr dismissAfter:1.0 styleName:JDStatusBarStyleSuccess];
8181
}
8282
}
83-
- (void)showStatusBarError:(NSError *)error{
83+
- (void)showStatusBarErrorStr:(NSString *)errorStr{
8484
if ([JDStatusBarNotification isVisible]) {
8585
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
8686
[JDStatusBarNotification showActivityIndicator:NO indicatorStyle:UIActivityIndicatorViewStyleWhite];
87-
[JDStatusBarNotification showWithStatus:[self tipFromError:error] dismissAfter:1.5 styleName:JDStatusBarStyleError];
87+
[JDStatusBarNotification showWithStatus:errorStr dismissAfter:1.5 styleName:JDStatusBarStyleError];
8888
});
8989
}else{
9090
[JDStatusBarNotification showActivityIndicator:NO indicatorStyle:UIActivityIndicatorViewStyleWhite];
91-
[JDStatusBarNotification showWithStatus:[self tipFromError:error] dismissAfter:1.5 styleName:JDStatusBarStyleError];
91+
[JDStatusBarNotification showWithStatus:errorStr dismissAfter:1.5 styleName:JDStatusBarStyleError];
9292
}
9393
}
94+
95+
- (void)showStatusBarError:(NSError *)error{
96+
NSString *errorStr = [self tipFromError:error];
97+
[self showStatusBarErrorStr:errorStr];
98+
}
9499
- (void)showStatusBarProgress:(CGFloat)progress{
95100
[JDStatusBarNotification showProgress:progress];
96101

0 commit comments

Comments
 (0)