Prepare to release v2.2.3-build 139

LNTUORG · Feb 29, 2016 · 3fda614 · 3fda614
1 parent 7274687
commit 3fda614
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Homepage: [http://online.lntu.org](http://online.lntu.org)
 
 Server: [https://github.com/LNTUORG/LntuOnline-API](https://github.com/LNTUORG/LntuOnline-API)
 
-Android: [https://github.com/LNTUORG/LntuOnline-iOS](https://github.com/LNTUORG/LntuOnline-iOS)
+Android: [https://github.com/LNTUORG/LNTUOnline-Android](https://github.com/LNTUORG/LNTUOnline-Android)
 
 ## Licence
 
@@ -37,8 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ## Requirements
 
-- ~~iOS 7.0+~~
-- iOS 8.0+
+- iOS 7.0+
 - Xcode 7+
 
 ## Feature
@@ -51,7 +50,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 - [Digital Ocean](https://www.digitalocean.com/?refcode=c6314f396546)
 - [Crashlytics](https://www.crashlytics.com)
-- [Umeng](http://www.umeng.com)
 
 ## Thanks
 
@@ -60,7 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ## Contact
 
 - [hi@pupboss.com](mailto:hi@pupboss.com)
-- [PUPBOSS.COM](https://pupboss.com)
+- [PUPBOSS.COM](https://www.pupboss.com)
 
 ## Screenshot
 

diff --git a/eduadmin/Base.lproj/Main.storyboard b/eduadmin/Base.lproj/Main.storyboard
@@ -875,10 +875,10 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="70n-bk-zVc">
-                                            <rect key="frame" x="8" y="39" width="56" height="21"/>
+                                            <rect key="frame" x="8" y="39" width="260" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="mL5-LT-1Xq"/>
-                                                <constraint firstAttribute="width" constant="56" id="ruG-B5-Tru"/>
+                                                <constraint firstAttribute="width" constant="260" id="ruG-B5-Tru"/>
                                             </constraints>
                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>

diff --git a/eduadmin/Class/About/Controller/AboutTableViewController.m b/eduadmin/Class/About/Controller/AboutTableViewController.m
@@ -23,7 +23,7 @@ - (void)viewDidLoad {
     [super viewDidLoad];
 
     self.versionLable.text = [NSString stringWithFormat:@"v%@",[LJDeviceTool getCurrentAppVersion]];
-    self.rightsLable.text = [NSString stringWithFormat:@"Copyright © 2013-%ld PUPBOSS. All rights reserved",(long)[LJTimeTool getCurrentYear]];
+    self.rightsLable.text = COPYRIGHTSTRING;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

diff --git a/eduadmin/Class/Main/Controller/PushViewController.m b/eduadmin/Class/Main/Controller/PushViewController.m
@@ -8,6 +8,7 @@
 
 #import "PushViewController.h"
 #import "LJTimeTool.h"
+#import "Common.h"
 
 @interface PushViewController ()
 
@@ -28,7 +29,7 @@ - (void)viewDidLoad {
 
         self.textView.text = recievedContent;
     }
-    self.footLabel.text = [NSString stringWithFormat:@"Copyright © 2013-%ld PUPBOSS. All rights reserved", (long)[LJTimeTool getCurrentYear]];
+    self.footLabel.text = COPYRIGHTSTRING;
 }
 
 @end
diff --git a/eduadmin/Info.plist b/eduadmin/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.2</string>
+	<string>2.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>129</string>
+	<string>139</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/eduadmin/vendors/Tools/Common.h b/eduadmin/vendors/Tools/Common.h
@@ -21,6 +21,8 @@
 #define LJQQ @"10771533"
 #define SUPPORTMAIL @"hi@pupboss.com"
 
+#define COPYRIGHTSTRING [NSString stringWithFormat:@"Copyright © 2013-%ld LNTU.ORG All rights reserved.",(long)[LJTimeTool getCurrentYear]];
+
 #define USERNAMEKEY @"userName"   // 用户名 key
 #define PWDKEY @"pwd"           // 密码 key