Эх сурвалжийг харах

161220

NPD Mobile TEST VERSION 1.6.161220
Ray Zhang 9 жил өмнө
parent
commit
be9a7870c5

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 64 - 0
RedAnt ERP Mobile/common/Functions/signature/signature.storyboard

@@ -37,5 +37,69 @@
             </objects>
             <point key="canvasLocation" x="1999" y="-4336"/>
         </scene>
+        <!--Title-->
+        <scene sceneID="llq-Po-d7N">
+            <objects>
+                <viewController storyboardIdentifier="SignatureListViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="xQW-5p-fJu" customClass="SignatureListViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="td7-rJ-h8z"/>
+                        <viewControllerLayoutGuide type="bottom" id="DAa-YE-hAb"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="fzZ-IH-jQZ">
+                        <rect key="frame" x="0.0" y="0.0" width="376" height="640"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="p4w-Uo-pFK">
+                                <rect key="frame" x="0.0" y="0.0" width="376" height="640"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SignatureTableViewCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SignatureTableViewCell" rowHeight="128" id="pJ2-Li-nq4" customClass="SignatureTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="376" height="128"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pJ2-Li-nq4" id="hwz-Mn-MnM">
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="127"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Hk-1I-EQp">
+                                                    <rect key="frame" x="8" y="0.0" width="256" height="128"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                </imageView>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="signatureImageView" destination="5Hk-1I-EQp" id="LB1-LJ-YOB"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="xQW-5p-fJu" id="wTO-7W-ayx"/>
+                                    <outlet property="delegate" destination="xQW-5p-fJu" id="Mv0-4z-wwI"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" title="Title" id="XAK-aB-GtR">
+                        <barButtonItem key="leftBarButtonItem" systemItem="edit" id="UZx-65-lBp"/>
+                        <barButtonItem key="rightBarButtonItem" systemItem="add" id="g6c-9y-EiG">
+                            <connections>
+                                <action selector="onAddClick:" destination="xQW-5p-fJu" id="Xap-cW-ksy"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="376" height="640"/>
+                    <connections>
+                        <outlet property="tableView" destination="p4w-Uo-pFK" id="Lew-Ky-xNN"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="bV8-Sj-hSE" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2647" y="-4328"/>
+        </scene>
     </scenes>
 </document>

+ 0 - 1
RedAnt ERP Mobile/common/customUI/TouchImageView.h

@@ -10,7 +10,6 @@
 @class TouchImageView;
 @protocol TouchImageViewDelegate <NSObject>
 @required
-//- (void)touchLabel:(TouchImageView *)touchLabel touchesWtihTag:(NSInteger)tag;
 - (void)TouchImageViewOnTouche:(TouchImageView *)touchImageView;
 @end
 @interface TouchImageView : UIImageView

+ 14 - 7
RedAnt ERP Mobile/common/customUI/TouchImageView.m

@@ -11,7 +11,20 @@
 @implementation TouchImageView
 @synthesize delegate;
 
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self becomeFirstResponder];
+        self.userInteractionEnabled=true;
+//        self.layer.borderColor = [UIColor darkGrayColor].CGColor;
+//        self.layer.borderWidth = 1.0;
+    }
+    return self;
+}
+
 - (void)awakeFromNib {
+    [super awakeFromNib];
     [self becomeFirstResponder];
     self.userInteractionEnabled=true;
     self.layer.borderColor = [UIColor darkGrayColor].CGColor;
@@ -26,13 +39,7 @@
 }
 */
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    //    [self setTextColor:COLOR(0,0,0,1.0)];
-  //  UITouch *touch = [touches anyObject];
- //   CGPoint points = [touch locationInView:self];
-//    if (points.x >= self.frame.origin.x && points.y >= self.frame.origin.x && points.x <= self.frame.size.width && points.y <= self.frame.size.height)
-//    {
         [delegate TouchImageViewOnTouche:self];
-//        [delegate touchLabel:self touchesWtihTag:self.tag];
-//    }
+
 }
 @end

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -844,10 +844,10 @@
 		713F76AF1929F4A7006A7305 /* iSales-NPD */ = {
 			isa = PBXGroup;
 			children = (
+				71DF742C1C57567800F2789C /* NPD */,
 				716387C71953CDB4006E65E6 /* utils */,
 				71DF74311C5757C800F2789C /* CommonUI */,
 				718716141C433B4300F25860 /* ScanAPI */,
-				71DF742C1C57567800F2789C /* NPD */,
 				7190F1091BBBCAF100B2F243 /* PDF+Web */,
 				714C6ADA1B83016A000123E3 /* address */,
 				71F731FC192F395000F2CF76 /* AutoScrollImage */,

+ 3 - 3
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/trans.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "trans.png",
+      "filename" : "po.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "trans@2x.png",
+      "filename" : "po@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "trans@3x.png",
+      "filename" : "po@3x.png",
       "scale" : "3x"
     }
   ],

BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/trans.imageset/po.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/trans.imageset/po@2x.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/trans.imageset/po@3x.png


+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -20,7 +20,7 @@
 #import "Singleton.h"
 
 
-#define PDF_DEBUG true
+#define PDF_DEBUG false
 
 //#define ENCRYPT_OFF
  

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>161209</string>
+	<string>161220</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>