Explorar o código

eSign 20170410

去掉没用的menuviewcontroller
Ray Zhang %!s(int64=9) %!d(string=hai) anos
pai
achega
8b835aacc5

BIN=BIN
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -713,7 +713,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="93T-5h-JKV">
-                                                    <rect key="frame" x="15" y="5" width="34" height="21"/>
+                                                    <rect key="frame" x="15" y="5" width="33" height="21"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>

+ 0 - 12
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -67,11 +67,9 @@
 		714B870B1E24CAE300A40D18 /* debug.json in Resources */ = {isa = PBXBuildFile; fileRef = 714B870A1E24CAE200A40D18 /* debug.json */; };
 		717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 717243431E1CCCEC00800678 /* CustomIOSAlertView.m */; };
 		7172434A1E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */; };
-		718403A51E67F8A000C66873 /* RAMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 718403A41E67F8A000C66873 /* RAMenu.m */; };
 		7188C2891E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json in Resources */ = {isa = PBXBuildFile; fileRef = 7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */; };
 		7188C28B1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */; };
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
-		71B152F41E67EA5D00D2E5EC /* MenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152F31E67EA5D00D2E5EC /* MenuViewController.m */; };
 		71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */; };
 		71BBFC3A1E651CC4008668A7 /* DocnotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC391E651CC4008668A7 /* DocnotesViewController.m */; };
 /* End PBXBuildFile section */
@@ -190,14 +188,10 @@
 		717243421E1CCCEC00800678 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.h"; sourceTree = "<group>"; };
 		717243431E1CCCEC00800678 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.m"; sourceTree = "<group>"; };
 		717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017.pdf"; sourceTree = "<group>"; };
-		718403A31E67F8A000C66873 /* RAMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAMenu.h; path = ../../../common/RAMenu.h; sourceTree = "<group>"; };
-		718403A41E67F8A000C66873 /* RAMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAMenu.m; path = ../../../common/RAMenu.m; sourceTree = "<group>"; };
 		7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "GEIC - Home Improvement Contract 2017 Update.json"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017 Update.json"; sourceTree = "<group>"; };
 		7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017 Update.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017 Update.pdf"; sourceTree = "<group>"; };
 		71B152ED1E66C87F00D2E5EC /* AddExtDocumentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddExtDocumentViewController.h; path = ../../common/AddExtDocumentViewController.h; sourceTree = "<group>"; };
 		71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddExtDocumentViewController.m; path = ../../common/AddExtDocumentViewController.m; sourceTree = "<group>"; };
-		71B152F21E67EA5D00D2E5EC /* MenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MenuViewController.h; path = ../../../common/MenuViewController.h; sourceTree = "<group>"; };
-		71B152F31E67EA5D00D2E5EC /* MenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MenuViewController.m; path = ../../../common/MenuViewController.m; sourceTree = "<group>"; };
 		71BBFC351E6419D4008668A7 /* ExtDocumentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtDocumentsViewController.h; path = ../../common/ExtDocumentsViewController.h; sourceTree = "<group>"; };
 		71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtDocumentsViewController.m; path = ../../common/ExtDocumentsViewController.m; sourceTree = "<group>"; };
 		71BBFC381E651CC4008668A7 /* DocnotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocnotesViewController.h; path = ../../common/DocnotesViewController.h; sourceTree = "<group>"; };
@@ -256,10 +250,6 @@
 				7128C29A1E12506200FF635B /* pdfedit */,
 				7128C2711E124FFE00FF635B /* signature */,
 				7128C2671E124FF200FF635B /* Main.storyboard */,
-				71B152F21E67EA5D00D2E5EC /* MenuViewController.h */,
-				71B152F31E67EA5D00D2E5EC /* MenuViewController.m */,
-				718403A31E67F8A000C66873 /* RAMenu.h */,
-				718403A41E67F8A000C66873 /* RAMenu.m */,
 				7128C2691E124FF200FF635B /* LaunchScreen.storyboard */,
 				7128C24F1E124F4500FF635B /* Info.plist */,
 				7128C3361E12540F00FF635B /* ACNetwork.h */,
@@ -547,10 +537,8 @@
 				7128C2B21E1250CA00FF635B /* PDFPage.m in Sources */,
 				7115D4271E13B70C00EF4E4C /* DocumentListViewController.m in Sources */,
 				7128C33A1E12540F00FF635B /* ACNetwork.m in Sources */,
-				718403A51E67F8A000C66873 /* RAMenu.m in Sources */,
 				7128C2B71E1250CA00FF635B /* RectDrawable.m in Sources */,
 				71BBFC3A1E651CC4008668A7 /* DocnotesViewController.m in Sources */,
-				71B152F41E67EA5D00D2E5EC /* MenuViewController.m in Sources */,
 				7128C2D91E12510900FF635B /* mztools.c in Sources */,
 				7128C2EB1E12511B00FF635B /* NSString+Base64.m in Sources */,
 				7128C2CA1E1250FC00FF635B /* NetworkUtils.m in Sources */,

+ 7 - 3
Ants Contract/common/AddExtDocumentViewController.m

@@ -7,8 +7,8 @@
 //
 
 #import "AddExtDocumentViewController.h"
-#import "MenuViewController.h"
-#import "RAMenu.h"
+//#import "MenuViewController.h"
+//#import "RAMenu.h"
 #import "ImageUtils.h"
 #import "const.h"
 #import "RAUtils.h"
@@ -152,6 +152,7 @@
     
     
     return;
+    /*
         NSMutableArray* menuItem = [NSArray arrayWithObjects:@"aaa",@"bbb",nil];
     
     UIView* v= sender;
@@ -168,6 +169,8 @@
     MenuViewController *menuVC = [[MenuViewController alloc]init];
 
     menuVC.arr_menuItems = [menuItem mutableCopy];
+     
+     */
 //
 //    menuVC.title=@"menu";
 //    signatureVC.signatureData = self.signatureData;
@@ -212,7 +215,7 @@
 //    };
     
 
-    
+    /*
     UINavigationController * navi = [[UINavigationController alloc] initWithRootViewController:menuVC];
     navi.modalPresentationStyle=UIModalPresentationPopover;
     
@@ -224,6 +227,7 @@
     
     
     [self presentViewController:navi animated:true completion:nil];
+     */
     
 }
 - (IBAction)onAddFileClicked:(id)sender {