对账单界面细节修改

autobuild.py

+from optparse import OptionParser
+import subprocess
+import requests
+import time
+
+# configuration for iOS build setting
+CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
+PROVISIONING_PROFILE = "da8de50e-62c2-4312-8dda-7c81fb04858d"
+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:
+        timestring = time.strftime('%Y-%m-%d-%H-%M', time.localtime())
+        outputfile = output + timestring + workspace + '.ipa'
+        buildWorkspace(workspace, scheme, outputfile)
+
+
+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()

vanke/view_iPhone/templates/salesInput/Controller/ChooseShopViewController.m

@@ -72,7 +72,7 @@
     self.searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
     self.searchBar.backgroundImage = [UIImage imageWithColor:[UIColor colorWithRed:0.953 green:0.439 blue:0.063 alpha:1.000]];
     self.searchBar.tintColor = [UIColor whiteColor];
-    self.searchBar.placeholder = @"请输入关键字";
+    self.searchBar.placeholder = @"请输入店铺名称或代码";
     self.searchBar.delegate = self;
     [self.view addSubview:self.searchBar];
 }

vanke/view_iPhone/templates/salesInput/Controller/HistoryViewController.m

@@ -43,6 +43,7 @@
     [self setUpTopView];
     [self setUPScrollView];
     [self setUpData];
+    self.imageNoData.hidden = NO;
     // Do any additional setup after loading the view.
 }
 

vanke/view_iPhone/templates/statements/Statement.storyboard

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
@@ -389,7 +389,7 @@
                                     </mask>
                                 </variation>
                             </view>
-                            <searchBar contentMode="redraw" placeholder="请输入商家代码或名称" translatesAutoresizingMaskIntoConstraints="NO" id="GLM-IL-sNq">
+                            <searchBar contentMode="redraw" placeholder="请输入商家名称" translatesAutoresizingMaskIntoConstraints="NO" id="GLM-IL-sNq">
                                 <rect key="frame" x="0.0" y="155" width="375" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="52y-Hi-VUa"/>
@@ -408,7 +408,7 @@
                                         <rect key="frame" x="0.0" y="28" width="375" height="107"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZEc-yo-0gy" id="Gmk-Kr-RRS">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="106"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="106.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bill_no_image_default" translatesAutoresizingMaskIntoConstraints="NO" id="Dty-co-xso">
@@ -924,7 +924,7 @@
                                         <rect key="frame" x="0.0" y="28" width="375" height="93"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DgR-Pc-jT9" id="tOd-DC-jW9">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="92"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="92.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="money_add.png" translatesAutoresizingMaskIntoConstraints="NO" id="dMV-L1-5ad">

vanke/view_iPhone/templates/statements/Views/StatementDetailCell.m

@@ -34,9 +34,9 @@
     StatementDetailItems *item = array[indexPath.row];
     self.labelTitle.text = item.subject;
     self.labelDate.text = [NSString stringWithFormat:@"%@~%@",item.beginDate,item.endDate];
-    self.labelShouldPay.text = [NSString stringWithFormat:@"%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:item.amount] Lenth:2 isSeparate:YES]];
-    self.labelPaidIn.text = [NSString stringWithFormat:@"[已缴]%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:item.paid] Lenth:2 isSeparate:YES]];
-    self.labelUnPaid.text = [NSString stringWithFormat:@"[未缴]%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:item.unpaid] Lenth:2 isSeparate:YES]];
+    self.labelShouldPay.text = [NSString stringWithFormat:@"%@元",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:item.amount] Lenth:2 isSeparate:YES]];
+    self.labelPaidIn.text = [NSString stringWithFormat:@"[已缴]%@元",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:item.paid] Lenth:2 isSeparate:YES]];
+    self.labelUnPaid.text = [NSString stringWithFormat:@"[未缴]%@元",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:item.unpaid] Lenth:2 isSeparate:YES]];
     if (item.direction < 0) {
         self.img.image = [UIImage imageNamed:@"money_reduce"];
     }else{

vanke/view_iPhone/templates/statements/Views/StatementTableViewCell.m

@@ -28,9 +28,9 @@
 - (void)setUpCellWithArray:(NSArray *)array index:(NSIndexPath *)indexPath {
     StatementRecords *model = array[indexPath.row];
     self.labelTitle.text = [NSString stringWithFormat:@"%@", model.shopName];
-    self.labelShouldPay.text =  [CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:model.amount] Lenth:2 isSeparate:YES];
-    self.labelPaidIn.text = [NSString stringWithFormat:@"[已缴]%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:model.paid] Lenth:2 isSeparate:YES]];
-    self.labelUnPaid.text = [NSString stringWithFormat:@"[未缴]%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:model.unpaid] Lenth:2 isSeparate:YES]];
+    self.labelShouldPay.text = [NSString stringWithFormat:@"%@元",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:model.amount] Lenth:2 isSeparate:YES]];
+    self.labelPaidIn.text = [NSString stringWithFormat:@"[已缴]%@元",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:model.paid] Lenth:2 isSeparate:YES]];
+    self.labelUnPaid.text = [NSString stringWithFormat:@"[未缴]%@元",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:model.unpaid] Lenth:2 isSeparate:YES]];
     
 }
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {