Merge remote-tracking branch 'origin/master'

Lighting/Class/AboutViewController.h

@@ -10,4 +10,9 @@
 
 @interface AboutViewController : BaseViewController
 
+
+
+@property (weak, nonatomic) IBOutlet UILabel *versionLabe;
+
+
 @end

Lighting/Class/AboutViewController.m

@@ -17,8 +17,20 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.versionLabe.layer.masksToBounds = YES;
+    self.versionLabe.layer.cornerRadius = 10;
+    self.versionLabe.layer.borderWidth = 2;
+    self.versionLabe.layer.borderColor = kMainBlueColor.CGColor;
+    self.versionLabe.textAlignment = NSTextAlignmentCenter;
+    self.versionLabe.text = [self getAppVersion];
+
 }
 
+
+
+
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -34,4 +46,13 @@
 }
 */
 
+- (NSString*)getAppVersion {
+    NSString *ver = [[[NSBundle mainBundle] infoDictionary]
+                     objectForKey:@"CFBundleShortVersionString"];
+    NSString *build = [[[NSBundle mainBundle] infoDictionary]
+                       objectForKey:@"CFBundleVersion"];
+    return [NSString stringWithFormat:@"Version %@.%@",ver,build];
+}
+
+
 @end