修改订单界面

ALand.xcodeproj/project.pbxproj

@@ -2945,7 +2945,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "58fbd91c-bd71-4896-9f69-a42d78c6dcd2";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
@@ -2975,7 +2975,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "58fbd91c-bd71-4896-9f69-a42d78c6dcd2";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};

ALand/CodeClass/Home/View/Commodity/CommodityDetailTopView.xib

@@ -42,6 +42,6 @@
     </objects>
     <resources>
         <image name="commodityDetailBack" width="68" height="68"/>
-        <image name="commodityDetailHome" width="70" height="68"/>
+        <image name="commodityDetailHome" width="68" height="68"/>
     </resources>
 </document>

ALand/CodeClass/Home/View/Order/OrderDetailTopView.m

@@ -39,8 +39,12 @@
     self.imgIcon.image = [UIImage imageNamed:[model.state getOrderStateImage]];
     self.labelName.text = model.address.name;
     JavenAddress *address = model.address;
-    self.labelAddress.text = [NSString stringWithFormat:@"%@%@%@%@%@", address.nation ? address.nation : @"", address.province, address.city, address.country, address.address];
-    self.labelPhoneNumber.text = model.consumer.mobilephone;
+    self.labelAddress.text = [NSString stringWithFormat:@"%@%@%@%@%@", SAFE_STRING(address.nation), SAFE_STRING(address.province), SAFE_STRING(address.city), SAFE_STRING(address.country), SAFE_STRING(address.address)];
+    if ([model.shipType isEqualToString:@"selfpick"]) {
+        self.labelAddress.text = @"自提";
+         self.labelName.text = @"自提";
+    }
+    self.labelPhoneNumber.text = [model.shipType isEqualToString:@"selfpick"] ? model.consumer.code : model.address.telephone;
     self.labelExpressTime.text = model.lastModifyInfo.time;
     WS(weakSelf)
     [[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"order/getLogistics/%@", model.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {

ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib

@@ -11,32 +11,32 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9kH-LK-wk8">
+                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9kH-LK-wk8">
                     <rect key="frame" x="0.0" y="178" width="320" height="102"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xru-fq-ja3">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="收货人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xru-fq-ja3">
                             <rect key="frame" x="45" y="22" width="68" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="谢德彬" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J01-8B-y5r">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="谢德彬" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J01-8B-y5r">
                             <rect key="frame" x="115" y="22" width="51" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Vh-Et-vJt">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="手机号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Vh-Et-vJt">
                             <rect key="frame" x="45" y="51" width="68" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="18321155536" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v7R-er-zaD">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="18321155536" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v7R-er-zaD">
                             <rect key="frame" x="115" y="51" width="105" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yca-8a-HcF">
+                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yca-8a-HcF">
                             <rect key="frame" x="262" y="22" width="50" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="50" id="2su-RU-ZJh"/>
@@ -46,14 +46,14 @@
                                 <action selector="actionCall:" destination="-1" eventType="touchUpInside" id="2Q6-do-hGR"/>
                             </connections>
                         </button>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="icon_order_address" translatesAutoresizingMaskIntoConstraints="NO" id="OeX-RE-d2m">
+                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" ambiguous="YES" misplaced="YES" image="icon_order_address" translatesAutoresizingMaskIntoConstraints="NO" id="OeX-RE-d2m">
                             <rect key="frame" x="4" y="74" width="30" height="23"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="30" id="eth-Xe-EGH"/>
                                 <constraint firstAttribute="height" constant="23" id="yMF-z8-J4m"/>
                             </constraints>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上海市 上海市 闵行区 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rM9-W2-1PT">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="上海市 上海市 闵行区 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rM9-W2-1PT">
                             <rect key="frame" x="45" y="76" width="267" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                             <nil key="highlightedColor"/>
@@ -94,10 +94,10 @@
                         </mask>
                     </variation>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kMe-iN-q0b">
+                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kMe-iN-q0b">
                     <rect key="frame" x="0.0" y="288" width="320" height="29"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nUT-vO-b28">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="商品信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nUT-vO-b28">
                             <rect key="frame" x="15" y="4" width="68" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>

ALand/CodeClass/Home/View/Order/OrderListHeaderView.m

@@ -18,7 +18,7 @@
 
 - (void)setUpViewWithModel:(JavenOrderModel *)model state:(NSString *)state
 {
-    self.labelCosumer.text = model.consumer.code;
+    self.labelCosumer.text = [model.shipType isEqualToString:@"selfpick"] ? model.consumer.code : model.address.telephone;
     self.labelTime.text = [(JavenCreateInfo *)model.createInfo time];
     self.labelState.text = [model.state getOrderStateString];
 }

ALand/CodeClass/Home/View/Order/OrderTableViewCell.m

@@ -47,8 +47,7 @@
     
     self.labelTotal.text = [NSString stringWithFormat:@"￥%.2f", model.total];
     self.labelCommission.text = [NSString stringWithFormat:@"￥%.2f", model.commissions];
-    JavenConsumer *consumer = model.consumer;
-    self.labelBuyer.text = consumer.code;
+    self.labelBuyer.text = model.address.telephone;
     self.labelDate.text = [(JavenCreateInfo *)model.createInfo time];
     
 }

ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m

@@ -173,7 +173,6 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     OrderDetailViewController *orderDetailVC = [[OrderDetailViewController alloc] init];
-    
     orderDetailVC.isShowNavigationBar = YES;
     orderDetailVC.model = self.arrDatas[indexPath.section];
     orderDetailVC.orderType = self.orderTag;

ALand/CodeClass/Home/WebViewController.m

@@ -8,7 +8,7 @@
 
 #import "WebViewController.h"
 #import <WebKit/WebKit.h>
-@interface WebViewController ()<WKNavigationDelegate, WKUIDelegate>
+@interface WebViewController ()<WKNavigationDelegate, WKUIDelegate, WKScriptMessageHandler>
 @property (nonatomic, weak) WKWebView * webView;
 @property (nonatomic, weak) UIButton * backItem;
 @property (nonatomic, weak) UIButton * closeItem;
@@ -18,7 +18,27 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight - 64)];
+    WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+    
+    // 设置偏好设置
+    config.preferences = [[WKPreferences alloc] init];
+    // 默认为0
+    config.preferences.minimumFontSize = 10;
+    // 默认认为YES
+    config.preferences.javaScriptEnabled = YES;
+    // 在iOS上默认为NO，表示不能自动通过窗口打开
+    config.preferences.javaScriptCanOpenWindowsAutomatically = NO;
+    
+    // web内容处理池
+    config.processPool = [[WKProcessPool alloc] init];
+    
+    // 通过JS与webview内容交互
+    config.userContentController = [[WKUserContentController alloc] init];
+    // 注入JS对象名称AppModel，当JS通过AppModel来调用时，
+    // 我们可以在WKScriptMessageHandler代理中接收到
+    [config.userContentController addScriptMessageHandler:self name:@"AppModel"];
+    
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight - 64) configuration:config];
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.URL]]];
     self.webView = webView;
     webView.navigationDelegate = self;
@@ -28,6 +48,17 @@
     [self initNaviBar];
     // Do any additional setup after loading the view.
 }
+
+#pragma mark - WKScriptMessageHandler
+- (void)userContentController:(WKUserContentController *)userContentController
+      didReceiveScriptMessage:(WKScriptMessage *)message {
+    if ([message.name isEqualToString:@"AppModel"]) {
+        // 打印所传过来的参数，只支持NSNumber, NSString, NSDate, NSArray,
+        // NSDictionary, and NSNull类型
+        NSLog(@"%@", message.body);
+    }
+}
+
 - (void)initNaviBar{
     
     UIView * backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 100, 44)];

ALand/General/Categories/NSString+Category.m

@@ -99,7 +99,7 @@
         /**
          * 电信号段正则表达式
          */
-        NSString *CT_NUM = @"^((133)|(153)|(177)|(18[0,1,9]))\\d{8}$";
+        NSString *CT_NUM = @"^((133)|(153)|(177)|(173)|(18[0,1,9]))\\d{8}$";
         NSPredicate *pred1 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CM_NUM];
         BOOL isMatch1 = [pred1 evaluateWithObject:self];
         NSPredicate *pred2 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CU_NUM];

ALand/Macro/AppHeader.h

@@ -53,6 +53,8 @@
 #define IsDictObject(Object)             [(Object) isKindOfClass:[NSDictionary class]]
 #define IsErrorObject(Object)            ![(Object) isKindOfClass:[NSError class]]
 
+#define SAFE_STRING(string) string ? string : @""
+
 #define kSysWhite         [UIColor whiteColor]
 #define kButtonAddAction(button, buttonAction) [button addTarget:self action:@selector(buttonAction) forControlEvents:UIControlEventTouchUpInside];
 #define kMoneyFromDouble(doubleData) [NSString stringWithFormat:@"￥%.2f", doubleData]

AutoBuild.sh

+#! /bin/bash
+
+python autobuild.py -w Aland.xcworkspace -s Aland -o /Users/z/Desktop/RealEstateManagement.ipa

autobuild.py

+from optparse import OptionParser
+import subprocess
+import requests
+
+#configuration for iOS build setting
+CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
+PROVISIONING_PROFILE = "58fbd91c-bd71-4896-9f69-a42d78c6dcd2"
+CONFIGURATION = "Release"
+SDK = "iphoneos"
+
+# configuration for pgyer
+PGYER_UPLOAD_URL = "http://www.pgyer.com/apiv1/app/upload"
+DOWNLOAD_BASE_URL = "http://www.pgyer.com"
+USER_KEY = "7177be6d7a474d4444675e716f64e66d"
+API_KEY = "e76d1eeacca62bc9310120f34febcbc8"
+
+def cleanBuildDir(buildDir):
+	cleanCmd = "rm -r %s" %(buildDir)
+	process = subprocess.Popen(cleanCmd, shell = True)
+	process.wait()
+	print "cleaned buildDir: %s" %(buildDir)
+
+
+def parserUploadResult(jsonResult):
+	resultCode = jsonResult['code']
+	if resultCode == 0:
+		downUrl = DOWNLOAD_BASE_URL +"/"+jsonResult['data']['appShortcutUrl']
+		print "Upload Success"
+		print "DownUrl is:" + downUrl
+	else:
+		print "Upload Fail!"
+		print "Reason:"+jsonResult['message']
+
+def uploadIpaToPgyer(ipaPath):
+    print "ipaPath:"+ipaPath
+    files = {'file': open(ipaPath, 'rb')}
+    headers = {'enctype':'multipart/form-data'}
+    payload = {'uKey':USER_KEY,'_api_key':API_KEY,'publishRange':'2','isPublishToPublic':'2'}
+    print "uploading...."
+    r = requests.post(PGYER_UPLOAD_URL, data = payload ,files=files,headers=headers)
+    if r.status_code == requests.codes.ok:
+         result = r.json()
+         parserUploadResult(result)
+    else:
+        print 'HTTPError,Code:'+r.status_code
+
+def buildProject(project, target, output):
+	buildCmd = 'xcodebuild -project %s -target %s -sdk %s -configuration %s build CODE_SIGN_IDENTITY="%s" PROVISIONING_PROFILE="%s"' %(project, target, SDK, CONFIGURATION, CODE_SIGN_IDENTITY, PROVISIONING_PROFILE)
+	process = subprocess.Popen(buildCmd, shell = True)
+	process.wait()
+
+	signApp = "./build/%s-iphoneos/%s.app" %(CONFIGURATION, target)
+	signCmd = "xcrun -sdk %s -v PackageApplication %s -o %s" %(SDK, signApp, output)
+	process = subprocess.Popen(signCmd, shell=True)
+	(stdoutdata, stderrdata) = process.communicate()
+
+	uploadIpaToPgyer(output)
+	cleanBuildDir("./build")
+
+def buildWorkspace(workspace, scheme, output):
+	process = subprocess.Popen("pwd", stdout=subprocess.PIPE)
+	(stdoutdata, stderrdata) = process.communicate()
+	buildDir = stdoutdata.strip() + '/build'
+	print "buildDir: " + buildDir
+	buildCmd = 'xcodebuild -workspace %s -scheme %s -sdk %s -configuration %s build CODE_SIGN_IDENTITY="%s" PROVISIONING_PROFILE="%s" SYMROOT=%s' %(workspace, scheme, SDK, CONFIGURATION, CODE_SIGN_IDENTITY, PROVISIONING_PROFILE, buildDir)
+	process = subprocess.Popen(buildCmd, shell = True)
+	process.wait()
+
+	signApp = "./build/%s-iphoneos/%s.app" %(CONFIGURATION, scheme)
+	signCmd = "xcrun -sdk %s -v PackageApplication %s -o %s" %(SDK, signApp, output)
+        print "xcrunDir myTest" + signCmd
+	process = subprocess.Popen(signCmd, shell=True)
+	(stdoutdata, stderrdata) = process.communicate()
+
+	uploadIpaToPgyer(output)
+	cleanBuildDir(buildDir)
+
+def xcbuild(options):
+	project = options.project
+	workspace = options.workspace
+	target = options.target
+	scheme = options.scheme
+	output = options.output
+
+	if project is None and workspace is None:
+		pass
+	elif project is not None:
+		buildProject(project, target, output)
+	elif workspace is not None:
+		buildWorkspace(workspace, scheme, output)
+
+def main():
+	
+	parser = OptionParser()
+	parser.add_option("-w", "--workspace", help="Build the workspace name.xcworkspace.", metavar="name.xcworkspace")
+	parser.add_option("-p", "--project", help="Build the project name.xcodeproj.", metavar="name.xcodeproj")
+	parser.add_option("-s", "--scheme", help="Build the scheme specified by schemename. Required if building a workspace.", metavar="schemename")
+	parser.add_option("-t", "--target", help="Build the target specified by targetname. Required if building a project.", metavar="targetname")
+	parser.add_option("-o", "--output", help="specify output filename", metavar="output_filename")
+
+	(options, args) = parser.parse_args()
+
+	print "options: %s, args: %s" % (options, args)
+
+	xcbuild(options)
+
+if __name__ == '__main__':
+	main()