CAPU-ENG · goodman-capu · Sep 30, 2016 · Sep 30, 2016 · Sep 30, 2016 · Sep 30, 2016
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,6 @@ Thumbs.db
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 # Pods/
+
+Resources/
+
diff --git a/CAPUBBS TodayExtension/Info.plist b/CAPUBBS TodayExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.2</string>
+	<string>3.6.6</string>
 	<key>CFBundleVersion</key>
-	<string>3620</string>
+	<string>3661</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/CAPUBBS TodayExtension/TodayViewController.m b/CAPUBBS TodayExtension/TodayViewController.m
@@ -126,16 +126,16 @@ - (void)_refreshView {
     });
 }
 
-- (void)_refreshUserInfoWithBlock:(void (^)())block {
-    void(^failBlock)() = ^() {
+- (void)_refreshUserInfoWithBlock:(void (^)(void))block {
+    void(^failBlock)(void) = ^() {
         dispatch_main_async_safe(^{
             [_imageIcon setImage:PLACEHOLDER];
             [_labelName setText:@"未登录"];
             [_buttonMessages setTitle:@"点击打开app" forState:UIControlStateNormal];
             userInfo = nil;
         });
     };
-    void(^updateInfoBlock)() = ^() {
+    void(^updateInfoBlock)(void) = ^() {
         int newMessageNum = [userInfo[@"newmsg"] intValue];
         NSString *newMessageTitle = [NSString stringWithFormat:@"您有 %d 条新消息", newMessageNum];
         dispatch_main_async_safe(^{
@@ -173,7 +173,7 @@ - (void)_refreshUserInfoWithBlock:(void (^)())block {
     }];
 }
 
-- (void)_refreshHotPostWithBlock:(void (^)())block {
+- (void)_refreshHotPostWithBlock:(void (^)(void))block {
     hotPosts = HOTPOSTS;
     if (hotPosts.count > 0) {
         dispatch_main_async_safe(^{

diff --git a/CAPUBBS.xcodeproj/project.pbxproj b/CAPUBBS.xcodeproj/project.pbxproj
diff --git a/CAPUBBS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CAPUBBS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/CAPUBBS/AppDelegate.m b/CAPUBBS/AppDelegate.m
@@ -101,7 +101,7 @@ - (void)showAlert:(NSNotification *)noti {
     [[[UIAlertView alloc] initWithTitle:dict[@"title"] message:dict[@"message"] delegate:nil cancelButtonTitle:(dict[@"cancelTitle"] ? : @"好") otherButtonTitles:nil, nil] show];
 }
 
-- (BOOL)application:(nonnull UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray * __nullable))restorationHandler {
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
     NSString *identifier = userActivity.userInfo[@"kCSSearchableItemActivityIdentifier"];
     NSArray *info = [identifier componentsSeparatedByString:@"\n"];
     NSDictionary *dict;
@@ -365,6 +365,7 @@ - (void)transport {
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {
+    [[AFNetworkReachabilityManager sharedManager] stopMonitoring];
     // 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.
 }
@@ -386,6 +387,7 @@ - (void)applicationDidBecomeActive:(UIApplication *)application {
         [self _loginAsync:YES];
     }
     [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"wakeLogin"];
+    [[AFNetworkReachabilityManager sharedManager] startMonitoring];
 
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }

diff --git a/CAPUBBS/Base.lproj/Main.storyboard b/CAPUBBS/Base.lproj/Main.storyboard
diff --git a/CAPUBBS/CAPUBBS-Info.plist b/CAPUBBS/CAPUBBS-Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>zh_CN</string>
 	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>CAPUBBS</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.2</string>
+	<string>3.6.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3620</string>
+	<string>3661</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/CAPUBBS/CollectionViewController.m b/CAPUBBS/CollectionViewController.m
@@ -71,10 +71,10 @@ - (void)viewDidAppear:(BOOL)animated {
         [self.searchController setActive:YES];
     }
 
-    if (![[DEFAULTS objectForKey:@"FeatureCollection3.2"] boolValue]) {
-        [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"在帖子里添加/删除个人收藏\n点右上角以管理个人收藏\niOS 9及更高可以在系统中搜索收藏" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
-        [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeatureCollection3.2"];
-    }
+//    if (![[DEFAULTS objectForKey:@"FeatureCollection3.2"] boolValue]) {
+//        [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"在帖子里添加/删除个人收藏\n点右上角以管理个人收藏\niOS 9及更高可以在系统中搜索收藏" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
+//        [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeatureCollection3.2"];
+//    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated {

diff --git a/CAPUBBS/ComposeViewController.m b/CAPUBBS/ComposeViewController.m
@@ -71,7 +71,7 @@ - (void)viewDidAppear:(BOOL)animated {
     //        [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeatureText2.1"];
     //    }
     if (![[DEFAULTS objectForKey:@"FeaturePreview2.2"] boolValue]) {
-        [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"发帖前可以预览，所见即所得\n向左滑动或者点击右上方▶︎前往" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
+        [[[UIAlertView alloc] initWithTitle:@"Tips" message:@"发帖前可以预览，所见即所得\n向左滑动或者点击右上方▶︎前往" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
         [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeaturePreview2.2"];
     }
 

diff --git a/CAPUBBS/Images.xcassets/AppIcon.appiconset/Contents.json b/CAPUBBS/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -101,6 +101,12 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "marketing.png",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/CAPUBBS/Images.xcassets/AppIcon.appiconset/marketing.png b/CAPUBBS/Images.xcassets/AppIcon.appiconset/marketing.png
diff --git a/CAPUBBS/ListViewController.m b/CAPUBBS/ListViewController.m
@@ -58,7 +58,7 @@ - (void)viewDidAppear:(BOOL)animated {
         //        }
     }else {
         if (![[DEFAULTS objectForKey:@"FeatureViewOnline3.0"] boolValue]) {
-            [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"可以查看在线用户和签到统计\n点击右上方墨镜前往" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
+            [[[UIAlertView alloc] initWithTitle:@"Tips" message:@"可以查看在线用户和签到统计\n点击右上方墨镜前往" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
             [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeatureViewOnline3.0"];
         }
     }

diff --git a/CAPUBBS/LzlViewController.m b/CAPUBBS/LzlViewController.m
@@ -40,10 +40,10 @@ - (void)viewWillAppear:(BOOL)animated {
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
-    //    if (![[DEFAULTS objectForKey:@"Featurelzl1.3"] boolValue]) {
-    //        [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"长按某层楼中楼可以快捷回复" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
-    //        [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"Featurelzl1.3"];
-    //    }
+    if (![[DEFAULTS objectForKey:@"Featurelzl1.3"] boolValue]) {
+        [[[UIAlertView alloc] initWithTitle:@"Tips" message:@"长按某层楼中楼可以快捷回复" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
+        [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"Featurelzl1.3"];
+    }
     activity = [[NSUserActivity alloc] initWithActivityType:[BUNDLE_IDENTIFIER stringByAppendingString:@".lzl"]];
     activity.webpageURL = self.URL;
     [activity becomeCurrent];

diff --git a/CAPUBBS/PreviewViewController.m b/CAPUBBS/PreviewViewController.m
@@ -93,10 +93,8 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
     }
 }
 
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation{
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
     [self.webView loadHTMLString:self.textBody baseURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/bbs/content/index.php", CHEXIE]]];
 }
 
-
-
 @end
diff --git a/CAPUBBS/SettingViewController.m b/CAPUBBS/SettingViewController.m
@@ -156,7 +156,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     if (indexPath.section == 1) {
         if (indexPath.row == 0) {
-            [[[UIAlertView alloc] initWithTitle:@"确认清除软件缓存？" message:@"这将清除部分缓存和临时文件\n不会清除头像缓存" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil] show];
+            [[[UIAlertView alloc] initWithTitle:@"确认清除软件缓存？" message:@"这将清除缓存和临时文件\n不会清除头像缓存\n部分系统缓存无法彻底清除" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil] show];
         }
         if (indexPath.row == 1) {
             [[[UIAlertView alloc] initWithTitle:@"确认清除头像缓存？" message:@"建议仅在头像出错时使用" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil] show];

diff --git a/CAPUBBS/UserViewController.m b/CAPUBBS/UserViewController.m
@@ -79,10 +79,10 @@ - (void)viewDidLoad {
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     if ([self.ID isEqualToString:UID]) {
-        if (![[DEFAULTS objectForKey:@"FeatureEditUser3.0"] boolValue]) {
-            [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"可以编辑个人信息\n点击右上方铅笔前往" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
-            [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeatureEditUser3.0"];
-        }
+//        if (![[DEFAULTS objectForKey:@"FeatureEditUser3.0"] boolValue]) {
+//            [[[UIAlertView alloc] initWithTitle:@"新功能！" message:@"可以编辑个人信息\n点击右上方铅笔前往" delegate:nil cancelButtonTitle:@"我知道了" otherButtonTitles:nil, nil] show];
+//            [DEFAULTS setObject:[NSNumber numberWithBool:YES] forKey:@"FeatureEditUser3.0"];
+//        }
     }
 }
 

diff --git a/CAPUBBS/WebViewController.m b/CAPUBBS/WebViewController.m
@@ -34,8 +34,11 @@ - (void)viewDidLoad {
         NSMutableDictionary *cookieProperties = [NSMutableDictionary dictionary]; // 设置cookie保留登录状态
         [cookieProperties setObject:@"token" forKey:NSHTTPCookieName];
         [cookieProperties setObject:TOKEN forKey:NSHTTPCookieValue];
-        [cookieProperties setObject:CHEXIE forKey:NSHTTPCookieDomain];
         [cookieProperties setObject:@"/" forKey:NSHTTPCookiePath];
+        NSString *domain = CHEXIE;
+        domain = [domain stringByReplacingOccurrencesOfString:@"https?://" withString:@"" options:NSRegularExpressionSearch range:NSMakeRange(0, domain.length)];
+        domain = [domain stringByReplacingOccurrencesOfString:@":[0-9]{1,5}$" withString:@"" options:NSRegularExpressionSearch range:NSMakeRange(0, domain.length)];
+        [cookieProperties setObject:domain forKey:NSHTTPCookieDomain];
         NSHTTPCookie *cookie = [NSHTTPCookie cookieWithProperties:cookieProperties];
         [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
     }

diff --git a/CAPUBBS/更新说明 b/CAPUBBS/更新说明
@@ -16,14 +16,14 @@ CAPUBBS iOS客户端包含功能：
 
 审核信息：
 
-"分享到QQ、微信”，指的是，例如，在点击查看贴子中的图片时，用户可以分享该图片文件，并且是在用户设备安装了QQ、微信app的前提下。
+Users have to agree with EULA (shown to the user when they open the app for the first time) to use the app.
+若要使用软件，用户必须同意EULA，EULA会在第一次打开软件时显示，如果拒绝EULA则无法开始使用软件。
 
-用户认为是违规内容的帖子/用户/私信均可举报，具体举报方法：
-帖子：在相应帖子界面，点击底部Action键，选择“举报”。
-用户/私信：在用户信息界面，（如果是举报私信内容，则先返回或点击右上方“(i)”键进入对方的用户信息），拉至表格底部，选择“举报该用户”。
-举报内容可以在邮件中详细说明，我们有一个团队随时处理用户的举报，对核实内容可以做删帖、删除聊天内容、封禁/删除用户等处理，并且可以通过admin账号发送私信告知双方处理结果。
+We don't force users to register. Users can read posts (except in the working board) without registering. When users register, they're not forced to submit any private information like gender (They can select "保密", which means "Confidential").
+本软件不强制要求用户注册，未注册用户可以正常浏览非工作区的所有帖子，并且正常使用搜索等功能，注册用户也不必填写隐私信息例如性别，可以选择“保密”代之。
 
-若要使用软件，用户必须同意EULA，EULA会在第一次打开软件时显示，如果拒绝EULA则无法开始使用软件。本软件不强制要求用户注册，未注册用户可以正常浏览非工作区的所有帖子，并且正常使用搜索等功能。
+User can report posts/users if they think the content is inappropriate. We have a special team to deal with the reports in time.
+用户认为是违规内容的帖子/用户/私信均可举报，举报内容可以在邮件中详细说明，我们有一个团队随时处理用户的举报，对核实内容可以做删帖、删除聊天内容、封禁/删除用户等处理，并且可以通过admin账号发送私信告知双方处理结果。
 
 1.2.1
 1、适配iPhone 6/iPhone 6 Plus
@@ -273,5 +273,26 @@ For A Better CAPU!
 
 3.6.2
 -恢复http访问兼容性
+-支持IPV6 Only网络
 
-关于目前暂时无法通过域名访问论坛的解决方法：进入主页，点击下方"欢迎来到北大车协论坛"，在弹出的文本框中输入"http://162.105.69.21"，即可正常访问
+关于目前暂时无法通过"www.chexie.net"域名访问论坛的解决方法：进入主页，点击下方"欢迎来到北大车协论坛"，在弹出的文本框中输入"http://162.105.69.21"，即可正常访问
+
+3.6.3
+-恢复http访问兼容性
+-支持IPV6 Only网络
+-小错误修复
+
+关于目前暂时无法通过"www.chexie.net"域名访问论坛的解决方法：进入主页，点击下方"欢迎来到北大车协论坛"，在弹出的文本框中输入"http://162.105.69.21"，即可正常访问
+
+3.6.4
+- 适配iOS 11系统
+- 适配iPhone 8/8 plus机型
+- 小错误修复
+
+3.6.5
+- 适配 iOS 11.4 系统
+- 适配 iPhone X
+
+3.6.6
+- 适配 iOS 12.1 系统
+- 适配 iPhone XS, iPhone XS Max, 2018款 iPad Pro
diff --git a/Common Files/ActionPerformer.h b/Common Files/ActionPerformer.h
@@ -6,7 +6,8 @@
 //  Copyright (c) 2014年 熊典. All rights reserved.
 //
 
-#import "Reachability.h"
+#import <Foundation/Foundation.h>
+#import "AFNetworking.h"
 
 typedef void (^ActionPerformerResultBlock)(NSArray* result, NSError* err);
 

diff --git a/Common Files/ActionPerformer.m b/Common Files/ActionPerformer.m
@@ -7,7 +7,6 @@
 //
 
 #import "ActionPerformer.h"
-#import "AFNetworking.h"
 #import <CommonCrypto/CommonCrypto.h> // MD5
 #import "sys/utsname.h" // 设备型号
 #import "CommonDefinitions.h"
@@ -17,7 +16,6 @@ @implementation ActionPerformer
 #pragma mark Web Request
 
 - (void)performActionWithDictionary:(NSDictionary *)dict toURL:(NSString*)url withBlock:(ActionPerformerResultBlock)block {
-
     NSString *postUrl = [NSString stringWithFormat:@"%@/api/client.php?ask=%@",CHEXIE, url];
 
     NSMutableDictionary *requestDictionary = [[NSMutableDictionary alloc] init];

diff --git a/Common Files/CommonDefinitions.h b/Common Files/CommonDefinitions.h
@@ -9,12 +9,12 @@
 #ifndef CommonDefinitions_h
 #define CommonDefinitions_h
 
-//#define DEFAULT_SERVER_URL @"https://www.chexie.net"
-#define DEFAULT_SERVER_URL @"http://162.105.69.21" // 临时IP
+#define DEFAULT_SERVER_URL @"https://www.chexie.net"
+//#define DEFAULT_SERVER_URL @"http://capu.fanzhikang.cn" // 临时域名
 #define APP_GROUP_IDENTIFIER @"group.net.chexie.capubbs"
 
 #define REPORT_EMAIL @[@"[email protected]"]
-#define FEEDBACK_EMAIL @[@"goodman.capu@qq.com", @"[email protected]"]
+#define FEEDBACK_EMAIL @[@"goodman.capu@gmail.com", @"[email protected]"]
 #define COPYRIGHT @"Copyright®  2001 - 2017\nPowered by：CAPU ver 3.0"
 #define EULA @"本论坛作为北京大学自行车协会内部以及自行车爱好者之间交流平台，不欢迎任何商业广告和无关话题。发言者对自己发表的任何言论、信息负责。"
 
@@ -43,7 +43,7 @@
 #define QUESTIONMARK [UIImage imageNamed:@"questionmark"]
 #define IOS [[[UIDevice currentDevice] systemVersion] floatValue]
 #define BUNDLE_IDENTIFIER [[NSBundle mainBundle] bundleIdentifier]
-#define IS_CELLULAR ([[Reachability reachabilityForLocalWiFi] currentReachabilityStatus] == NotReachable && [[Reachability reachabilityForInternetConnection] currentReachabilityStatus] != NotReachable)
+#define IS_CELLULAR (![[AFNetworkReachabilityManager sharedManager] isReachableViaWWAN] && [[AFNetworkReachabilityManager sharedManager] isReachable])
 
 #define MAX_ID_NUM 10
 #define MAX_HOT_NUM 40

diff --git a/Common Files/Reachability.h b/Common Files/Reachability.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,3 +38,6 @@ Thumbs.db @@
     # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
     #
     # Pods/
+    Resources/