企业版代码合并至个人版 - 已合并除 images 之外的资源

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -30,6 +30,7 @@
 #import "TweetSendViewController.h"
 #import "ProjectToChooseListViewController.h"
 #import "OTPListViewController.h"
+#import "WikiEditViewController.h"
 
 #import "FunctionIntroManager.h"
 #import <evernote-cloud-sdk-ios/ENSDK/ENSDK.h>
@@ -66,11 +67,19 @@ - (void)registerUserAgent{
     NSString *userAgent = [NSString userAgentStr];
     NSDictionary *dictionary = @{@"UserAgent" : userAgent};//User-Agent
     [[NSUserDefaults standardUserDefaults] registerDefaults:dictionary];
+    
+    
+//    @available(iOS 10.0, *);
+    
+//    [UIColor colorNamed:@""]
 }
 
 #pragma lifeCycle
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
+    if (kTarget_Enterprise) {//这是很早之前为测试弄的吧
+        [NSObject preCookieHandle];//cookie 设置
+    }
+
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     // Override point for customization after application launch.
     self.window.backgroundColor = [UIColor whiteColor];
@@ -98,12 +107,16 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [self.window makeKeyAndVisible];
     [FunctionIntroManager showIntroPage];
 
-    EaseStartView *startView = [EaseStartView new];
-    @weakify(self);
-    [startView startAnimationWithCompletionBlock:^(EaseStartView *easeStartView) {
-        @strongify(self);
+    if (kTarget_Enterprise) {
         [self completionStartAnimationWithOptions:launchOptions];
-    }];
+    }else{
+        EaseStartView *startView = [EaseStartView new];
+        @weakify(self);
+        [startView startAnimationWithCompletionBlock:^(EaseStartView *easeStartView) {
+            @strongify(self);
+            [self completionStartAnimationWithOptions:launchOptions];
+        }];
+    }
 
 #if DEBUG
 //    [[RRFPSBar sharedInstance] setShowsAverage:YES];
@@ -124,14 +137,16 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
     UMConfigInstance.appKey = kUmeng_AppKey;
     [MobClick startWithConfigure:UMConfigInstance];
 
-    //UMSocialManager 第三方登录
-    [[UMSocialManager defaultManager] openLog:YES];
-    [UMSocialGlobal shareInstance].isUsingHttpsWhenShareContent = NO;
-    [[UMSocialManager defaultManager] setUmSocialAppkey:kUmeng_AppKey];
-    [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:kSocial_WX_ID appSecret:kSocial_WX_Secret redirectURL:nil];
-    [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_QQ appKey:kSocial_QQ_ID  appSecret:kSocial_QQ_Secret redirectURL:nil];
-    [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_Sina appKey:kSocial_Sina_ID  appSecret:kSocial_Sina_Secret redirectURL:kSocial_Sina_RedirectURL];
-    [ENSession setSharedSessionConsumerKey:kSocial_EN_Key consumerSecret:kSocial_EN_Secret optionalHost:nil];
+    if (!kTarget_Enterprise) {
+        //UMSocialManager & 第三方登录
+        [[UMSocialManager defaultManager] openLog:YES];
+        [UMSocialGlobal shareInstance].isUsingHttpsWhenShareContent = NO;
+        [[UMSocialManager defaultManager] setUmSocialAppkey:kUmeng_AppKey];
+        [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:kSocial_WX_ID appSecret:kSocial_WX_Secret redirectURL:nil];
+        [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_QQ appKey:kSocial_QQ_ID  appSecret:kSocial_QQ_Secret redirectURL:nil];
+        [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_Sina appKey:kSocial_Sina_ID  appSecret:kSocial_Sina_Secret redirectURL:kSocial_Sina_RedirectURL];
+        [ENSession setSharedSessionConsumerKey:kSocial_EN_Key consumerSecret:kSocial_EN_Secret optionalHost:nil];
+    }
 
     //    信鸽推送
     [XGPush startApp:kXGPush_Id appKey:kXGPush_Key];
@@ -157,6 +172,9 @@ - (void)applicationWillResignActive:(UIApplication *)application
 {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
     // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    if ([[BaseViewController presentingVC] isKindOfClass:[WikiEditViewController class]]) {
+        [(WikiEditViewController *)[BaseViewController presentingVC] saveWikiDraft];
+    }
     [[ImageSizeManager shareManager] save];
     [[Tweet tweetForSend] saveSendData];
 }
@@ -187,7 +205,7 @@ - (void)applicationDidBecomeActive:(UIApplication *)application
 #pragma clang diagnostic pop
         }
     }
-    //    Coding 报告
+    //    CODING 报告
     [[EADeviceToServerLog shareManager] tryToStart];
 }
 
@@ -197,6 +215,9 @@ - (void)applicationWillTerminate:(UIApplication *)application
     [self saveContext];
 }
 
+#ifndef Target_Enterprise
+
+// Universal Links - 个人版支持的东西
 #pragma mark Universal Links
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray * __nullable restorableObjects))restorationHandler{
@@ -212,6 +233,7 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
     return YES;
 }
 
+#endif
 
 #pragma mark - XGPush Message
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
@@ -238,14 +260,29 @@ - (void)application:(UIApplication *)application didRegisterUserNotificationSett
 
 #pragma mark - Methods Private
 - (void)setupLoginViewController{
+#ifdef Target_Enterprise
+    
+    IntroductionViewController *introductionVC = [[IntroductionViewController alloc] init];
+    [self.window setRootViewController:introductionVC];
+    [introductionVC presentLoginUI];
+
+#else
+    
     LoginViewController *loginVC = [[LoginViewController alloc] init];
     [self.window setRootViewController:[[UINavigationController alloc] initWithRootViewController:loginVC]];
+    
+#endif
 }
 
 - (void)setupIntroductionViewController{
-    [self setupLoginViewController];//猥琐换
-//    IntroductionViewController *introductionVC = [[IntroductionViewController alloc] init];
-//    [self.window setRootViewController:introductionVC];
+    if (kTarget_Enterprise) {
+        IntroductionViewController *introductionVC = [[IntroductionViewController alloc] init];
+        [self.window setRootViewController:introductionVC];
+    }else{
+        [self setupLoginViewController];//猥琐换
+//        IntroductionViewController *introductionVC = [[IntroductionViewController alloc] init];
+//        [self.window setRootViewController:introductionVC];
+    }
 }
 
 - (void)setupTabViewController{
@@ -256,6 +293,15 @@ - (void)setupTabViewController{
 }
 
 - (void)customizeInterface {
+    {//UIBarButtonItem 颜色&字体
+        NSDictionary *textAttributes = @{
+                                         NSFontAttributeName: [UIFont systemFontOfSize:kBackButtonFontSize],
+                                         NSForegroundColorAttributeName: kColorLightBlue,
+                                         };
+        [[UIBarButtonItem appearance] setTitleTextAttributes:textAttributes forState:UIControlStateNormal];
+        [[UIBarButtonItem appearance] setTitleTextAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:kBackButtonFontSize]} forState:UIControlStateDisabled];
+        [[UIBarButtonItem appearance] setTitleTextAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:kBackButtonFontSize]} forState:UIControlStateHighlighted];
+    }
     //设置Nav的背景色和title色
     UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
     [navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[NSObject baseURLStrIsProduction]? kColorNavBG: kColorActionYellow] forBarMetrics:UIBarMetricsDefault];
@@ -457,7 +503,7 @@ - (void)application:(UIApplication *)application performActionForShortcutItem:(U
         if (![presentingVC isKindOfClass:[LoginViewController class]]) {
             LoginViewController *vc = [[LoginViewController alloc] init];
             vc.showDismissButton = YES;
-            UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:vc];
+            UINavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:vc];
             [presentingVC presentViewController:nav animated:YES completion:nil];
         }
     }else{

Coding_iOS/.DS_Store

@@ -113,7 +113,7 @@
 	<key>UIFileSharingEnabled</key>
 	<false/>
 	<key>UILaunchStoryboardName</key>
-	<string>Launch Screen</string>
+	<string>Launch Screen_E</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

Coding_iOS/AppDelegate.m

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

Coding_iOS/CodingEnterprise_iOS-Info.plist

@@ -15,5 +15,6 @@
 @property (strong, nonatomic) NSMutableDictionary *requestParams;
 @property (strong, nonatomic) NSString *contentStr;
 @property (strong, nonatomic) Project *curProject;
+@property (assign, nonatomic) BOOL isLineNote;//这个字段单纯是为友盟统计的，没啥特别的作用
 
 @end

Coding_iOS/CodingEnterprise_iOS.entitlements

@@ -174,7 +174,8 @@ - (void)previewLoadMDData{
 - (void)saveBtnClicked{
     _contentStr = [_contentStr aliasedString];
     [_requestParams setObject:_contentStr forKey:@"content"];
-    
+    _requestParams[@"isLineNote"] = @(_isLineNote);
+
     [NSObject showHUDQueryStr:@"正在保存..."];
     [[Coding_NetAPIManager sharedManager] request_PostCommentWithPath:_requestPath params:_requestParams andBlock:^(id data, NSError *error) {
         [NSObject hideHUDQuery];

Coding_iOS/Controllers/AddMDCommentViewController.h

@@ -14,6 +14,7 @@ typedef NS_ENUM(NSInteger, AddUserType) {
     AddUserTypeProjectRoot = 0,
     AddUserTypeProjectFollows,//我的关注
     AddUserTypeProjectFans,//我的粉丝
+    AddUserTypeProjectCompany,//企业成员
     AddUserTypeFollow//添加好友
 };
 @interface AddUserViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate>

Coding_iOS/Controllers/AddMDCommentViewController.m

@@ -30,7 +30,8 @@ - (void)viewDidLoad {
     if (self.type < AddUserTypeFollow) {
         self.title = (self.type == AddUserTypeProjectRoot? @"添加成员":
                       self.type == AddUserTypeProjectFollows? @"我的关注":
-                      @"我的粉丝");
+                      self.type == AddUserTypeProjectFans? @"我的粉丝":
+                      @"企业成员");
         _queryingArray = [NSMutableArray array];
         _searchedArray = [NSMutableArray array];
     }else if (self.type == AddUserTypeFollow){
@@ -62,10 +63,13 @@ - (void)viewDidLoad {
         searchBar;
     });
     _myTableView.tableHeaderView = _mySearchBar;
-    if (self.type == AddUserTypeProjectFollows || self.type == AddUserTypeProjectFans) {
+    if (self.type == AddUserTypeProjectFollows || self.type == AddUserTypeProjectFans || self.type == AddUserTypeProjectCompany) {
         _myRefreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
         [_myRefreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
-        _curUsers = [Users usersWithOwner:[Login curLoginUser] Type:self.type == AddUserTypeProjectFollows? UsersTypeFriends_Attentive: UsersTypeFollowers];
+        UsersType userType = (self.type == AddUserTypeProjectFollows? UsersTypeFriends_Attentive:
+                              self.type == AddUserTypeProjectFans? UsersTypeFollowers:
+                              UsersType_CompanyMember);
+        _curUsers = [Users usersWithOwner:[Login curLoginUser] Type:userType];
         [self refresh];
     }
 }
@@ -134,7 +138,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSIntege
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
-    if (_type == AddUserTypeFollow) {
+    if (_type == AddUserTypeFollow || kTarget_Enterprise) {
         return [UIView new];
     }else{
         NSInteger leftNum = _curProject.max_member.integerValue - _addedArray.count;
@@ -216,9 +220,15 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 }
 
 - (void)goToUserInfo:(User *)user{
-    UserInfoViewController *vc = [[UserInfoViewController alloc] init];
-    vc.curUser = user;
-    [self.navigationController pushViewController:vc animated:YES];
+    if (kTarget_Enterprise) {
+        UserInfoDetailViewController *vc = [UserInfoDetailViewController new];
+        vc.curUser = user;
+        [self.navigationController pushViewController:vc animated:YES];
+    }else{
+        UserInfoViewController *vc = [[UserInfoViewController alloc] init];
+        vc.curUser = user;
+        [self.navigationController pushViewController:vc animated:YES];
+    }
 }
 
 #pragma mark ScrollView Delegate

Coding_iOS/Controllers/AddUserViewController.h

@@ -105,7 +105,12 @@ - (void)doSomethingWithResponse:(id)data andError:(NSError *)error{
 - (void)refreshCodeViewData{
     if ([_myCodeFile.file.mode isEqualToString:@"image"]) {
 //        NSURL *imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, [NSString handelRef:_myCodeFile.ref path:_myCodeFile.file.path]]];
-        NSURL *imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, _myCodeFile.ref, _myCodeFile.file.path]];
+        NSURL *imageUrl;
+        if (kTarget_Enterprise) {//企业版不需要 owner_user_name
+            imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.name, _myCodeFile.ref, _myCodeFile.file.path]];
+        }else{
+            imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, _myCodeFile.ref, _myCodeFile.file.path]];
+        }
         DebugLog(@"imageUrl: %@", imageUrl);
         [self.webContentView loadRequest:[NSURLRequest requestWithURL:imageUrl]];
     }else if ([@[@"file", @"sym_link", @"executable"] containsObject:_myCodeFile.file.mode]){
@@ -118,7 +123,12 @@ - (void)refreshCodeViewData{
 - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType{
     DebugLog(@"strLink=[%@]",request.URL.absoluteString);
     if ([_myCodeFile.file.mode isEqualToString:@"image"]) {
-        NSString *imageStr = [NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, _myCodeFile.ref, _myCodeFile.file.path];
+        NSString *imageStr;
+        if (kTarget_Enterprise) {
+            imageStr = [NSString stringWithFormat:@"%@p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.name, _myCodeFile.ref, _myCodeFile.file.path];
+        }else{
+            imageStr = [NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, _myCodeFile.ref, _myCodeFile.file.path];
+        }
         if ([imageStr isEqualToString:request.URL.absoluteString]) {
             return YES;
         }