Merge branch 'master_01'

Conflicts:
	vanke.xcodeproj/project.pbxproj

vanke.xcodeproj/project.pbxproj

@@ -4215,6 +4215,7 @@
 					C1D58B151BB1BC9200D297FE = {
 						CreatedOnToolsVersion = 7.0;
 						DevelopmentTeam = 2G3393EZPN;
+
 					};
 				};
 			};
@@ -5097,7 +5098,7 @@
 					/usr/include/libxml2,
 				);
 				INFOPLIST_FILE = vanke/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.vanke;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5122,7 +5123,7 @@
 					/usr/include/libxml2,
 				);
 				INFOPLIST_FILE = vanke/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.vanke;
 				PRODUCT_NAME = "$(TARGET_NAME)";

vanke/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>zh_CN</string>
+	<key>CFBundleDisplayName</key>
+	<string>万科</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -12,16 +14,16 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleDisplayName</key>
-	<string>万科</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
+
 	<string>1.0.8</string>
+
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

vanke/view_iPhone/templates/floor-list/VankePassengerListBoardCell_iPhone.h

@@ -9,7 +9,7 @@
 AS_OUTLET( BeeUIImageView,      imgPhoto )
 AS_OUTLET( BeeUILabel,          lblName )
 AS_OUTLET( BeeUILabel,          lblOpenDate )
-AS_OUTLET( BeeUILabel,          lblSaleAmount )
+AS_OUTLET( BeeUILabel,          lblPassengerFlow )
 
 @end
 

vanke/view_iPhone/templates/floor-list/VankePassengerListBoardCell_iPhone.m

@@ -13,7 +13,7 @@ SUPPORT_AUTOMATIC_LAYOUT(YES)
 DEF_OUTLET( BeeUIImageView,     imgPhoto )
 DEF_OUTLET( BeeUILabel,         lblName )
 DEF_OUTLET( BeeUILabel,         lblOpenDate )
-DEF_OUTLET( BeeUILabel,         lblSaleAmount )
+DEF_OUTLET( BeeUILabel,         lblPassengerFlow)
 
 - (BOOL)dataWillChange:(id)newData
 {
@@ -33,8 +33,10 @@ DEF_OUTLET( BeeUILabel,         lblSaleAmount )
         self.lblName.data = prj.projectName;
         self.imgPhoto.data = [prj getPictureUrlOrDefault];
         self.lblOpenDate.data = prj.foundingDate;
-        self.lblSaleAmount.data = prj.salesAmount;
-        $(self.lblSaleAmount).ADD_CLASS(obj.theme);
+//        self.lblSaleAmount.data = prj.salesAmount;
+//        $(self.lblSaleAmount).ADD_CLASS(obj.theme);
+        self.lblPassengerFlow.data = prj.passengerFlowVolume;
+        $(self.lblPassengerFlow).ADD_CLASS(obj.theme);
     }
 }
 

vanke/view_iPhone/templates/floor-list/VankePassengerListBoardCell_iPhone.xml

@@ -18,9 +18,9 @@
             </linear>
             
             <linear orientation="h" class="row sale-amount-wrapper">
-                <label class="lbl floor-ctr">销售额:</label>
-                <label id="lblSaleAmount" class="value floor-ctr"></label>
-                <label class="unit floor-ctr">元</label>
+                <label class="lbl floor-ctr">客流:</label>
+                <label id="lblPassengerFlow" class="value floor-ctr"></label>
+                <label class="unit floor-ctr">人</label>
             </linear>
         </linear>
     </linear>
@@ -113,7 +113,7 @@
             float: right;
         }
         
-        #lblSaleAmount {
+        #lblPassengerFlow {
             padding-right: -15px;
         }