فهرست منبع

1.修改NPD Model Detail Price可点击登录。
2.修改NPD Email Wish List消息提示。
3.修改NPD Model Detail重命名Feature。

Pen Li 8 سال پیش
والد
کامیت
b6b6ebba90

+ 29 - 0
RedAnt ERP Mobile/common/Functions/modelDetail/DetailHeaderCell.m

@@ -21,6 +21,7 @@
 #import "TextUtils.h"
 
 #import "ContentPreviewController.h"
+#import "DetailViewController.h"
 
 
 @implementation DetailHeaderCell
@@ -1647,5 +1648,33 @@
     self.playerView.hidden=true;
 }
 
+- (IBAction)noLoginBtnClick:(UIButton *)sender {
+    
+    UIApplication * app = [UIApplication sharedApplication];
+    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+    MainViewController* main_vc=(MainViewController*)appDelegate.main_vc;
+    
+    if(appDelegate.bLogin==false) {
+        DetailViewController *vc= (DetailViewController *)[RAUtils getViewController:self];
+        LoginViewController * loginvc =[ vc.storyboard instantiateViewControllerWithIdentifier:@"LoginViewController"];
+        
+        loginvc.returnValue = ^(bool blogin){
+            
+            if(blogin) {
+                [vc reload];
+            }
+            [main_vc checklogin:true];
+            
+        };
+        
+        UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:loginvc] ;
+        
+        navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态,自己看看是哪种
+        [vc presentViewController:navi animated:YES completion:^{
+
+        }];
+    }
+    
+}
 
 @end

+ 7 - 0
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -1790,6 +1790,13 @@ self.isrefreshing=false;
             cell.descriptionBtn.hidden = YES;
         } else {
             cell.descriptionBtn.hidden = NO;
+            
+            NSDictionary *attrs = @{
+                                    NSFontAttributeName : [UIFont systemFontOfSize:18.0f],
+                                    NSUnderlineStyleAttributeName : [NSNumber numberWithInteger:NSUnderlineStyleSingle]
+                                    };
+            NSAttributedString *attrTitle = [[NSAttributedString alloc] initWithString:@"Read More" attributes:attrs];
+            [cell.descriptionBtn setAttributedTitle:attrTitle forState:UIControlStateNormal];
         }
         cell.descriptionBlock = ^(UIButton *sender) {
             [weakself showModelDescription:desc];

+ 1 - 1
RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -1399,7 +1399,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
                             
                         }else {
                             
-                            [RAUtils message_alert:@"Send Email Success" title:@"Message" controller:weakself];
+                            [RAUtils message_alert:nil title:@"Email was sent successfully" controller:weakself];
                             
                         }
                         

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="1808" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -1078,7 +1078,8 @@
                                                 <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="t2l-bU-0kL">
                                                     <rect key="frame" x="35" y="510" width="100" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" title="Features"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                    <state key="normal" title="Read More"/>
                                                     <connections>
                                                         <action selector="descriptionBtnClick:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="5jn-ta-qdm"/>
                                                     </connections>
@@ -1248,6 +1249,13 @@
                                                     </subviews>
                                                     <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                 </view>
+                                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="tWf-LY-Rz6">
+                                                    <rect key="frame" x="524" y="103" width="191" height="26"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                    <connections>
+                                                        <action selector="noLoginBtnClick:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="pev-0M-YaA"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                         </tableViewCellContentView>
                                         <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -9824,7 +9832,7 @@ Email: redantsupport@united-us.net</string>
         <image name="btn_search" width="102" height="30"/>
         <image name="btn_signin" width="102" height="30"/>
         <image name="camera" width="48" height="48"/>
-        <image name="cart_empty" width="96" height="96"/>
+        <image name="cart_empty" width="72" height="72"/>
         <image name="category" width="96" height="96"/>
         <image name="check_0_24" width="24" height="24"/>
         <image name="check_1_24" width="24" height="24"/>