fix bugs

vanke/Info.plist

@@ -12,6 +12,8 @@
 	<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>

vanke/VankeConfig.h

@@ -28,7 +28,7 @@
 #define VANKE_SERVER_BASE_URL @"http://218.244.151.129:7580/wanke-server/rest"
 
 // 后台多媒体文件基准地址
-#define VANKE_SERVER_MEDIA_BASE_URL @"http://218.244.151.129:7580/wanke-server/static/porjects"
+#define VANKE_SERVER_MEDIA_BASE_URL @"http://218.244.151.129:7580/"
 
 // 后台服务企业认证码
 #define VANKE_AUTHENTI_CODE @"211534962"

vanke/controller/VankeProjectListAPI.h

@@ -37,7 +37,7 @@
 @end
 
 // 项目汇总信息
-@interface ProjectCategory: BeeActiveObject
+@interface ProjectCategory : BeeActiveObject
 
 // 项目名称
 @property (nonatomic, strong) NSString *projectClassification;
@@ -54,13 +54,16 @@
 // 客单价
 @property (nonatomic, strong) NSNumber *perCustomerTransaction;
 // 图片URL
-@property (nonatomic, strong) NSString *pictureUrl;
+@property (nonatomic, strong) NSString *picture;
+// 销售日期
+@property (nonatomic, strong) NSString *salesDate;
+
 
 -(NSString*) getPictureUrlOrDefault;
 
 @end
 
-@interface ProjectListResponse: VankeResponse
+@interface ProjectListResponse : VankeResponse
 
 @property (nonatomic, strong) NSArray *data;
 

vanke/controller/VankeProjectListAPI.m

@@ -80,14 +80,14 @@
 @synthesize salesAmount;
 @synthesize passengerFlowVolume;
 @synthesize perCustomerTransaction;
-@synthesize pictureUrl;
+@synthesize picture;
+@synthesize salesDate;
 
 -(NSString*) getPictureUrlOrDefault {
-    if ([VankeUtil isBlankString:self.pictureUrl]) {
+    if ([VankeUtil isBlankString:self.picture]) {
         return @"floor-def.jpg";
     } else {
-        return self.pictureUrl;
-        //        return [NSString stringWithFormat:@"%@/%@", VANKE_SERVER_MEDIA_BASE_URL, self.picture];
+        return [NSString stringWithFormat:@"%@/%@", VANKE_SERVER_MEDIA_BASE_URL, self.picture];
     }
 }
 

vanke/view_iPhone/templates/floor-detail/VankeFloorDetailBoardPhoto_iPhone.m

@@ -16,97 +16,18 @@ DEF_OUTLET(BeeUILabel, lblOpenDate)
 
 - (void)dataDidChanged
 {
-	ProjectCategory * prj = self.data;
-	if ( prj )
-	{
-		$(self.imgPhoto).DATA([prj getPictureUrlOrDefault]);
+    ProjectCategory * prj = self.data;
+    if ( prj )
+    {
+        $(self.imgPhoto).DATA([prj getPictureUrlOrDefault]);
         $(self.lblName).DATA(prj.projectName);
-        $(self.lblOpenDate).DATA(prj.foundingDate);
-	}
+        $(self.lblOpenDate).DATA(prj.salesDate);
+        
+    }
 }
 
 ON_CREATE_VIEWS( signal )
 {
-//    NSArray *items = @[[PNPieChartDataItem dataItemWithValue:10 color:PNRed],
-//                       [PNPieChartDataItem dataItemWithValue:20 color:PNBlue description:@"WWDC"],
-//                       [PNPieChartDataItem dataItemWithValue:40 color:PNGreen description:@"GOOL I/O"],
-//                       ];
-//    PNPieChart *pieChart = [[PNPieChart alloc] initWithFrame:CGRectMake(40.0, 155.0, 240.0, 240.0) items:items];
-//    pieChart.descriptionTextColor = [UIColor whiteColor];
-//    pieChart.descriptionTextFont  = [UIFont fontWithName:@"Avenir-Medium" size:14.0];
-//    [pieChart strokeChart];
 }
 
-//- (void)userClickedOnBarAtIndex:(NSInteger)barIndex
-//{
-//    
-//    NSLog(@"Click on bar %@", @(barIndex));
-//    
-//    PNBar * bar = [self.barChart.bars objectAtIndex:barIndex];
-//    
-//    CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.scale"];
-//    
-//    animation.fromValue = @1.0;
-//    animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-//    animation.toValue = @1.1;
-//    animation.duration = 0.2;
-//    animation.repeatCount = 0;
-//    animation.autoreverses = YES;
-//    animation.removedOnCompletion = YES;
-//    animation.fillMode = kCAFillModeForwards;
-//    
-//    [bar.layer addAnimation:animation forKey:@"Float"];
-//}
-
-//- (IBAction)rightSwitchChanged:(id)sender {
-//    if ([self.title isEqualToString:@"Pie Chart"]){
-//        UISwitch *showLabels = (UISwitch*) sender;
-//        if (showLabels.on) {
-//            self.pieChart.showOnlyValues = NO;
-//        }else{
-//            self.pieChart.showOnlyValues = YES;
-//        }
-//        [self.pieChart strokeChart];
-//    }
-//    if ([self.title isEqualToString:@"Radar Chart"]){
-//        UISwitch *showLabels = (UISwitch*) sender;
-//        if (showLabels.on) {
-//            self.radarChart.isShowGraduation = NO;
-//        }else{
-//            self.radarChart.isShowGraduation = YES;
-//        }
-//        [self.radarChart strokeChart];
-//    }
-//}
-//
-//- (IBAction)centerSwitchChanged:(id)sender
-//{
-//    if (self.pieChart)
-//    {
-//        [self.pieChart setEnableMultipleSelection:self.centerSwitch.on];
-//        [self.pieChart strokeChart];
-//    }
-//}
-//
-//- (IBAction)leftSwitchChanged:(id)sender {
-//    if ([self.title isEqualToString:@"Pie Chart"]){
-//        UISwitch *showRelative = (UISwitch*) sender;
-//        if (showRelative.on) {
-//            self.pieChart.showAbsoluteValues = NO;
-//        }else{
-//            self.pieChart.showAbsoluteValues = YES;
-//        }
-//        [self.pieChart strokeChart];
-//    }
-//    if ([self.title isEqualToString:@"Radar Chart"]){
-//        UISwitch *showRelative = (UISwitch*) sender;
-//        if (showRelative.on) {
-//            self.radarChart.labelStyle = PNRadarChartLabelStyleHorizontal;
-//        }else{
-//            self.radarChart.labelStyle = PNRadarChartLabelStyleCircle;
-//        }
-//        [self.radarChart strokeChart];
-//    }
-//}
-
 @end

vanke/view_iPhone/templates/floor-detail/VankeFloorDetailBoard_iPhone.h

@@ -12,8 +12,6 @@
 @property (strong, nonatomic) ProjectCategory* data;
 @property (strong, nonatomic) NSString *salesDate;
 
-//AS_MODEL( ShotInfoModel,		info );
-//AS_MODEL( ShotCommentsModel,	comments );
 AS_MODEL( VankeSaleVolumeModel, saleVolumeModel );
 
 AS_OUTLET( BeeUIScrollView,             list );

vanke/view_iPhone/templates/floor-detail/VankeFloorDetailBoard_iPhone.m

 
 
 #import "VankeFloorDetailBoard_iPhone.h"
-//#import "DribbbleDetailBoardPlayer_iPhone.h"
 #import "VankeFloorDetailBoardPhoto_iPhone.h"
-//#import "DribbbleDetailBoardComment_iPhone.h"
-//#import "DribbblePreviewBoard_iPhone.h"
-//#import "DribbbleProfileBoard_iPhone.h"
-//#import "DribbbleWebBoard_iPhone.h"
 #import "PullLoader.h"
 #import "FootLoader.h"
 #import "VankeBusinessChartCell_iPhone.h"
 
 #pragma mark - VankeFloorDetailBoard_iPhone
 
-@interface VankeFloorDetailBoard_iPhone()
+@interface VankeFloorDetailBoard_iPhone ()
 AS_SIGNAL( VIEW_PROFILE )
 AS_SIGNAL( VIEW_URL )
 @end
@@ -31,26 +26,17 @@ SUPPORT_RESOURCE_LOADING( YES );
 DEF_SIGNAL( VIEW_PROFILE )
 DEF_SIGNAL( VIEW_URL )
 
-//DEF_MODEL( ShotInfoModel,		info );
-//DEF_MODEL( ShotCommentsModel,	comments );
-DEF_MODEL( VankeSaleVolumeModel,	saleVolumeModel );
+DEF_MODEL( VankeSaleVolumeModel,        saleVolumeModel );
 
-DEF_OUTLET( BeeUIScrollView,	list );
+DEF_OUTLET( BeeUIScrollView,    list );
 
 - (void)load
 {
-//	self.info = [ShotInfoModel modelWithObserver:self];
-//	self.comments = [ShotCommentsModel modelWithObserver:self];
     self.saleVolumeModel = [VankeSaleVolumeModel modelWithObserver:self];
 }
 
 - (void)unload
 {
-//	[self.comments removeAllObservers];
-//	self.comments = nil;
-//	
-//	[self.info removeAllObservers];
-//	self.info = nil;
     [self.saleVolumeModel removeAllObservers];
     self.saleVolumeModel = nil;
 }
@@ -59,29 +45,28 @@ DEF_OUTLET( BeeUIScrollView,	list );
 
 ON_CREATE_VIEWS( signal )
 {
-//	self.view.backgroundColor = SHORT_RGB( 0x444 );
     self.view.backgroundColor = [UIColor whiteColor];
-
-//	self.allowedSwipeToBack = YES;
-	
-	self.navigationBarShown = YES;
-	self.navigationBarTitle = self.data.projectName;
-	self.navigationBarLeft  = [UIImage imageNamed:@"left_arrow"];
-
-	self.list.headerClass = [PullLoader class];
-	self.list.headerShown = YES;
-	
-	self.list.footerClass = [FootLoader class];
-	self.list.footerShown = YES;
-
-	self.list.lineCount = 1;
-	self.list.vertical = YES;
-	self.list.animationDuration = 0.25f;
-	self.list.baseInsets = bee.ui.config.baseInsets;
-	
-	self.list.whenReloading = ^
-	{
-        int chartTotal = 0;
+    
+    //	self.allowedSwipeToBack = YES;
+    
+    self.navigationBarShown = YES;
+    self.navigationBarTitle = self.data.projectName;
+    self.navigationBarLeft  = [UIImage imageNamed:@"left_arrow"];
+    
+    self.list.headerClass = [PullLoader class];
+    self.list.headerShown = YES;
+    
+    self.list.footerClass = [FootLoader class];
+    self.list.footerShown = YES;
+    
+    self.list.lineCount = 1;
+    self.list.vertical = YES;
+    self.list.animationDuration = 0.25f;
+    self.list.baseInsets = bee.ui.config.baseInsets;
+    
+    self.list.whenReloading = ^
+    {
+        NSInteger chartTotal = 0;
         ProjectSaleVolumeResponse *resp = [_saleVolumeModel getServerResp];
         NSArray *dimensions = nil;
         if (nil != resp) {
@@ -90,11 +75,12 @@ ON_CREATE_VIEWS( signal )
         }
         
         self.list.total = 1 + chartTotal;
-
-		BeeUIScrollItem * photo = self.list.items[0];
-		photo.clazz = [VankeFloorDetailBoardPhoto_iPhone class];
-		photo.data = self.data;
-		photo.order = 0;
+        
+        BeeUIScrollItem * photo = self.list.items[0];
+        photo.clazz = [VankeFloorDetailBoardPhoto_iPhone class];
+        self.data.salesDate = self.salesDate;
+        photo.data = self.data;
+        photo.order = 0;
         photo.size = CGSizeMake(0, 230);
         
         for (int i = 0; i < chartTotal; ++i) {
@@ -112,22 +98,22 @@ ON_CREATE_VIEWS( signal )
             bizChart.order = 0;
             bizChart.size = CGSizeMake(0, 250);
         }
-	};
-	
-	self.list.whenHeaderRefresh = ^
-	{
+    };
+    
+    self.list.whenHeaderRefresh = ^
+    {
         [self reloadSalesolumeModel];
-	};
-	
-	self.list.whenFooterRefresh = ^
-	{
+    };
+    
+    self.list.whenFooterRefresh = ^
+    {
         [self reloadSalesolumeModel];
-	};
-	
-	self.list.whenReachBottom = ^
-	{
+    };
+    
+    self.list.whenReachBottom = ^
+    {
         [self reloadSalesolumeModel];
-	};
+    };
 }
 
 ON_DELETE_VIEWS( signal )
@@ -140,16 +126,6 @@ ON_LAYOUT_VIEWS( signal )
 
 ON_WILL_APPEAR( signal )
 {
-//	if ( NO == self.info.loaded )
-//	{
-//		[self.info reload];
-//	}
-//
-//	if ( NO == self.comments.loaded )
-//	{
-//		[self.comments firstPage];
-//	}
-    
     [self.saleVolumeModel reload];
     [self.list reloadData];
 }
@@ -176,82 +152,28 @@ ON_RIGHT_BUTTON_TOUCHED( signal )
 
 ON_SIGNAL3( DribbbleDetailBoardPlayer_iPhone, mask, signal )
 {
-//	DribbbleProfileBoard_iPhone * board = [DribbbleProfileBoard_iPhone board];
-//	board.player = self.info.shot.player;
-//	[self.stack pushBoard:board animated:YES];
 }
 
 #pragma mark -
 
 ON_SIGNAL3( VankeFloorDetailBoardPhoto_iPhone, mask, signal )
 {
-//	DribbblePreviewBoard_iPhone * board = [DribbblePreviewBoard_iPhone board];
-//	board.shot = self.info.shot;
-//	[self.stack pushBoard:board animated:YES];
-}
-
-#pragma mark -
-
-ON_SIGNAL3( DribbbleDetailBoardComment_iPhone, mask, signal )
-{
-//	COMMENT * comment = signal.sourceCell.data;
-//	NSArray * urls = [comment.body allURLs];
-//
-//	if ( urls.count )
-//	{
-//		BeeUIActionSheet * actionSheet = [[[BeeUIActionSheet alloc] init] autorelease];
-//		
-//		[actionSheet addButtonTitle:[NSString stringWithFormat:@"%@", comment.player.name]
-//							 signal:self.VIEW_PROFILE
-//							 object:comment.player];
-//
-//		for ( NSString * url in urls )
-//		{
-//			[actionSheet addButtonTitle:url signal:self.VIEW_URL object:url];
-//		}
-//
-//		[actionSheet addCancelTitle:@"Cancel"];
-//		
-//		[actionSheet showInViewController:self];
-//	}
-//	else
-//	{
-//		DribbbleProfileBoard_iPhone * board = [DribbbleProfileBoard_iPhone board];
-//		board.player = comment.player;
-//		[self.stack pushBoard:board animated:YES];
-//	}
-}
-
-#pragma mark -
-
-ON_SIGNAL3( VankeFloorDetailBoard_iPhone, VIEW_PROFILE, signal )
-{
-//	DribbbleProfileBoard_iPhone * board = [DribbbleProfileBoard_iPhone board];
-//	board.player = signal.object;
-//	[self.stack pushBoard:board animated:YES];
-}
-
-ON_SIGNAL3( VankeFloorDetailBoard_iPhone, VIEW_URL, signal )
-{
-//	DribbbleWebBoard_iPhone * board = [DribbbleWebBoard_iPhone board];
-//	board.url = signal.object;
-//	[self.stack pushBoard:board animated:YES];
 }
 
 #pragma mark -
 
 ON_SIGNAL3( VankeSaleVolumeModel, RELOADING, signal )
 {
-	self.list.headerLoading = self.saleVolumeModel.loaded;
-	self.list.footerLoading = YES;
+    self.list.headerLoading = self.saleVolumeModel.loaded;
+    self.list.footerLoading = YES;
 }
 
 ON_SIGNAL3( VankeSaleVolumeModel, RELOADED, signal )
 {
-	self.list.headerLoading = NO;
-	self.list.footerLoading = NO;
+    self.list.headerLoading = NO;
+    self.list.footerLoading = NO;
     self.list.footerMore = NO;
-	[self.list reloadData];
+    [self.list reloadData];
 }
 
 -(void) reloadSalesolumeModel {

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

@@ -5,14 +5,21 @@
 
 #pragma mark -
 
+typedef enum {
+    CELL_TYPE_FLOOR = 0,
+    CELL_TYPE_PASSENGER
+} CellType;
+
+#pragma mark -
+
 @interface VankeFloorListBoardCell_iPhone : BeeUICell
 
-AS_OUTLET( BeeUIImageView,	imgPhoto )
-AS_OUTLET( BeeUILabel,		lblName )
-AS_OUTLET( BeeUILabel,		lblOpenDate )
-AS_OUTLET( BeeUILabel,		lblSaleAmount )
-AS_OUTLET( BeeUILabel,		lblPassenger )
-AS_OUTLET( BeeUILabel,		lblPrice )
+AS_OUTLET( BeeUIImageView,      imgPhoto )
+AS_OUTLET( BeeUILabel,          lblName )
+AS_OUTLET( BeeUILabel,          lblOpenDate )
+AS_OUTLET( BeeUILabel,          lblSaleAmount )
+AS_OUTLET( BeeUILabel,          lblPassengerFlow )
+AS_OUTLET( BeeUILabel,          lblPrice )
 
 @end
 
@@ -22,6 +29,7 @@ AS_OUTLET( BeeUILabel,		lblPrice )
 
 @property (strong, nonatomic) NSString *theme;
 @property (strong, nonatomic) ProjectCategory *project;
+@property (assign, nonatomic) CellType cellType;
 
 @end
 

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

@@ -10,38 +10,42 @@
 SUPPORT_RESOURCE_LOADING(YES)
 SUPPORT_AUTOMATIC_LAYOUT(YES)
 
-DEF_OUTLET( BeeUIImageView,	imgPhoto )
-DEF_OUTLET( BeeUILabel,		lblName )
-DEF_OUTLET( BeeUILabel,		lblOpenDate )
-DEF_OUTLET( BeeUILabel,		lblSaleAmount )
-DEF_OUTLET( BeeUILabel,		lblPassenger )
-DEF_OUTLET( BeeUILabel,		lblPrice )
+DEF_OUTLET( BeeUIImageView,     imgPhoto )
+DEF_OUTLET( BeeUILabel,         lblName )
+DEF_OUTLET( BeeUILabel,         lblOpenDate )
+DEF_OUTLET( BeeUILabel,         lblSaleAmount )
+DEF_OUTLET( BeeUILabel,         lblPassengerFlow )
+DEF_OUTLET( BeeUILabel,         lblPrice )
 
 - (BOOL)dataWillChange:(id)newData
 {
-	return newData != self.data;
+    return newData != self.data;
 }
 
 - (void)dataDidChanged
 {
-	FloorCellValue * obj = self.data;
+    FloorCellValue * obj = self.data;
     if (nil == obj) {
         return;
     }
     
-//    $(self.lblSaleAmount).SET_CLASS(obj.theme);
-    $(self.lblSaleAmount).ADD_CLASS(obj.theme);
-    
     ProjectCategory *prj = obj.project;
-	if ( prj )
-	{
+    if ( prj )
+    {
         self.lblName.data = prj.projectName;
         self.imgPhoto.data = [prj getPictureUrlOrDefault];
         self.lblOpenDate.data = prj.foundingDate;
         self.lblSaleAmount.data = prj.salesAmount;
-        self.lblPassenger.data = prj.passengerFlowVolume;
+        self.lblPassengerFlow.data = prj.passengerFlowVolume;
         self.lblPrice.data = prj.perCustomerTransaction;
-	}
+    }
+    
+    if (obj.cellType == CELL_TYPE_PASSENGER) {
+        $(@".floor-ctr").HIDE();
+        $(self.lblPassengerFlow).ADD_CLASS(obj.theme);
+    } else {
+        $(self.lblSaleAmount).ADD_CLASS(obj.theme);
+    }
 }
 
 @end
@@ -52,6 +56,7 @@ DEF_OUTLET( BeeUILabel,		lblPrice )
 
 @synthesize theme = _theme;
 @synthesize project = _project;
+@synthesize cellType = _cellType;
 
 @end
 

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

@@ -12,15 +12,11 @@
         </linear>
 
         <linear orientation="v" class="data-wrapper">
-            <linear orientation="h" class="row open-date-wrapper">
-                <label class="lbl">开盘日期:</label>
-                <label id="lblOpenDate" class="value"></label>
-            </linear>
             
-            <linear orientation="h" class="row sale-amount-wrapper">
-                <label class="lbl">销售额:</label>
-                <label id="lblSaleAmount" class="value">0</label>
-                <label class="unit">元</label>
+            <linear orientation="h" class="row price-wrapper">
+                <label class="lbl">客单价:</label>
+                <label id="lblPrice" class="value">0</label>
+                <label class="unit">元/人</label>
             </linear>
             
             <linear orientation="h" class="row flow-wrapper">
@@ -29,15 +25,23 @@
                 <label class="unit">人</label>
             </linear>
             
-            <linear orientation="h" class="row price-wrapper">
-                <label class="lbl">客单价:</label>
-                <label id="lblPrice" class="value">0</label>
-                <label class="unit">元/人</label>
+            <linear orientation="h" class="row open-date-wrapper">
+                <label class="lbl floor-ctr">开盘日期:</label>
+                <label id="lblOpenDate" class="value floor-ctr"></label>
+            </linear>
+    
+            <linear orientation="h" class="row sale-amount-wrapper">
+                <label class="lbl floor-ctr">销售额:</label>
+                <label id="lblSaleAmount" class="value floor-ctr">0</label>
+                <label class="unit floor-ctr">元</label>
             </linear>
+            
+            
         </linear>
     </linear>
     
     <style type="text/css">
+        
         .wrapper {
             width: 100%;
             height: 100%;
@@ -55,13 +59,12 @@
         
         .photo {
             width: 100%;
-            height: 100%;
-            padding-bottom: 90px;
+            height: 155px;
             background-color: #999;
             image-mode: fill;
             image-loading: white;
         }
-        
+    
         .mask {
             width: 100%;
             height: 100%;
@@ -73,7 +76,7 @@
         .name-wrapper {
             position: absolute;
             left: 0px;
-            bottom: 90px;
+            top: 115px;
             width: 100%;
             height: 40px;
         }
@@ -97,10 +100,9 @@
         
         .data-wrapper {
             width: 100%;
-            height: 80px;
             position: absolute;
             left: 0px;
-            bottom: 3px;
+            top: 155px;
         }
         
         .data-wrapper .row {
@@ -138,21 +140,22 @@
             padding-right: -32px;
         }
         
-        .data-wrapper .sale-amount-wrapper .value {
+        .data-wrapper .value.red {
+            color: #ed1b23;
             font-size: 15px;
             font-weight: bold;
         }
         
-        .data-wrapper .sale-amount-wrapper .red {
-            color: #ed1b23;
-        }
-        
-        .data-wrapper .sale-amount-wrapper .purple {
+        .data-wrapper .value.purple {
             color: #5435ad;
+            font-size: 15px;
+            font-weight: bold;
         }
         
-        .data-wrapper .sale-amount-wrapper .orange {
+        .data-wrapper .value.orange {
             color: #ea6402;
+            font-size: 15px;
+            font-weight: bold;
         }
     </style>
 </ui>

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

@@ -12,6 +12,8 @@ AS_MODEL( VankeProjectListModel, model );
 AS_OUTLET( BeeUIScrollView,     list );
 AS_OUTLET( BeeUITextField,  txtQuery);
 
+@property (assign, nonatomic) CellType listType;
+
 // 项目分类名称
 @property (strong, nonatomic) NSString *projectCategory;
 // 项目名称类似
@@ -19,4 +21,6 @@ AS_OUTLET( BeeUITextField,  txtQuery);
 // 销售日期
 @property (strong, nonatomic) NSString *salesDate;
 
++ (id)boardWithType: (CellType) type;
+
 @end

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

@@ -8,7 +8,7 @@
 #import "VankeUtil.h"
 #import "VankeProjectListAPI.h"
 
-@interface VankeFloorListBoard_iPhone()
+@interface VankeFloorListBoard_iPhone ()
 @end
 
 #pragma mark -
@@ -23,11 +23,18 @@ SUPPORT_AUTOMATIC_LAYOUT(YES)
 @synthesize projectCategory = _projectCategory;
 @synthesize projectNameLike = _projectNameLike;
 @synthesize salesDate = _salesDate;
+@synthesize listType = _listType;
 
 DEF_MODEL( VankeProjectListModel, model );
 DEF_OUTLET( BeeUIScrollView, list );
 DEF_OUTLET( BeeUITextField,  txtQuery);
 
++ (id)boardWithType: (CellType) type {
+    VankeFloorListBoard_iPhone *board = [super board];
+    board.listType = type;
+    return board;
+}
+
 - (void)load
 {
     self.model = [VankeProjectListModel modelWithObserver:self];
@@ -43,57 +50,74 @@ DEF_OUTLET( BeeUITextField,  txtQuery);
 ON_CREATE_VIEWS( signal )
 {
     [UIApplication sharedApplication].statusBarHidden = NO;
-
-	self.navigationBarShown = YES;
+    
+    self.navigationBarShown = YES;
     self.title = _projectCategory;
     
     [self addLeftIconToTextField:_txtQuery icon:@"search"];
-
-	self.list.headerClass = [PullLoader class];
-	self.list.headerShown = YES;
-
-	self.list.footerClass = [FootLoader class];
-	self.list.footerShown = YES;
-	
-	self.list.lineCount = 2;
-	self.list.animationDuration = 0.2f;
-	self.list.baseInsets = bee.ui.config.baseInsets;
-
-	self.list.whenReloading = ^
-	{
-		self.list.total = self.model.projects.count;
-		for ( BeeUIScrollItem * item in self.list.items )
-		{
-            item.size = CGSizeMake( self.list.width / self.list.lineCount, 250 );
+    
+    self.list.headerClass = [PullLoader class];
+    self.list.headerShown = YES;
+    
+    self.list.footerClass = [FootLoader class];
+    self.list.footerShown = YES;
+    
+    self.list.lineCount = 2;
+    self.list.animationDuration = 0.2f;
+    self.list.baseInsets = bee.ui.config.baseInsets;
+    
+    self.list.whenReloading = ^
+    {
+        self.list.total = self.model.projects.count;
+        if (self.list.total <= 0) {
+            self.list.total = 1;
+            BeeUIScrollItem * item = self.list.items[0];
+            
+            item.size = CGSizeMake( self.list.width, 50);
             item.order = 0;
             item.rule = BeeUIScrollLayoutRule_Fall;
-			item.clazz = [VankeFloorListBoardCell_iPhone class];
+            item.clazz = [BeeUILabel class];
+            item.data = @"没有数据，请稍后重试！";
+        } else {
+            CGFloat cellHeight = 240;
+            if (self.listType == CELL_TYPE_PASSENGER) {
+                cellHeight = 200;
+            }
             
-            ProjectCategory *prj = [self.model.projects safeObjectAtIndex:item.index];
-            FloorCellValue *cellValue = [[FloorCellValue alloc] init];
-            cellValue.theme = self.theme;
-            cellValue.project = prj;
-			item.data = cellValue;
-		}
-	};
+            for ( BeeUIScrollItem * item in self.list.items )
+            {
+                item.size = CGSizeMake( self.list.width / self.list.lineCount, cellHeight );
+                item.order = 0;
+                item.rule = BeeUIScrollLayoutRule_Fall;
+                item.clazz = [VankeFloorListBoardCell_iPhone class];
+                
+                ProjectCategory *prj = [self.model.projects safeObjectAtIndex:item.index];
+                FloorCellValue *cellValue = [[FloorCellValue alloc] init];
+                cellValue.theme = self.theme;
+                cellValue.project = prj;
+                cellValue.cellType = self.listType;
+                item.data = cellValue;
+            }
+        }
+    };
     
-	self.list.whenAnimated = ^
-	{
-	};
-	self.list.whenScrolling = ^
-	{
-	};
-	self.list.whenStop = ^
-	{
-	};
-	self.list.whenHeaderRefresh = ^
-	{
-		[self.model firstPage];
-	};
-	self.list.whenFooterRefresh = ^
-	{
-		[self.model nextPage];
-	};
+    self.list.whenAnimated = ^
+    {
+    };
+    self.list.whenScrolling = ^
+    {
+    };
+    self.list.whenStop = ^
+    {
+    };
+    self.list.whenHeaderRefresh = ^
+    {
+        [self.model firstPage];
+    };
+    self.list.whenFooterRefresh = ^
+    {
+        [self.model nextPage];
+    };
     
     self.model.classificationEquals = _projectCategory;
     self.model.nameLike = _projectNameLike;
@@ -112,14 +136,14 @@ ON_LAYOUT_VIEWS( signal )
 ON_WILL_APPEAR( signal )
 {
     self.navigationBarShown = YES;
-	[self.list reloadData];
-	
-	if ( NO == self.model.loaded )
-	{
-		[self.model firstPage];
-	}
+    [self.list reloadData];
     
-	[BeeUIRouter sharedInstance].view.pannable = YES;
+    if ( NO == self.model.loaded )
+    {
+        [self.model firstPage];
+    }
+    
+    [BeeUIRouter sharedInstance].view.pannable = YES;
 }
 
 ON_DID_APPEAR( signal )
@@ -128,7 +152,7 @@ ON_DID_APPEAR( signal )
 
 ON_WILL_DISAPPEAR( signal )
 {
-	[BeeUIRouter sharedInstance].view.pannable = NO;
+    [BeeUIRouter sharedInstance].view.pannable = NO;
 }
 
 ON_DID_DISAPPEAR( signal )
@@ -148,7 +172,7 @@ ON_SIGNAL3( VankeFloorListBoard_iPhone, txtQuery, signal )
 
 ON_SIGNAL3( VankeFloorListBoardCell_iPhone, mask, signal )
 {
-	FloorCellValue *cellValue = signal.sourceCell.data;
+    FloorCellValue *cellValue = signal.sourceCell.data;
     VankeFloorDetailBoard_iPhone * board = [VankeFloorDetailBoard_iPhone board];
     board.data = cellValue.project;
     board.salesDate = _salesDate;
@@ -160,17 +184,17 @@ ON_SIGNAL3( VankeFloorListBoardCell_iPhone, mask, signal )
 
 ON_SIGNAL3( VankeProjectListModel, RELOADING, signal )
 {
-	self.list.headerLoading = YES;
-	self.list.footerLoading = YES;
+    self.list.headerLoading = YES;
+    self.list.footerLoading = YES;
 }
 
 ON_SIGNAL3( VankeProjectListModel, RELOADED, signal )
 {
-	self.list.headerLoading = NO;
-	self.list.footerLoading = NO;
-	self.list.footerMore = self.model.more;
-	
-	[self.list reloadData];
+    self.list.headerLoading = NO;
+    self.list.footerLoading = NO;
+    self.list.footerMore = self.model.more;
+    
+    [self.list reloadData];
 }
 
 -(void) addLeftIconToTextField: (BeeUITextField*) textField icon: (NSString*) icon {

vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m

@@ -90,7 +90,7 @@ ON_DID_DISAPPEAR( signal )
 ON_SIGNAL3( VankeMainBoard_iPhone, txtQuery, signal )
 {
     if ([signal is:BeeUITextField.RETURN]) {
-        [self showFloorListView];
+        [self showListView: CELL_TYPE_FLOOR];
     }
 }
 
@@ -122,7 +122,15 @@ ON_SIGNAL3( VankeTopMenuBoardCell_iPhone, menuSqure, signal ) {
 
 ON_SIGNAL3( VankeServiceSaleCell_iPhone, mask, signal ) {
     [[VankeAppBoard_iPhone sharedInstance] hideMenu];
-    [self showFloorListView];
+    [self showListView: CELL_TYPE_FLOOR];
+}
+
+ON_SIGNAL3(VankeServiceBoardCell_iPhone, mask, signal) {
+    VankeServiceBoardCell_iPhone *cell = (VankeServiceBoardCell_iPhone *)signal.sourceCell;
+    if ([@"当前客流" eq:cell.lblTitle.data]) {
+        [[VankeAppBoard_iPhone sharedInstance] hideMenu];
+        [self showListView: CELL_TYPE_PASSENGER];
+    }
 }
 
 #pragma mark - VankeProjectSummaryModel
@@ -250,8 +258,8 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
     [_summaryModel reload];
 }
 
--(void) showFloorListView {
-    VankeFloorListBoard_iPhone * board = [VankeFloorListBoard_iPhone board];
+-(void) showListView: (CellType) type {
+    VankeFloorListBoard_iPhone * board = [VankeFloorListBoard_iPhone boardWithType:type];
     if (nil != _currDashBoard) {
         board.projectCategory = _currDashBoard.name;
         board.salesDate = _summaryModel.salesDate;

vanke/view_iPhone/templates/main/VankeServiceBoardCell_iPhone.h

@@ -6,12 +6,13 @@
 
 @interface VankeServiceBoardCell_iPhone : BeeUICell
 
-AS_OUTLET( BeeUIImageView, imgBg );
-AS_OUTLET( BeeUIImageView, imgIcon );
-AS_OUTLET( BeeUILabel, lblTitle );
-AS_OUTLET( BeeUIImageView, imgAmountIcon );
-AS_OUTLET( BeeUILabel, lblAmount );
-AS_OUTLET( BeeUILabel, lblAmountUnit );
+AS_OUTLET( BeeUIImageView, imgBg )
+AS_OUTLET( BeeUIImageView, imgIcon )
+AS_OUTLET( BeeUILabel, lblTitle )
+AS_OUTLET( BeeUIImageView, imgAmountIcon )
+AS_OUTLET( BeeUILabel, lblAmount )
+AS_OUTLET( BeeUILabel, lblAmountUnit )
+AS_OUTLET( BeeUIButton, mask)
 
 -(void) asNotAvailableCell;
 

vanke/view_iPhone/templates/main/VankeServiceBoardCell_iPhone.m

@@ -4,7 +4,7 @@
 
 #pragma mark -
 
-@interface VankeServiceBoardCell_iPhone()
+@interface VankeServiceBoardCell_iPhone ()
 {
 }
 @end
@@ -14,12 +14,14 @@
 SUPPORT_AUTOMATIC_LAYOUT( YES )
 SUPPORT_RESOURCE_LOADING( YES )
 
-DEF_OUTLET( BeeUIImageView, imgBg );
-DEF_OUTLET( BeeUIImageView, imgIcon );
-DEF_OUTLET( BeeUILabel, lblTitle );
-DEF_OUTLET( BeeUIImageView, imgAmountIcon );
-DEF_OUTLET( BeeUILabel, lblAmount );
-DEF_OUTLET( BeeUILabel, lblAmountUnit );
+DEF_OUTLET( BeeUIImageView, imgBg )
+DEF_OUTLET( BeeUIImageView, imgIcon )
+DEF_OUTLET( BeeUILabel, lblTitle )
+DEF_OUTLET( BeeUIImageView, imgAmountIcon )
+DEF_OUTLET( BeeUILabel, lblAmount )
+DEF_OUTLET( BeeUILabel, lblAmountUnit )
+DEF_OUTLET( BeeUIButton, mask)
+
 
 - (void)load
 {

vanke/view_iPhone/templates/main/VankeServiceBoardCell_iPhone.xml

@@ -3,6 +3,7 @@
 <ui namespace="VankeServiceBoardCell_iPhone">
   <linear orientation="v" class="wrapper">
       <image id="imgBg" class="bg" />
+      <button id="mask" class="mask"/>
       
       <linear orientation="h" class="label-wrapper">
           <linear orientation="v" class="icon-wrapper">
@@ -38,6 +39,14 @@
         top: 0px;
     }
     
+    .mask {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        left: 0px;
+        top: 0px;
+    }
+
     .wrapper > .label-wrapper,
     .wrapper > .detl-wrapper {
         height: 50%;

vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m

@@ -53,6 +53,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
     self.passenger.imgBg.backgroundColor = [UIColor colorWithRed:0 green:195/255.0 blue:230/255.0 alpha:1];
     self.passenger.lblAmountUnit.data = @"人";
     
+    
     self.traffic.imgIcon.data = @"car.png";
     self.traffic.lblTitle.data = @"当前车流";
     self.traffic.imgBg.backgroundColor = [UIColor colorWithRed:79/255.0 green:143/255.0 blue:248/255.0 alpha:1];