增加Request Login。

RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.h

@@ -15,7 +15,7 @@
 //@property (strong,nonatomic) NSString* title;
 @property (strong,nonatomic) NSData* content;
 
-
+@property (nonatomic,assign) BOOL backItemDismiss;///<返回键响应是否为dismiss
 
 @property (nonatomic , copy) void (^onLoadSuccess)(NSString* url );
 

RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.m

@@ -67,6 +67,8 @@
 }
 - (void)onBackClick:(UIButton *)sender {
     
+    if (self.backItemDismiss)
+        [self.navigationController dismissViewControllerAnimated:YES completion:nil];
     
     [self.navigationController popViewControllerAnimated:FALSE];
 }

RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -14,9 +14,10 @@
 #import "NotificationNameCenter.h"
 #import "OfflineSettingViewController.h"
 #import "MainViewController.h"
-
+#import "WebViewController.h"
 
 @interface LoginViewController ()
+@property (strong, nonatomic) IBOutlet UIButton *requestLoginBtn;
 
 @end
 
@@ -495,4 +496,24 @@
     self.Loginlist.hidden=true;
     
 }
+
+#pragma mark - action
+
+- (IBAction)requestLoginBtnClicked:(UIButton *)sender {
+    
+    WebViewController *webVC = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];
+    webVC.url = @"http://www.cnblogs.com/buakaw/";
+    webVC.title = @"Request Login";
+    webVC.backItemDismiss = YES;
+    
+    
+    UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:webVC];
+    nav.modalPresentationStyle = UIModalPresentationFormSheet;
+    
+    [self presentViewController:nav animated:YES completion:nil];
+    
+}
+
+
+
 @end

RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -874,7 +874,7 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kAP-gb-Gce" id="Ilc-6o-RhI">
-                                            <frame key="frameInset" width="360" height="44"/>
+                                            <frame key="frameInset" width="360" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AxX-hS-Jtg">
@@ -893,6 +893,17 @@
                                     <outlet property="delegate" destination="Q1j-qK-Nq8" id="N2l-yO-mxO"/>
                                 </connections>
                             </tableView>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="FqB-9p-WZO">
+                                <frame key="frameInset" minY="270" width="100" height="30" maxX="152"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <state key="normal" title="Request Login">
+                                    <color key="titleColor" red="0.60000002379999995" green="0.40000000600000002" blue="0.20000000300000001" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="requestLoginBtnClicked:" destination="Q1j-qK-Nq8" eventType="touchUpInside" id="Er6-GZ-JiA"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -913,6 +924,7 @@
                         <outlet property="checkSavePassword" destination="B5F-AY-BkK" id="zzE-TR-Jcm"/>
                         <outlet property="editpass" destination="oCu-XS-jr9" id="Tqo-ji-zau"/>
                         <outlet property="edituser" destination="e4L-J6-NNX" id="MPR-BH-UPe"/>
+                        <outlet property="requestLoginBtn" destination="FqB-9p-WZO" id="hGJ-jt-j5G"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="LPP-1Z-0yh" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -2131,7 +2143,7 @@
                                         <rect key="frame" x="0.0" y="88" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pol-lE-P45" id="FAm-1c-nX0">
-                                            <frame key="frameInset" width="730" height="44"/>
+                                            <frame key="frameInset" width="702" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clean Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AHm-p1-51h">
@@ -3007,7 +3019,7 @@
                                         <rect key="frame" x="0.0" y="22" width="768" height="66"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="H8t-DU-AtW" id="q6R-9a-SsD">
-                                            <frame key="frameInset" width="768" height="65.5"/>
+                                            <frame key="frameInset" width="768" height="66"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WEB1509140024" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fu3-Bf-ZH2" userLabel="So#">
@@ -3018,14 +3030,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="N3e-hc-gFF" userLabel="price">
-                                                    <frame key="frameInset" minY="23" width="100" maxX="176" maxY="21.5"/>
+                                                    <frame key="frameInset" minY="23" width="100" maxX="176" maxY="22"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="02/02/2015 10:10:10" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qf1-u6-uMA" userLabel="date">
-                                                    <frame key="frameInset" minY="11" width="148" maxX="15" maxY="11.5"/>
+                                                    <frame key="frameInset" minY="11" width="148" maxX="15" maxY="12"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -3046,7 +3058,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99999" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kLZ-2K-sGp">
-                                                    <frame key="frameInset" minY="5" width="100" maxX="176" maxY="39.5"/>
+                                                    <frame key="frameInset" minY="5" width="100" maxX="176" maxY="40"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -5740,11 +5752,11 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6hT-I3-WW3" id="gKI-En-sgV">
-                                            <frame key="frameInset" width="768" height="44"/>
+                                            <frame key="frameInset" width="768" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="Eyx-Zr-PLO" customClass="RTLabel">
-                                                    <frame key="frameInset" minX="-6" minY="-7" maxX="22" maxY="19"/>
+                                                    <frame key="frameInset" minX="-6" minY="-7" maxX="22" maxY="18"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
@@ -5758,7 +5770,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="66" width="768" height="190"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lSe-2G-cT7" id="KDS-aU-tYT">
-                                            <frame key="frameInset" width="768" height="190"/>
+                                            <frame key="frameInset" width="768" height="189"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yQq-ma-HdT" userLabel="unit price">
@@ -5882,7 +5894,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="256" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9rG-Hv-ICg" id="e5s-wc-IkL">
-                                            <frame key="frameInset" width="768" height="44"/>
+                                            <frame key="frameInset" width="768" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fNL-sW-tkk" userLabel="price">
@@ -5910,11 +5922,11 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="300" width="768" height="186"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9hm-qp-u5H" id="PQ9-FQ-6Si">
-                                            <frame key="frameInset" width="768" height="186"/>
+                                            <frame key="frameInset" width="768" height="185"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <webView userInteractionEnabled="NO" contentMode="scaleToFill" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" id="9m6-iq-KMk">
-                                                    <frame key="frameInset" minY="5" maxY="5"/>
+                                                    <frame key="frameInset" minY="5" maxY="4"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <dataDetectorType key="dataDetectorTypes"/>
@@ -5929,7 +5941,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="486" width="768" height="148"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s5l-6k-iWO" id="8ms-PN-eNw">
-                                            <frame key="frameInset" width="768" height="148"/>
+                                            <frame key="frameInset" width="768" height="147"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="wjN-UC-W3J">
@@ -7854,7 +7866,7 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HwF-54-hzr">
-                                                    <frame key="frameInset" minX="15" width="698" height="43.5"/>
+                                                    <frame key="frameInset" minX="28" width="672" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>