Skip to content

Commit bd1b5d5

Browse files
author
zhaohanjun
committed
Merge remote-tracking branch 'Coding/master'
2 parents 3a37999 + 620b14f commit bd1b5d5

File tree

385 files changed

+13544
-1571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+13544
-1571
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ Coding_iOS/Coding_iOS-Prefix.pch
2828
Pods/
2929
.idea/
3030
*.xcbkptlist
31+
32+
npm-debug.log

‎Coding_iOS.xcodeproj/project.pbxproj

+790-143
Large diffs are not rendered by default.

‎Coding_iOS/.DS_Store

4 KB
Binary file not shown.

‎Coding_iOS/AppDelegate.m

+21-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
#define UMSYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
1111
#define _IPHONE80_ 80000
1212

13-
13+
#if DEBUG
14+
#import <FLEX/FLEXManager.h>
15+
#import "RRFPSBar.h"
16+
#endif
1417

1518
#import "AppDelegate.h"
1619
#import "RootTabViewController.h"
@@ -24,6 +27,8 @@
2427
#import "BaseNavigationController.h"
2528
#import "PasswordViewController.h"
2629
#import "IntroductionViewController.h"
30+
#import "TweetSendViewController.h"
31+
2732
#import "FunctionIntroManager.h"
2833
#import <UMengSocial/UMSocial.h>
2934
#import <UMengSocial/UMSocialWechatHandler.h>
@@ -104,6 +109,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
104109
[self completionStartAnimationWithOptions:launchOptions];
105110
}];
106111

112+
#if DEBUG
113+
// [[RRFPSBar sharedInstance] setShowsAverage:YES];
114+
// [[RRFPSBar sharedInstance] setHidden:NO];
115+
#endif
116+
107117
return YES;
108118
}
109119

@@ -256,7 +266,16 @@ - (void)customizeInterface {
256266
- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation{
257267
DebugLog(@"path: %@, params: %@", [url path], [url queryParams]);
258268
if ([url.absoluteString hasPrefix:kCodingAppScheme]) {
259-
if (![self showPasswordWithURL:url]) {//如果不是登录注册的链接，就是用正常的解析模式解析
269+
NSDictionary *queryParams = [url queryParams];
270+
if (queryParams[@"email"] && queryParams[@"key"]) {//重置密码
271+
[self showPasswordWithURL:url];
272+
}else if ([queryParams[@"type"] isEqualToString:@"tweet"]){//发冒泡
273+
if ([Login isLogin]) {
274+
[TweetSendViewController presentWithParams:queryParams];
275+
}else{
276+
[NSObject showHudTipStr:@"未登录"];
277+
}
278+
}else{//一般模式解析网页
260279
[BaseViewController presentLinkStr:url.absoluteString];
261280
}
262281
return YES;

‎Coding_iOS/Coding_iOS-Info.plist

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.3</string>
20+
<string>3.7</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>3.3.20151019190000</string>
39+
<string>3.7.201601141030</string>
4040
<key>LSApplicationQueriesSchemes</key>
4141
<array>
4242
<string>wechat</string>
@@ -70,6 +70,7 @@
7070
<string>mqzoneopensdkapi</string>
7171
<string>mqzoneopensdk</string>
7272
<string>evernote</string>
73+
<string>mart-coding-net</string>
7374
</array>
7475
<key>LSRequiresIPhoneOS</key>
7576
<true/>

‎Coding_iOS/Controllers/AllSearchDisplayVC.h

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//
2+
// AllSearchDisplayVC.h
3+
// Coding_iOS
4+
//
5+
// Created by jwill on 15/11/19.
6+
// Copyright © 2015年 Coding. All rights reserved.
7+
//
8+
9+
typedef NS_ENUM(NSUInteger, eSearchType) {
10+
eSearchType_Project=0,
11+
eSearchType_Task,
12+
eSearchType_Topic,
13+
eSearchType_Tweet,
14+
eSearchType_Document,
15+
eSearchType_User,
16+
eSearchType_Merge,
17+
eSearchType_Pull,
18+
eSearchType_All
19+
};
20+
21+
#import <UIKit/UIKit.h>
22+
23+
@interface AllSearchDisplayVC : UISearchDisplayController
24+
@property (nonatomic,weak)UIViewController *parentVC;
25+
@property (nonatomic,assign)eSearchType curSearchType;
26+
-(void)reloadDisplayData;
27+
@end

0 commit comments

Comments
 (0)