Просмотр исходного кода

eSign 20170419

加入出口许可证,所有修改完成,准备打包
Ray Zhang 9 лет назад
Родитель
Сommit
88c786f1c8

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


+ 3 - 3
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -15,7 +15,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "823"
             endingLineNumber = "823"
-            landmarkName = "-scrollViewDidEndZooming:withView:atScale:"
+            landmarkName = "-viewForZoomingInScrollView:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -31,8 +31,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "816"
             endingLineNumber = "816"
-            landmarkName = "-viewForZoomingInScrollView:"
-            landmarkType = "7">
+            landmarkName = "@implementation PageViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

BIN
Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 7
RedAnt ERP Mobile/HMLG Mobile/Info.plist

@@ -21,7 +21,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>170314</string>
+	<string>170327</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -30,13 +32,9 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string></string>
-	<key>NSContactsUsageDescription</key>
-	<string></string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string></string>
+	<string>Try to use camera</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string></string>
+	<string>Try to visit Photo Library</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>

+ 12 - 1
RedAnt ERP Mobile/common/PDFUtils.m

@@ -389,7 +389,7 @@ isnew:(bool)isNewDocument
                 [control_drawable setMargin_top:margin_top];
                 
                 
-                if(!isNewDocument)
+                if(!isNewDocument&& [control[@"dirty"] boolValue])
                 {
                     CGRect bg_rect= text_rect;
                     PDFDrawable * rect_drawable = [[RectDrawable alloc] init:bg_rect color:@"0xffff00"];
@@ -432,6 +432,17 @@ isnew:(bool)isNewDocument
                     
                 }
                 
+                
+                if(!isNewDocument&& [control[@"dirty"] boolValue])
+                {
+                    CGRect text_rect = [self WindowRect2PDFRect:control_rect pdf_rect:papersize window_size:window_rect.size];
+
+                    CGRect bg_rect= text_rect;
+                    PDFDrawable * rect_drawable = [[RectDrawable alloc] init:bg_rect color:@"0xffff00"];
+                    if(rect_drawable)
+                        [pdfPage DirectDraw:pdfContext drawable:rect_drawable];
+                }
+                
                 //                NSString* size = control[@"size"];
                 //                if(size.length==0)
                 //                    size=@"10";

+ 2 - 2
RedAnt ERP Mobile/iSales-NPD/GoogleService-Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TRACKING_ID</key>
-	<string>UA-96243475-2</string>
+	<string>UA-61172313-2</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
@@ -23,4 +23,4 @@
 	<key>GOOGLE_APP_ID</key>
 	<string>1:943128505895:ios:a8e066dbaab3a1d6</string>
 </dict>
-</plist>
+</plist>

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

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.71</string>
+	<string>1.80</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>170323</string>
+	<string>170414</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>