Skip to content

万
万科
Commit 96d017a3 authored by Achilles's avatar Achilles
Browse files
Options

VK-8 销售项目列表页每个项目的属性顺序调整

parent 9501a5a6
master HEAD dev
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 45 deletions
vanke.xcodeproj/project.pbxproj
View file @ 96d017a3
......@@ -118,6 +118,8 @@
C11BAB161C089D77007BBCCC /* unconfirmed@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF41C089D77007BBCCC /* unconfirmed@3x.png */; };
C11BAB171C089D77007BBCCC /* unconfirmed_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF51C089D77007BBCCC /* unconfirmed_big@2x.png */; };
C11BAB181C089D77007BBCCC /* unconfirmed_big@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF61C089D77007BBCCC /* unconfirmed_big@3x.png */; };
C11BAB1E1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.m in Sources */ = {isa = PBXBuildFile; fileRef = C11BAB1C1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.m */; };
C11BAB1F1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.xml in Resources */ = {isa = PBXBuildFile; fileRef = C11BAB1D1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.xml */; };
C11DD0611C060A9E00DD11E3 /* CDatePickerViewEx.m in Sources */ = {isa = PBXBuildFile; fileRef = C11DD0601C060A9E00DD11E3 /* CDatePickerViewEx.m */; };
C12804D71BC124A3001ECBAA /* VankeWeatherModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C12804D61BC124A3001ECBAA /* VankeWeatherModel.m */; };
C12804DA1BC12A67001ECBAA /* VankeWeatherController.m in Sources */ = {isa = PBXBuildFile; fileRef = C12804D91BC12A67001ECBAA /* VankeWeatherController.m */; };
......@@ -879,6 +881,9 @@
C11BAAF41C089D77007BBCCC /* unconfirmed@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed@3x.png"; sourceTree = "<group>"; };
C11BAAF51C089D77007BBCCC /* unconfirmed_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed_big@2x.png"; sourceTree = "<group>"; };
C11BAAF61C089D77007BBCCC /* unconfirmed_big@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed_big@3x.png"; sourceTree = "<group>"; };
C11BAB1B1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VankePassengerListBoardCell_iPhone.h; path = "floor-list/VankePassengerListBoardCell_iPhone.h"; sourceTree = "<group>"; };
C11BAB1C1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VankePassengerListBoardCell_iPhone.m; path = "floor-list/VankePassengerListBoardCell_iPhone.m"; sourceTree = "<group>"; };
C11BAB1D1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = VankePassengerListBoardCell_iPhone.xml; path = "floor-list/VankePassengerListBoardCell_iPhone.xml"; sourceTree = "<group>"; };
C11DD05F1C060A9E00DD11E3 /* CDatePickerViewEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDatePickerViewEx.h; sourceTree = "<group>"; };
C11DD0601C060A9E00DD11E3 /* CDatePickerViewEx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDatePickerViewEx.m; sourceTree = "<group>"; };
C12804D51BC124A3001ECBAA /* VankeWeatherModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VankeWeatherModel.h; sourceTree = "<group>"; };
......@@ -2485,6 +2490,9 @@
C19BBC161BBE865400831290 /* VankeFloorListBoardCell_iPhone.h */,
C19BBC171BBE865400831290 /* VankeFloorListBoardCell_iPhone.m */,
C19BBC181BBE865400831290 /* VankeFloorListBoardCell_iPhone.xml */,
C11BAB1B1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.h */,
C11BAB1C1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.m */,
C11BAB1D1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.xml */,
);
name = "floor-list";
sourceTree = "<group>";
......@@ -4286,6 +4294,7 @@
C1DED3371BCEC4B40049BB2D /* user_checked.png in Resources */,
C1CF9F591BF23FED0033C35E /* right_arrow.png in Resources */,
C19BBC041BBE85F500831290 /* VankeTopMenuBoardCell_iPhone.xml in Resources */,
C11BAB1F1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.xml in Resources */,
C11BAB121C089D77007BBCCC /* salel_input_icon@3x.png in Resources */,
C14D6F811BB813D300210172 /* little_down_icon.png in Resources */,
C1555F761C02178D00C80B55 /* notice_icon@3x.png in Resources */,
......@@ -4719,6 +4728,7 @@
C1D5991C1BB44B2100D297FE /* Bee_System.mm in Sources */,
C10F18441BF7ACA80065F18C /* IBTUIControl.m in Sources */,
C1D5995C1BB44B2100D297FE /* Bee_HTTPConnectionPool2.m in Sources */,
C11BAB1E1C08BF83007BBCCC /* VankePassengerListBoardCell_iPhone.m in Sources */,
C10F182A1BF7ACA80065F18C /* IBTTextFieldCell.m in Sources */,
C1D598D91BB44B2000D297FE /* Bee_UILayoutBuilder.m in Sources */,
C1D598891BB44B2000D297FE /* Bee_UIAnimationFade.m in Sources */,
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.h
View file @ 96d017a3
......@@ -3,15 +3,6 @@
#import "Bee.h"
#import "VankeProjectListAPI.h"
#pragma mark -
typedef enum {
CELL_TYPE_FLOOR = 0,
CELL_TYPE_PASSENGER
} CellType;
#pragma mark -
@interface VankeFloorListBoardCell_iPhone : BeeUICell
AS_OUTLET( BeeUIImageView, imgPhoto )
......@@ -29,7 +20,6 @@ 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
View file @ 96d017a3
......@@ -38,12 +38,6 @@ DEF_OUTLET( BeeUILabel, lblPrice )
self.lblSaleAmount.data = prj.salesAmount;
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);
}
}
......@@ -56,7 +50,6 @@ DEF_OUTLET( BeeUILabel, lblPrice )
@synthesize theme = _theme;
@synthesize project = _project;
@synthesize cellType = _cellType;
@end
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
View file @ 96d017a3
......@@ -12,6 +12,16 @@
</linear>
<linear orientation="v" class="data-wrapper">
<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"></label>
<label class="unit floor-ctr">元</label>
</linear>
<linear orientation="h" class="row price-wrapper">
<label class="lbl">客单价:</label>
......@@ -24,19 +34,6 @@
<label id="lblPassengerFlow" class="value"></label>
<label class="unit">人</label>
</linear>
<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"></label>
<label class="unit floor-ctr">元</label>
</linear>
</linear>
</linear>
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.h
View file @ 96d017a3
......@@ -5,12 +5,16 @@
#pragma mark -
typedef enum {
CELL_TYPE_FLOOR = 0,
CELL_TYPE_PASSENGER
} CellType;
@interface VankeFloorListBoard_iPhone : VankeBaseBoard
AS_MODEL( VankeProjectListModel, model );
AS_OUTLET( BeeUIScrollView, list );
//AS_OUTLET( BeeUITextField, txtQuery);
AS_OUTLET( BeeUISearchBar, searchBar);
@property (assign, nonatomic) CellType listType;
......@@ -21,8 +25,6 @@ AS_OUTLET( BeeUISearchBar, searchBar);
@property (strong, nonatomic) NSString *projectNameLike;
// 销售日期
@property (strong, nonatomic) NSString *salesDate;
//// 客流日期
//@property (nonatomic, strong) NSString *passengerFlowDate;
+ (id)boardWithType: (CellType) type;
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
View file @ 96d017a3
......@@ -10,6 +10,7 @@
#import "VankeFloorDetailBoard_iPhone.h"
#import "VankeFloorListBoardCell_iPhone.h"
#import "VankePassengerDetailBoard_iPhone.h"
#import "VankePassengerListBoardCell_iPhone.h"
@interface VankeFloorListBoard_iPhone () <UISearchBarDelegate>
@end
......@@ -26,13 +27,10 @@ SUPPORT_AUTOMATIC_LAYOUT(YES)
@synthesize projectCategory = _projectCategory;
@synthesize projectNameLike = _projectNameLike;
@synthesize salesDate = _salesDate;
//@synthesize passengerFlowDate = _passengerFlowDate;
@synthesize listType = _listType;
DEF_MODEL( VankeProjectListModel, model );
DEF_OUTLET( BeeUIScrollView, list );
//DEF_OUTLET( BeeUITextField, txtQuery);
//DEF_OUTLET( BeeUIView, searchView);
DEF_OUTLET( BeeUISearchBar, searchBar);
+ (id)boardWithType: (CellType) type {
......@@ -60,13 +58,6 @@ ON_CREATE_VIEWS( signal )
self.navigationBarShown = YES;
self.title = _projectCategory;
// [self addLeftIconToTextField:_txtQuery icon:@"search"];
// self.searchBar = [[UITextField alloc] initWithFrame:_searchView.frame];
// _searchBar.placeholder = @"请输入楼盘名称";
// _searchBar.keyboardType = UIKeyboardTypeDefault;
// _searchBar.delegate = self;
// [_searchView addSubview:_searchBar];
self.allowedSwipeToBack = YES;
self.list.headerClass = [PullLoader class];
......@@ -102,13 +93,16 @@ ON_CREATE_VIEWS( signal )
item.size = CGSizeMake( self.list.width / self.list.lineCount, cellHeight );
item.order = 0;
item.rule = BeeUIScrollLayoutRule_Fall;
item.clazz = [VankeFloorListBoardCell_iPhone class];
if (self.listType == CELL_TYPE_PASSENGER) {
item.clazz = [VankePassengerListBoardCell_iPhone class];
} else {
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;
}
}
......
vanke/view_iPhone/templates/floor-list/VankePassengerListBoardCell_iPhone.h 0 → 100755
View file @ 96d017a3
#import "Bee.h"
#import "VankeProjectListAPI.h"
#import "VankeFloorListBoardCell_iPhone.h"
@interface VankePassengerListBoardCell_iPhone : BeeUICell
AS_OUTLET( BeeUIImageView, imgPhoto )
AS_OUTLET( BeeUILabel, lblName )
AS_OUTLET( BeeUILabel, lblOpenDate )
AS_OUTLET( BeeUILabel, lblSaleAmount )
@end
vanke/view_iPhone/templates/floor-list/VankePassengerListBoardCell_iPhone.m 0 → 100755
View file @ 96d017a3
#import "VankePassengerListBoardCell_iPhone.h"
#import "VankeUtil.h"
#pragma mark -
@implementation VankePassengerListBoardCell_iPhone
SUPPORT_RESOURCE_LOADING(YES)
SUPPORT_AUTOMATIC_LAYOUT(YES)
DEF_OUTLET( BeeUIImageView, imgPhoto )
DEF_OUTLET( BeeUILabel, lblName )
DEF_OUTLET( BeeUILabel, lblOpenDate )
DEF_OUTLET( BeeUILabel, lblSaleAmount )
- (BOOL)dataWillChange:(id)newData
{
return newData != self.data;
}
- (void)dataDidChanged
{
FloorCellValue * obj = self.data;
if (nil == obj) {
return;
}
ProjectCategory *prj = obj.project;
if ( prj )
{
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);
}
}
@end
vanke/view_iPhone/templates/floor-list/VankePassengerListBoardCell_iPhone.xml 0 → 100755
View file @ 96d017a3
<?xml version="1.0" encoding="UTF-8"?>
<ui namespace="VankePassengerListBoardCell_iPhone">
<linear orientation="v" class="wrapper">
<button id="mask" class="mask"/>
<image class="bg"/>
<image id="imgPhoto" class="photo"/>
<linear orientation="h" class="name-wrapper">
<image class="name-bg" />
<label id="lblName" class="name"></label>
</linear>
<linear orientation="v" class="data-wrapper">
<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"></label>
<label class="unit floor-ctr">元</label>
</linear>
</linear>
</linear>
<style type="text/css">
.wrapper {
width: 100%;
height: 100%;
padding: 2px;
}
.bg {
width: 100%;
height: 100%;
position: absolute;
left: 0px;
top: 0px;
background-color: white;
}
.photo {
width: 100%;
height: 155px;
background-color: #999;
image-mode: fill;
image-loading: white;
}
.mask {
width: 100%;
height: 100%;
position: absolute;
left: 0px;
top: 0px;
}
.name-wrapper {
position: absolute;
left: 0px;
top: 115px;
width: 100%;
height: 40px;
}
.name-wrapper > .name-bg {
width: 100%;
height: 100%;
position: absolute;
left: 0px;
top: 0px;
background-color: #444444;
alpha: 0.5;
}
.name-wrapper .name {
color: white;
font-size: 18px;
font-weight: bold;
padding-left: 10px;
}
.data-wrapper {
width: 100%;
position: absolute;
left: 0px;
top: 155px;
}
.data-wrapper .row {
width: 100%;
height: 20px;
padding-right: 10px;
}
.data-wrapper .row .lbl {
width: 70px;
padding-left: 10px;
color: #AAAAAA;
}
.data-wrapper .row .value {
width: auto;
float: right;
}
.data-wrapper .row .unit {
width: auto;
color: #888888;
float: right;
}
#lblSaleAmount {
padding-right: -15px;
}
.data-wrapper .value.red {
color: #ed1b23;
font-size: 15px;
font-weight: bold;
}
.data-wrapper .value.purple {
color: #5435ad;
font-size: 15px;
font-weight: bold;
}
.data-wrapper .value.orange {
color: #ea6402;
font-size: 15px;
font-weight: bold;
}
</style>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment