diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 83d1654..f7e91e1 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -506,7 +506,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m"
- timestampString = "457196521.385258"
+ timestampString = "457428062.147497"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1017"
@@ -522,7 +522,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m"
- timestampString = "457196521.385258"
+ timestampString = "457428062.147497"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "987"
@@ -554,11 +554,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m"
- timestampString = "457198162.554138"
+ timestampString = "458009917.116854"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "121"
- endingLineNumber = "121"
+ startingLineNumber = "146"
+ endingLineNumber = "146"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
@@ -582,7 +582,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Ash_AWord/AppDelegate.h b/Ash_AWord/AppDelegate.h
index e33e85d..2c37a18 100644
--- a/Ash_AWord/AppDelegate.h
+++ b/Ash_AWord/AppDelegate.h
@@ -16,6 +16,7 @@
@property (strong, nonatomic) UIWindow *window;
@property (strong, nonatomic) MainViewController* mainViewController;
+
/**
* 当前可视viewController
*/
diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist
index 37a7cd2..3e15e38 100644
--- a/Ash_AWord/Info.plist
+++ b/Ash_AWord/Info.plist
@@ -23,7 +23,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0
+ 2.0.0
CFBundleSignature
????
CFBundleURLTypes
@@ -70,7 +70,7 @@
CFBundleVersion
- 8
+ 10
LSRequiresIPhoneOS
NSLocationWhenInUseUsageDescription
diff --git a/Ash_AWord/Utility/Tool/CommonUtil.m b/Ash_AWord/Utility/Tool/CommonUtil.m
index 1d8de0a..c375cf8 100644
--- a/Ash_AWord/Utility/Tool/CommonUtil.m
+++ b/Ash_AWord/Utility/Tool/CommonUtil.m
@@ -24,8 +24,8 @@
{
NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
- NSString *buildVersion = [infoDictionary objectForKey:@"CFBundleVersion"];
- NSString *version = [NSString stringWithFormat:@"%@.%@",app_Version, buildVersion];
+// NSString *buildVersion = [infoDictionary objectForKey:@"CFBundleVersion"];
+ NSString *version = [NSString stringWithFormat:@"%@",app_Version];
return version;
}
+ (NetworkType)networkType
diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m
index b1488a0..643b4cd 100644
--- a/Ash_AWord/ViewControllers/My/SetUpViewController.m
+++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m
@@ -15,8 +15,11 @@
#import "LoginViewModel.h"
#import "MessageSetViewController.h"
#import "BlackListViewController.h"
+#import "UpdateViewModel.h"
@interface SetUpViewController ()
-
+{
+ BOOL _isNewVersion;
+}
@end
@implementation SetUpViewController
@@ -28,8 +31,29 @@
self.navigationItem.title = @"设置";
_tableView.dataSource = self;
_tableView.delegate = self;
+ _isNewVersion = NO;
+
+ [self checkUpdate];
}
+-(void)checkUpdate
+{
+ PropertyEntity* pro = [UpdateViewModel requireUpdate];
+ [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
+ DLog(@"%@",viewModel);
+ UpdateViewModel* updateViewModel = (UpdateViewModel*)viewModel;
+ if ([updateViewModel success]) {
+ if (updateViewModel.needUpdate==1) {
+ _isNewVersion = YES;
+ }else{
+ _isNewVersion = NO;
+ }
+ }
+ } failedBlock:^(NSError *error) {
+
+ }];
+
+}
#pragma mark UITableViewDelegate
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
@@ -117,12 +141,17 @@
break;
case 2:
{
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
cell.textLabel.text = @"当前版本";
NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
NSString *buildVersion = [infoDictionary objectForKey:@"CFBundleVersion"];
- NSString *version = [NSString stringWithFormat:@"v%@.%@",app_Version, buildVersion];
+ NSString *version = [NSString stringWithFormat:@"v%@(%@)",app_Version, buildVersion];
cell.detailTextLabel.text = version;
+
+ if (!_isNewVersion) {
+ cell.detailTextLabel.text = [NSString stringWithFormat:@"当前已经是最新版%@",version];
+ }
}
break;
case 3: