解决账单列表界面重叠问题

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;
     

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

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];

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];
                      }

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>

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]];

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;
     })];

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%;
         }

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)

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]);
 }

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;
         }