提交 1.首页查询增加projectIdsIn参数； 2.根据首页查询的返回结果控制首页三个tab页是否可以点击。 3. 临时去掉左右滑动效果。

vanke.xcodeproj/project.pbxproj

@@ -3093,10 +3093,10 @@
 				C1CF9F3B1BEF30850033C35E /* VankeNoticeListAPI.m */,
 				C16BA6281BD3952E001ACB26 /* VankePassengerFlowAPI.h */,
 				C16BA6291BD3952E001ACB26 /* VankePassengerFlowAPI.m */,
-				C128050A1BC5920F001ECBAA /* VankeProjectListAPI.h */,
 				C128050B1BC5920F001ECBAA /* VankeProjectListAPI.m */,
 				C12804FE1BC4195F001ECBAA /* VankeProjectSummaryAPI.h */,
 				C12804FF1BC4195F001ECBAA /* VankeProjectSummaryAPI.m */,
+				C128050A1BC5920F001ECBAA /* VankeProjectListAPI.h */,
 				C12804E71BC2E2F4001ECBAA /* VankeResponse.h */,
 				C12804E81BC2E2F4001ECBAA /* VankeResponse.m */,
 				C19ADE361BC80DD400206213 /* VankeSaleVolumeAPI.h */,

vanke/Base.lproj/LaunchScreen.xib

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>

vanke/controller/VankeProjectSummaryAPI.h

@@ -31,6 +31,9 @@
 // 车流量日期，黑夜为今天
 @property (nonatomic, strong) NSString *rentalDateEquals;
 
+// 项目列表，多个值以“,“分隔
+@property (nonatomic, strong) NSString *projectIdsIn;
+
 @end
 
 // 项目汇总信息
@@ -63,5 +66,7 @@
 
 -(ProjectSummary*) getSummary: (NSString*) classificationName;
 
+-(BOOL) hasClassification: (NSString*) classificationName;
+
 @end
 

vanke/controller/VankeProjectSummaryAPI.m

@@ -19,6 +19,7 @@
 @synthesize passengerDate;
 @synthesize trafficDate;
 @synthesize rentalDateEquals;
+@synthesize projectIdsIn;
 
 -(void) route:(BeeMessage *)msg {
     if (self.sending)
@@ -27,7 +28,7 @@
             return;
         }
     
-        [self http_get:@"project/queryclassificationby"].PARAM(@"salesDateEquals", self.salesDate).PARAM(@"passengerDateEquals", self.passengerDate).PARAM(@"trafficDateEquals", self.trafficDate).PARAM(@"rentalDateEquals", self.rentalDateEquals).TIMEOUT(10);
+        [self http_get:@"project/queryclassificationby"].PARAM(@"salesDateEquals", self.salesDate).PARAM(@"passengerDateEquals", self.passengerDate).PARAM(@"trafficDateEquals", self.trafficDate).PARAM(@"rentalDateEquals", self.rentalDateEquals).PARAM(@"projectIdsIn", self.projectIdsIn) .TIMEOUT(10);
     }
     else if (self.succeed)
     {
@@ -90,6 +91,11 @@
 
 CONVERT_PROPERTY_CLASS(data, ProjectSummary)
 
+-(BOOL) hasClassification: (NSString*) classificationName {
+    ProjectSummary *summary = [self getSummary:classificationName];
+    return nil != summary;
+}
+
 -(ProjectSummary*) getSummary: (NSString*) classificationName {
     if (nil == self.data) {
         return nil;

vanke/model/VankeCommonModel.h

@@ -57,6 +57,11 @@ AS_SINGLETON(VankeCommonModel)
  */
 -(NSArray*) getAuthOrgs;
 
+/**
+ * 取得授权组织代码列表，多个值以","分隔
+ */
+-(NSString*) getAuthOrgCodesWithComma;
+
 /**
  *  当前登录人员的登录密码
  *

vanke/model/VankeCommonModel.m

@@ -72,6 +72,17 @@ DEF_SINGLETON(VankeCommonModel)
     }
 }
 
+-(NSString*) getAuthOrgCodesWithComma {
+    NSArray *data = [self getAuthOrgs];
+    
+    NSMutableArray *arr = [NSMutableArray array];
+    for (AuthorizedOrg *org in data) {
+        [arr addObject:org.code];
+    }
+    NSString *str = [arr componentsJoinedByString:@","];
+    return str;
+}
+
 - (NSString*) currentUserPwd {
     return [self keychainRead:KEY_CURRENT_USER_PWD];
 }

vanke/model/VankeProjectSummaryModel.h

@@ -27,6 +27,9 @@
 // 租赁日期，黑夜为今天
 @property (nonatomic, strong) NSString *rentalDateEquals;
 
+// 项目列表，多个值以“,"分隔
+@property (nonatomic, strong) NSString *projectIdsIn;
+
 -(ProjectSummaryResponse*) getServerResp;
 
 @end

vanke/model/VankeProjectSummaryModel.m

@@ -18,6 +18,7 @@
 @synthesize passengerDate = _passengerDate;
 @synthesize trafficDate = _trafficDate;
 @synthesize rentalDateEquals = _rentalDateEquals;
+@synthesize projectIdsIn = _projectIdsIn;
 
 -(ProjectSummaryResponse*) getServerResp {
     return (ProjectSummaryResponse*) self.serverResp;
@@ -51,6 +52,7 @@
     api.passengerDate = _passengerDate;
     api.trafficDate = _trafficDate;
     api.rentalDateEquals = _rentalDateEquals;
+    api.projectIdsIn = _projectIdsIn;
     
     // 清空结果
     self.serverResp = nil;

vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m

@@ -89,6 +89,7 @@ ON_WILL_APPEAR( signal )
     [BeeUIRouter sharedInstance].view.pannable = NO;
     self.navigationBarShown = NO;
     [[VankeAppBoard_iPhone sharedInstance] showMenu];
+    _summaryModel.projectIdsIn = [[VankeCommonModel sharedInstance] getAuthOrgCodesWithComma];
     [_summaryModel reload];
 }
 
@@ -126,14 +127,32 @@ ON_SIGNAL3( VankeWeatherCell_iPhone, btnMask, signal )
 #pragma VankeTopMenuBoardCell_iPhone
 
 ON_SIGNAL3( VankeTopMenuBoardCell_iPhone, menuCommunity, signal ) {
+    ProjectSummaryResponse *resp = [_summaryModel getServerResp];
+    if (![resp hasClassification:@"社区2049"]) {
+        [GEToast showWithText:@"缺少权限，请联系管理员" bottomOffset:50.0f duration:1.0f];
+        return;
+    }
+    
     [self showTab: 0];
 }
 
 ON_SIGNAL3( VankeTopMenuBoardCell_iPhone, menuCenter, signal ) {
+    ProjectSummaryResponse *resp = [_summaryModel getServerResp];
+    if (![resp hasClassification:@"万科中心"]) {
+        [GEToast showWithText:@"缺少权限，请联系管理员" bottomOffset:50.0f duration:1.0f];
+        return;
+    }
+    
     [self showTab: 1];
 }
 
 ON_SIGNAL3( VankeTopMenuBoardCell_iPhone, menuSqure, signal ) {
+    ProjectSummaryResponse *resp = [_summaryModel getServerResp];
+    if (![resp hasClassification:@"万科广场"]) {
+        [GEToast showWithText:@"缺少权限，请联系管理员" bottomOffset:50.0f duration:1.0f];
+        return;
+    }
+    
     [self showTab: 2];
 }
 
@@ -165,6 +184,7 @@ ON_SIGNAL3( VankeServiceSaleCell_iPhone, btnHistoryMask, signal ) {
                 _summaryModel.passengerDate = dateStr;
                 _summaryModel.trafficDate = dateStr;
                 _summaryModel.rentalDateEquals = dateStr;
+                _summaryModel.projectIdsIn = [[VankeCommonModel sharedInstance] getAuthOrgCodesWithComma];
                 [_summaryModel reload];
             }
         }];
@@ -214,6 +234,15 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
             [_currDashBoard setData:data];
         }
     }
+    
+    ProjectSummaryResponse *resp = [_summaryModel getServerResp];
+    if ([resp hasClassification:@"社区2049"]) {
+        [self showTab: 0];
+    } else if ([resp hasClassification:@"万科中心"]) {
+        [self showTab:1];
+    } else if ([resp hasClassification:@"万科广场"]) {
+        [self showTab:2];
+    }
 }
 
 -(void) addLeftIconToTextField: (BeeUITextField*) textField icon: (NSString*) icon {
@@ -299,12 +328,12 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
 #pragma VankeMainBoard_iPhone
 
 ON_SWIPE_LEFT( signal ) {
-    if (_curTopMenuIndex < 2) {
-        [self showTab:_curTopMenuIndex + 1];
-    } else {
-        _curTopMenuIndex = -1;
-        [self showTab:_curTopMenuIndex + 1];
-    }
+//    if (_curTopMenuIndex < 2) {
+//        [self showTab:_curTopMenuIndex + 1];
+//    } else {
+//        _curTopMenuIndex = -1;
+//        [self showTab:_curTopMenuIndex + 1];
+//    }
 }
 
 @end