Homer 1.9.4

Redant mobile
Search, search setting, result,增加title

RedAnt ERP Mobile/iSales-GATIT.xcodeproj/project.pbxproj

@@ -430,7 +430,7 @@
 		712C40B51C7310F4000E6831 /* CartGeneralNotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CartGeneralNotesViewController.m; path = common/Functions/cart/CartGeneralNotesViewController.m; sourceTree = SOURCE_ROOT; };
 		712C40B71C731126000E6831 /* ItemNotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ItemNotesViewController.h; path = common/Functions/cart/ItemNotesViewController.h; sourceTree = SOURCE_ROOT; };
 		712C40B81C731126000E6831 /* ItemNotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ItemNotesViewController.m; path = common/Functions/cart/ItemNotesViewController.m; sourceTree = SOURCE_ROOT; };
-		713F76A61929F4A7006A7305 /* GATIT Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GATIT Mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		713F76A61929F4A7006A7305 /* Titan.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Titan.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		713F76A91929F4A7006A7305 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		713F76AB1929F4A7006A7305 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		713F76AD1929F4A7006A7305 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -1241,7 +1241,7 @@
 		713F76A71929F4A7006A7305 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				713F76A61929F4A7006A7305 /* GATIT Mobile.app */,
+				713F76A61929F4A7006A7305 /* Titan.app */,
 			);
 			name = Products;
 			path = ..;
@@ -1938,7 +1938,7 @@
 			);
 			name = "iSales-GATIT";
 			productName = "iSales-GATIT";
-			productReference = 713F76A61929F4A7006A7305 /* GATIT Mobile.app */;
+			productReference = 713F76A61929F4A7006A7305 /* Titan.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -2329,7 +2329,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "GATIT Mobile";
+				PRODUCT_NAME = Titan;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
 			};
@@ -2379,7 +2379,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
-				PRODUCT_NAME = "GATIT Mobile";
+				PRODUCT_NAME = Titan;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
 				VALIDATE_PRODUCT = YES;
@@ -2422,7 +2422,7 @@
 					"-v",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.apex.iSales-GATIT";
-				PRODUCT_NAME = "GATIT Mobile";
+				PRODUCT_NAME = Titan;
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -2464,7 +2464,7 @@
 					"-v",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.apex.iSales-GATIT";
-				PRODUCT_NAME = "GATIT Mobile";
+				PRODUCT_NAME = Titan;
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};

RedAnt ERP Mobile/iSales-HOMER/iSales-HOMER-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.93</string>
+	<string>1.94</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>171107</string>
+	<string>180115</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

RedAnt Mobile/RedAnt Mobile/ResultViewController.m

@@ -690,6 +690,13 @@ static const int delta = 25;
 }
 
 - (void)setupNavigationBar {
+    
+    if(self.content_menu==nil)
+    {
+        self.navigationItem.rightBarButtonItem=nil;
+        return;
+    }
+    
     UIBarButtonItem *menuItem = [[UIBarButtonItem alloc] initWithTitle:@"Menu" style:UIBarButtonItemStylePlain target:self action:@selector(MenuClick:)];
     self.navigationItem.rightBarButtonItem = menuItem;
 }
@@ -836,7 +843,12 @@ static const int delta = 25;
                         strongSelf.content_layout = [contentDic objectForKey:@"layout"];
                         strongSelf.content_action = [contentDic objectForKey:@"row_action"];
                         strongSelf.content_menu = [[contentDic objectForKey:@"menu"] mutableCopy];
+                        [strongSelf setupNavigationBar];
                         
+                            UILabel * headerview=(UILabel *)self.tableview.tableHeaderView;
+                            headerview.text = contentDic[@"table_title"];
+                            [self resize_tableHeader];
+           
                         if(strongSelf.content_data==nil)
                             strongSelf.content_data = [NSMutableDictionary new];
                         NSMutableDictionary* newdata = [[contentDic objectForKey:@"data"] mutableCopy];
@@ -1017,7 +1029,7 @@ static const int delta = 25;
     headerview.frame = CGRectMake(0, 0,     self.tableview.frame.size.width, 44);
     headerview.numberOfLines = 0;
     headerview.textAlignment = NSTextAlignmentCenter;
-    headerview.text = @"header 内容应为接口取得的title";
+    headerview.text = @"";
     return headerview;
 }
 -(void) resize_tableHeader

RedAnt Mobile/RedAnt Mobile/SearchSettingViewController.m

@@ -96,7 +96,14 @@
 #pragma mark Request Editor
 -(NSDictionary*)request_Editor:(NSString*) request_url params:(NSMutableDictionary*)params
 {
-    return [RANetwork query_setting:request_url params:params];
+
+    NSDictionary* ret =[RANetwork query_setting:request_url params:params];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UILabel * headerview=(UILabel *)self.editorTable.tableHeaderView;
+        headerview.text = ret[@"table_title"];
+        [self resize_tableHeader];
+    });
+    return ret;
 }
 
 #pragma mark - customize editor
@@ -107,7 +114,7 @@
     headerview.frame = CGRectMake(0, 0,     self.editorTable.frame.size.width, 44);
     headerview.numberOfLines = 0;
     headerview.textAlignment = NSTextAlignmentCenter;
-    headerview.text = @"header 内容应为接口取得的title";
+    headerview.text = @"";
     return headerview;
 }
 -(void) resize_tableHeader

RedAnt Mobile/RedAnt Mobile/SearchViewController.m

@@ -37,7 +37,8 @@
     headerview.frame = CGRectMake(0, 0,     self.editorTable.frame.size.width, 44);
     headerview.numberOfLines = 0;
     headerview.textAlignment = NSTextAlignmentCenter;
-    headerview.text = @"header 内容应为接口取得的title";
+//    headerview.lineBreakMode=
+    headerview.text = @"";
     return headerview;
 }
 -(void) resize_tableHeader
@@ -122,7 +123,13 @@
 #pragma mark Request Editor
 -(NSDictionary*)request_Editor:(NSString*) request_url params:(NSMutableDictionary*)params
 {
-    return [RANetwork require_query_ui:request_url params:params];
+    NSDictionary* ret =[RANetwork require_query_ui:request_url params:params];
+    dispatch_async(dispatch_get_main_queue(), ^{
+    UILabel * headerview=(UILabel *)self.editorTable.tableHeaderView;
+    headerview.text = ret[@"table_title"];
+        [self resize_tableHeader];
+    });
+    return ret;
 }
 
 #pragma mark- autocomplete

RedAnt Mobile/RedAnt Mobile/config.h

@@ -37,13 +37,13 @@
 
 #ifdef test_server
 #define URL_CUSTOMER_ADV_SEARCH @""
-#define URL_LOGIN @"wm_postgresql/index.php"
+#define URL_LOGIN @""
 #define URL_QUERY @""
 #define URL_QUERY_UI @""
 #define URL_QUERY_SETTIING @""
 #define URL_SAVE_QUERY_SETTIING @""
 #define URL_QUERY_AUTOCOMPLETE @""
-#define  URL_REQUIRE_SERVER  @"http://192.168.0.155/wm_postgresql/ant_mobile_company_valid.php"
+#define  URL_REQUIRE_SERVER  @"http://192.168.0.177/ipad/ant_mobile_company_valid.php"
 #define URL_KV_DETAIL @""
 #define URL_ORDER_DETAIL @""
 #define URL_UPLOAD_IMG @""

RedAnt Mobile/testViewController.xib

@@ -19,8 +19,8 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9SJ-Sn-zu9">
-                    <rect key="frame" x="166" y="147" width="42" height="21"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="abcdefgh hijifdis fdsanr" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9SJ-Sn-zu9">
+                    <rect key="frame" x="166" y="147" width="42" height="104"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>
@@ -28,6 +28,7 @@
                 </label>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <point key="canvasLocation" x="26.5" y="52.5"/>
         </view>
     </objects>
 </document>