Modify contract editor -- 修改合同编辑器(issue30: #14719)

Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -15,12 +15,11 @@
 		3C6B628127102F7C00E74CF9 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B628027102F7B00E74CF9 /* DatePickerViewController.m */; };
 		3C6B62842710324B00E74CF9 /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62822710324B00E74CF9 /* TouchImageView.m */; };
 		3C6B62872710325500E74CF9 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */; };
-		3C6B628927181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628827181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf */; };
 		3C6B6290272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628C272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf */; };
 		3C6B6291272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628D272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf */; };
 		3C6B6292272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628E272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf */; };
 		3C6B6293272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628F272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf */; };
-		3C6B62A52726AD4F00E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B62A42726AD4F00E74CF9 /* 2021 GECI - Home Improvement Contract.json */; };
+		3C6B62A72727F12A00E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B62A62727F12A00E74CF9 /* 2021 GECI - Home Improvement Contract.json */; };
 		3CBB92F2248A26EB0099E429 /* NetworkUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CBB92F1248A26EB0099E429 /* NetworkUtils.m */; };
 		3CC7E73423BEDE9700BE5561 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E73323BEDE9700BE5561 /* RAPDFViewController.m */; };
 		3CC7E73623BEDEA000BE5561 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7E73523BEDEA000BE5561 /* wkweb.storyboard */; };
@@ -116,12 +115,11 @@
 		3C6B62832710324B00E74CF9 /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = ../../../common/customUI/TouchImageView.h; sourceTree = "<group>"; };
 		3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = ../../../common/customUI/CustomIOSAlertView.m; sourceTree = "<group>"; };
 		3C6B62862710325500E74CF9 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = ../../../common/customUI/CustomIOSAlertView.h; sourceTree = "<group>"; };
-		3C6B628827181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "ZINC_3D_Printing_Guide[1.2].pdf"; sourceTree = "<group>"; };
 		3C6B628C272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Fong Huang.pdf"; sourceTree = "<group>"; };
 		3C6B628D272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Wilson Ma.pdf"; sourceTree = "<group>"; };
 		3C6B628E272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Jim Xu.pdf"; sourceTree = "<group>"; };
 		3C6B628F272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Tan.pdf"; sourceTree = "<group>"; };
-		3C6B62A42726AD4F00E74CF9 /* 2021 GECI - Home Improvement Contract.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "2021 GECI - Home Improvement Contract.json"; sourceTree = "<group>"; };
+		3C6B62A62727F12A00E74CF9 /* 2021 GECI - Home Improvement Contract.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "2021 GECI - Home Improvement Contract.json"; sourceTree = "<group>"; };
 		3CBB92F0248A26EB0099E429 /* NetworkUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtils.h; path = ../../../common/NetworkUtils.h; sourceTree = "<group>"; };
 		3CBB92F1248A26EB0099E429 /* NetworkUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkUtils.m; path = ../../../common/NetworkUtils.m; sourceTree = "<group>"; };
 		3CC7E73223BEDE9700BE5561 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
@@ -558,14 +556,13 @@
 		7128C3261E1251DE00FF635B /* pdf resource */ = {
 			isa = PBXGroup;
 			children = (
-				3C6B62A42726AD4F00E74CF9 /* 2021 GECI - Home Improvement Contract.json */,
+				3C6B62A62727F12A00E74CF9 /* 2021 GECI - Home Improvement Contract.json */,
 				3C6B628C272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf */,
 				3C6B628E272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf */,
 				3C6B628F272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf */,
 				3C6B628D272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf */,
 				3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */,
 				3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */,
-				3C6B628827181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
 				425A00F31F8F0EC200286D6F /* attribute_template.json */,
 				42DDB87B1F91E351002CCE22 /* template_type.json */,
@@ -661,16 +658,15 @@
 				425A00F41F8F196900286D6F /* attribute_template.json in Resources */,
 				7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */,
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,
+				3C6B62A72727F12A00E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */,
 				3CC7E73623BEDEA000BE5561 /* wkweb.storyboard in Resources */,
 				3C69618E23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf in Resources */,
 				42DDB87A1F91DCE8002CCE22 /* ControlTemplateCell.xib in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				3C69619023C81A500075172A /* 2020 GECI - Home Improvement Contract.json in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
-				3C6B628927181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf in Resources */,
 				3C6B6293272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf in Resources */,
 				3C6B6291272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf in Resources */,
-				3C6B62A52726AD4F00E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */,
 				42DDB8751F91C081002CCE22 /* ControlTemplateVC.xib in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,
 				3C6B6290272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf in Resources */,

Ants Contract/common/DocumentPageViewController.m

@@ -45,18 +45,18 @@
 
 - (IBAction)onLeftButtonClick:(id)sender {
     
-    if(true)
-    {
-        self.pdfPath = [[NSBundle mainBundle] pathForResource:@"ZINC_3D_Printing_Guide[1.2].pdf" ofType:nil];
-//        [self indexOfViewController:(PageViewController *)viewController]
-        [self setupDocument];
-        PageViewController* pvc=  self.pageViewController.viewControllers[0] ;
-        NSUInteger index=[self indexOfViewController:pvc];
-        pvc.pageRef =  CGPDFDocumentGetPage (self.document , index+1);
-        [pvc refreshPage];
-         return;
-
-    }
+//    if(true)
+//    {
+//        self.pdfPath = [[NSBundle mainBundle] pathForResource:@"ZINC_3D_Printing_Guide[1.2].pdf" ofType:nil];
+////        [self indexOfViewController:(PageViewController *)viewController]
+//        [self setupDocument];
+//        PageViewController* pvc=  self.pageViewController.viewControllers[0] ;
+//        NSUInteger index=[self indexOfViewController:pvc];
+//        pvc.pageRef =  CGPDFDocumentGetPage (self.document , index+1);
+//        [pvc refreshPage];
+//         return;
+//
+//    }
     
 //    - (NSUInteger) indexOfViewController:(PageViewController *)viewController
     

Ants Contract/common/PageViewController.m

@@ -648,7 +648,7 @@ typedef enum {
             CGRect srect=[self scaleControl:CGRectMake([template[@"pos_x"] floatValue], [template[@"pos_y"] floatValue], [template[@"width"] floatValue], [template[@"height"] floatValue]) from:CGSizeMake(768, 960) to:destView.frame.size];
     UIButton* btn = [[UIButton alloc] initWithFrame:srect];
     [btn setTitle:template[@"title"] forState:UIControlStateNormal];
-    
+    [btn setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
         btn.tag = index+ CONTROL_BASE;
     //    ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged
     btn.backgroundColor = UIColorFromRGB(BT_BG);
@@ -1510,7 +1510,7 @@ typedef enum {
             else if([value isEqualToString:@"control_6-control_7"])
             {
                 
-                UITextView* tv6 = (UITextView*) [self findControl:@"control_10"];
+                UITextView* tv6 = (UITextView*) [self findControl:@"control_8"];
 //                float f6= [[tv6.text stringByReplacingOccurrencesOfString:@"$" withString:@"" ] floatValue];
 //                
 //                float f7= [[text stringByReplacingOccurrencesOfString:@"$" withString:@"" ] floatValue];