diff --git a/vanke/AppDelegate.m b/vanke/AppDelegate.m
index efeb0330f3fc797ad2b50c16d3ed16f5feccb892..93ffdfefe8210b6837868257c6104ff808fee638 100755
--- a/vanke/AppDelegate.m
+++ b/vanke/AppDelegate.m
@@ -47,10 +47,11 @@
// [BeeUITipsCenter setDefaultContainerView:self.window.rootViewController.view];
[UIApplication sharedApplication].statusBarHidden = NO;
+ [[UIApplication sharedApplication]setStatusBarHidden:YES withAnimation:UIStatusBarAnimationNone];
bee.ui.config.ASR = YES;
bee.ui.config.iOS7Mode = YES;
- // bee.ui.config.highPerformance = YES;
+// bee.ui.config.highPerformance = YES;
// bee.ui.config.cacheAsyncLoad = YES;
// bee.ui.config.cacheAsyncSave = YES;
diff --git a/vanke/view_iPhone/templates/VankeAppBoard_iPhone.m b/vanke/view_iPhone/templates/VankeAppBoard_iPhone.m
index 770db83b19c9fc83510428e1b84a7e96a43b2a51..d007600a14e7d7fb5d54f4cff4321d3a9903726b 100755
--- a/vanke/view_iPhone/templates/VankeAppBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/VankeAppBoard_iPhone.m
@@ -25,6 +25,7 @@
BeeUIRouter * _router;
UIWindow * _login;
+ BOOL isTenant;
VankeMainTabBoard_iPhone* _mainTabbar;
VankeTenantTabBoard_iPhone* _tenantTabbar;
}
@@ -33,15 +34,7 @@
@implementation VankeAppBoard_iPhone
DEF_SINGLETON( VankeAppBoard_iPhone )
-
-//SUPPORT_AUTOMATIC_LAYOUT( YES )
-//SUPPORT_RESOURCE_LOADING( YES )
-
-//DEF_OUTLET(BeeUIView, contentView)
-//DEF_OUTLET(VankeMainTabBoard_iPhone, tabbar)
-
DEF_NOTIFICATION( HIDE_MENU )
-//DEF_NOTIFICATION( SHOW_MENU )
- (void)load
{
@@ -89,12 +82,10 @@ ON_WILL_APPEAR( signal )
ON_DID_APPEAR( signal )
{
- _router.view.pannable = YES;
}
ON_WILL_DISAPPEAR( signal )
{
- _router.view.pannable = NO;
}
ON_DID_DISAPPEAR( signal )
@@ -125,7 +116,7 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification )
[UIView commitAnimations];
LoginResponseData *loginInfo = [[VankeCommonModel sharedInstance] getLoginInfo];
- BOOL isTenant = [USER_POSITION_TENANT eq: loginInfo.position];
+ isTenant = [USER_POSITION_TENANT eq: loginInfo.position];
if (isTenant) {
_tenantTabbar = [VankeTenantTabBoard_iPhone cell];
[self.view addSubview:_tenantTabbar];
@@ -133,6 +124,7 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification )
_mainTabbar = [VankeMainTabBoard_iPhone cell];
[self.view addSubview:_mainTabbar];
}
+ [self relayoutContentView];
}
// 代ç†æ–¹æ³•ï¼Œæ£€æµ‹åŠ¨ç”»ä»‹ç»ç„¶åŽè¿›è¡Œå…¶ä»–æ“作 还有其他两个方法
@@ -141,9 +133,7 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification )
if ([animationId isEqualToString:HideLoginViewAnimationName]) {
[_login removeFromSuperview];
_login = nil;
-
- LoginResponseData *loginInfo = [[VankeCommonModel sharedInstance] getLoginInfo];
- BOOL isTenant = [USER_POSITION_TENANT eq: loginInfo.position];
+
NSString *tabName = nil;
if (isTenant) {
tabName = [_tenantTabbar showAndSelectFirst];
@@ -153,11 +143,6 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification )
_router.view.alpha = 1.0f;
[_router open:tabName animated:YES];
-// // 打开默认页é¢
-// BeeUIBoard *curBoard = _router.currentBoard;
-// if (nil != curBoard && [curBoard isKindOfClass:[VankeMainBoard_iPhone class]]) {
-// [((VankeMainBoard_iPhone*) curBoard).summaryModel reload];
-// }
}
}
@@ -220,11 +205,13 @@ ON_SIGNAL3( VankeTenantTabBoard_iPhone, me, signal )
return;
}
+ CGFloat menuHeight = 45.0f;
+
CGRect frame1;
frame1.size.width = self.viewSize.width;
frame1.size.height = 45.0f;
frame1.origin.x = 0.0;
- frame1.origin.y = self.view.bounds.size.height - 45.0f;
+ frame1.origin.y = self.view.bounds.size.height - menuHeight;
tab.frame = frame1;
CGRect frame2;
@@ -232,7 +219,8 @@ ON_SIGNAL3( VankeTenantTabBoard_iPhone, me, signal )
if (tab.hidden) {
frame2.size.height = self.viewSize.height;
} else {
- frame2.size.height = self.viewSize.height - 45.0f;
+ CGFloat statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.height;
+ frame2.size.height = self.viewSize.height - menuHeight - statusBarHeight + 20.0f;
}
frame2.origin.x = 0.0;
frame2.origin.y = 0.0;
@@ -244,23 +232,23 @@ ON_SIGNAL3( VankeTenantTabBoard_iPhone, me, signal )
*/
-(void) doLogout {
[self createAndShowLoginWindow];
-
_router.view.alpha = 0.0f;
- UIView *tab = [self currentTab];
- [tab removeFromSuperview];
- tab = nil;
-// [_tabbar showAndSelectFirst];
-// [_router open:@"home" animated:NO];
+
+ if (isTenant) {
+ [_tenantTabbar removeFromSuperview];
+ _tenantTabbar = nil;
+ } else {
+ [_mainTabbar removeFromSuperview];
+ _mainTabbar = nil;
+ }
}
-(UIView*) currentTab {
- UIView *tab = nil;
- if (nil != _mainTabbar) {
- tab = _mainTabbar;
- } else if (nil != _tenantTabbar) {
- tab = _tenantTabbar;
+ if (isTenant) {
+ return _tenantTabbar;
+ } else {
+ return _mainTabbar;
}
- return tab;
}
@end
\ No newline at end of file
diff --git a/vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m b/vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
index a0255ae263d9c05e7ad68676eac5694cf71530dd..abc3a601f95058b9362c38dad26997c7ada42a1e 100755
--- a/vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
@@ -77,7 +77,7 @@ ON_CREATE_VIEWS( signal )
self.list.total = 1;
BeeUIScrollItem * item = self.list.items[0];
- item.size = CGSizeMake( self.list.width, 150 );
+ item.size = CGSizeMake( self.list.width, 200 );
item.order = 0;
item.rule = BeeUIScrollLayoutRule_Fall;
item.clazz = [NoDataCell_iPhoneCell class];
@@ -141,14 +141,11 @@ ON_DELETE_VIEWS( signal )
ON_LAYOUT_VIEWS( signal )
{
-// _searchBar.frame = _searchView.frame;
}
ON_WILL_APPEAR( signal )
{
self.navigationBarShown = YES;
- // [self.list reloadData];
-
if ( NO == self.model.loaded )
{
[self.model firstPage];
diff --git a/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m b/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
index 1f0f823d442e77d2660e02ba51b34192a64722ad..c2fd457d9f495df8a876fab4af47cff42c0be857 100755
--- a/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
@@ -194,21 +194,23 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
// æ˜¾ç¤ºç›®æ ‡é¡µ
targetTab.frame = CGRectMake(0, 0, frame.size.width, frame.size.height);
- if (tabIndex > _curTopMenuIndex) {
- targetTab.right = 0.0f;
- } else {
- targetTab.left = frame.size.width;
- }
+ targetTab.right = 0.0f;
+// if (tabIndex > _curTopMenuIndex) {
+// targetTab.right = 0.0f;
+// } else {
+// targetTab.left = frame.size.width;
+// }
[UIView animateWithDuration:0.3f // 动画时长
delay:0.0 // 动画延迟
options:UIViewAnimationOptionCurveLinear // 动画过渡效果
animations:^{
- if (tabIndex > _curTopMenuIndex) {
- targetTab.right += frame.size.width;
- } else {
- targetTab.left -= frame.size.width;
- }
+ targetTab.right += frame.size.width;
+// if (tabIndex > _curTopMenuIndex) {
+// targetTab.right += frame.size.width;
+// } else {
+// targetTab.left -= frame.size.width;
+// }
targetTab.hidden = NO;
[self.serviceDashBoardView addSubview:targetTab];
}
diff --git a/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.xml b/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.xml
index 861c5aaea3b0d2c7cf1652cee5da6285cbc53e72..30871b6a50a477ce180b2e20b6b1cfa9549b2d96 100644
--- a/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.xml
+++ b/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.xml
@@ -61,11 +61,8 @@
#serviceDashBoardView {
width: 100%;
- height: 100%;
- position: absolute;
- left: 0px;
- bottom: 0px;
- padding: 205px 5px 0px 5px;
+ height: 305px;
+ padding: 5px 5px 0px 5px;
}
</style>
</ui>
diff --git a/vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.m b/vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.m
index ff90d93649d3a7ddcc4a9f245ec04fd5264ea9ee..a3c9914d82d6b7f8fdf2fddd618b9670d5161668 100644
--- a/vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.m
@@ -76,7 +76,7 @@ ON_CREATE_VIEWS( signal )
self.navigationBarShown = YES;
self.allowedSwipeToBack = YES;
- self.title = [_data codeName];
+ self.title = _data.shopName;
[self showOperButtons: [_data unconfirmed]];
[self initListAndModel];
}
@@ -139,7 +139,7 @@ ON_SIGNAL3( VankeStatementSubjectListModel, RELOADED, signal )
StatementSubjectListResponseData *respData = _model.lastResp.data;
if (nil != respData) {
- self.title = [respData codeName];
+ self.title = respData.shopName;
$(self.settlementBar).DATA(respData);
$(self.imgState).DATA([NSString stringWithFormat:@"%@_big.png", respData.state]);
[self showOperButtons: [respData unconfirmed]];
diff --git a/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.m b/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.m
index 398bdce6ab08b084199fc3781662b71019d64e06..60b87dfa5b61fc876b661e59ccd83364448719a6 100644
--- a/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.m
@@ -158,7 +158,6 @@ ON_SIGNAL3(VankeStatementMonthCell_iPhone, pickerMask, signal) {
// ç«‹å³è®¾ç½®è´¦æœŸ
self.model.settleEquals = picker.date;
[self.model firstPage];
-
}];
action;
})];
diff --git a/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.xml b/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.xml
index 2ac27e991503ff1b343e4a228c0f766fe981e838..5d02ee9e62f5fcd5bfc60435be9542c395102fe0 100644
--- a/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.xml
+++ b/vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.xml
@@ -40,14 +40,14 @@
width: 100%;
position: absolute;
left: 0px;
- top: 132px;
+ top: 131px;
placeholder: "请输入商家代ç 或å称";
}
#list {
position: absolute;
left: 0px;
- top: 115px;
+ top: 113px;
width: 100%;
height: 100%;
}
diff --git a/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.h b/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.h
index d156829a218bc8184e523b2d922990ec85df03f8..e0280ba82ab5470a3dcb87d4c2a49cb3291c03d1 100644
--- a/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.h
+++ b/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.h
@@ -22,6 +22,7 @@
@interface VankeStatementListItemCell_iPhone : BeeUICell
AS_OUTLET(BeeUIImageView, imgPhoto)
+AS_OUTLET(BeeUILabel, lblCode)
AS_OUTLET(BeeUILabel, lblName)
AS_OUTLET(BeeUIImageView, lblState)
AS_OUTLET(BeeUILabel, lblAmount)
diff --git a/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.m b/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.m
index 8a3a021089faf464ca45c1fe02f98ee685998f65..240a0943d8b2dc49554c1003d0f950759a0fa48c 100644
--- a/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.m
+++ b/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.m
@@ -26,6 +26,7 @@ SUPPORT_AUTOMATIC_LAYOUT( YES )
SUPPORT_RESOURCE_LOADING( YES )
DEF_OUTLET(BeeUIImageView, imgPhoto)
+DEF_OUTLET(BeeUILabel, lblCode)
DEF_OUTLET(BeeUILabel, lblName)
DEF_OUTLET(BeeUIImageView, lblState)
DEF_OUTLET(BeeUILabel, lblAmount)
@@ -47,7 +48,8 @@ DEF_OUTLET(BeeUIImageView, imgState)
}
$(self.imgPhoto).DATA([item getPictureUrlOrDefault]);
- $(self.lblName).DATA([item codeName]);
+ $(self.lblCode).DATA(item.shopCode);
+ $(self.lblName).DATA(item.shopName);
$(self.lblAmount).DATA([NSString stringWithFormat:@"%.2f ", [item.amount doubleValue]]);
$(self.imgState).DATA([NSString stringWithFormat:@"%@.png", item.state]);
}
diff --git a/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.xml b/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.xml
index 67f10e3dbd8f0f35a6beefe429787f17bd189899..2d97da7c1b1f8126f282e8f9e3bce3a0d6a59ea5 100644
--- a/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.xml
+++ b/vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.xml
@@ -13,6 +13,7 @@
</linear>
<linear orientation="v" class="col name-col">
+ <label id="lblCode" class="code"/>
<label id="lblName" class="name"/>
</linear>
@@ -74,7 +75,7 @@
}
.photo-col {
- width: 20%;
+ width: 15%;
}
.photo-col .photo {
@@ -87,18 +88,25 @@
.name-col {
width: 40%;
- padding-right: 10px;
+ padding: 20px 10px 0px 10px;
+ }
+
+ .name-col .code {
+ width: 100%;
+ height: auto;
+ text-overflow: ellipsis;
+ font-size: 15px;
}
.name-col .name {
- word-wrap: break-word;
+ width: 100%;
+ height: auto;
text-overflow: ellipsis;
font-size: 15px;
- font-style: bold;
}
.amount-col {
- width: 22%;
+ width: 30%;
align: right;
}