VK-5 客流饼状图页面出现重复多个图

vanke/3rd/HTTPController/ICRHTTPController.h

@@ -25,13 +25,7 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
 
 // Restful API
 
-// User
-/* 用户登录验证（读）*/
-- (void)doLoginWithUserName:(NSString *)userName
-                   password:(NSString *)password
-               registerCode:(NSString *)registerCode
-                    success:(void (^)(id data))succ
-                    failure:(void (^)(id data))fail;
+
 
 /* 密码修改（写）*/
 - (void)doChangePassword:(NSString *)nsPassword
@@ -39,30 +33,11 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
                  success:(void (^)(id data))succ
                  failure:(void (^)(id data))fail;
 
-// Data
-/* 门店基本资料（读）
-    返回最后修改日期从某时刻开始的该用户可见的门店 
- */
-- (void)doGetStoreListFromUpdateTime:(NSTimeInterval)updateTime
-                            position:(NSUInteger)uiPosition
-                                size:(NSUInteger)uiSize
-                             success:(void (^)(id data))succ
-                             failure:(void (^)(id data))fail;
 
-/* 组织架构基本资料（读）
-    获得本人所属组织
- */
-- (void)doGetCurrentOrgWithSuccess:(void (^)(id data))succ
-                           failure:(void (^)(id data))fail;
 
-/* 任务类别基本资料
- 获得本人所属组织的工单类别信息，提任务单时需要用
- */
-- (void)doGetPersonListFromUpdateTime:(NSString *)updateTime
-                           position:(NSUInteger)uiPosition
-                               size:(NSUInteger)uiSize
-                            success:(void (^)(id data))succ
-                            failure:(void (^)(id data))fail;
+
+
+
 
 // Board
 /* 公告列表（读）
@@ -88,61 +63,6 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
                   success:(void (^)(id data))succ
                   failure:(void (^)(id data))fail;
 
-// Patrol
-/* 巡店计划列表（读）
-    获得发布给自己的巡店计划
- */
-- (void)doGetMyPatrolFromUpdateTime:(NSString *)updateTime
-                           position:(NSUInteger)uiPosition
-                               size:(NSUInteger)uiSize
-                            success:(void (^)(id data))succ
-                            failure:(void (^)(id data))fail;
-
-/* 下载某个门店结果（读）*/
-- (void)doGetStoreResultWithPlanID:(NSString *)planID
-                           storeID:(NSString *)storeID
-                           success:(void (^)(id data))succ
-                           failure:(void (^)(id data))fail;
-
-/* 巡店计划处理结果（写）*/
-- (void)doAnswerPatrolPlanWithID:(NSNumber *)planID
-                        infoData:(id)data
-                         success:(void (^)(id data))succ
-                         failure:(void (^)(id data))fail;
-
-/* 巡店计划某个问题处理结果
-    需要先调用接口|doAnswerPlanWithID:postData:success:failure:|，得到门店报告id
- */
-- (void)doAnswerOnePatrolResultWithID:(NSNumber *)resultID
-                             infoData:(id)data
-                              success:(void (^)(id data))succ
-                              failure:(void (^)(id data))fail;
-
-/* 任务列表（读）*/
-- (void)doGetTaskListFromUpdateTime:(NSString *)updateTime
-                           position:(NSUInteger)uiPosition
-                               size:(NSUInteger)uiSize
-                            success:(void (^)(id data))succ
-                            failure:(void (^)(id data))fail;
-
-/* 新增任务（写）*/
-- (void)doCreateNewTaskWithInfo:(id)data
-                        success:(void (^)(id data))succ
-                        failure:(void (^)(id data))fail;
-
-/* 任务处理结果（写）*/
-- (void)doUpdateTaskResultID:(NSString *)resultID
-                  resultText:(NSString *)resultStr
-               processDate:(NSTimeInterval)processDate
-                   success:(void (^)(id data))succ
-                   failure:(void (^)(id data))fail;
-
-// Signup
-/* 签到信息提交（写）*/
-- (void)doSignupWithInfo:(id)data
-                 success:(void (^)(id data))succ
-                 failure:(void (^)(id data))fail;
-
 // Attachment
 /* 添加附件（读）*/
 - (void)doAddAttachment:(id)data
@@ -172,12 +92,6 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
                            success:(void (^)(id))succ
                            failure:(void (^)(id))fail;
 
-// Version
-/* 查询版本（读）*/
-- (void)doFetchVersionWithCurrent:(NSString *)currentVersion
-                          success:(void (^)(id))succ
-                          failure:(void (^)(id))fail;
-
 
 @end
 

vanke/view_iPhone/templates/affairs/VankeAffairsBoard_iPhone.m

@@ -93,8 +93,8 @@ ON_DID_DISAPPEAR( signal )
 
 ON_SIGNAL3(VankeAffairsBoard_iPhone, btnNotice, signal) {
     [[VankeAppBoard_iPhone sharedInstance] hideMenu];
-//    VankeNoticeListBoard_iPhone *board = [VankeNoticeListBoard_iPhone board];
-    ICRAnnouncementViewController *board = [ICRAnnouncementViewController board];
+    VankeNoticeListBoard_iPhone *board = [VankeNoticeListBoard_iPhone board];
+//    ICRAnnouncementViewController *board = [ICRAnnouncementViewController board];
     [self.stack pushBoard:board animated:YES];
 }
 

vanke/view_iPhone/templates/announcement/ICRAnnouncementViewController.m

@@ -35,14 +35,28 @@ static NSString *MyTableViewCell = @"IBTTableViewCell";
 
 #pragma mark - Life Cycle
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    
-    self.title = [IBTCommon localizableString:@"Announcement"];
-    
-    [self initSegmentConatinerFromOriginY:0];
+//- (void)viewDidLoad {
+//    [super viewDidLoad];
+//    // Do any additional setup after loading the view.
+//    
+//    self.title = [IBTCommon localizableString:@"Announcement"];
+//    
+//    [self initSegmentConatinerFromOriginY:0];
+//    [self initTableView];
+//    
+//}
+
+ON_CREATE_VIEWS( signal )
+{
+    self.navigationBarShown = YES;
+    self.navigationBarTitle = [IBTCommon localizableString:@"Announcement"];
+}
+
+ON_DID_APPEAR( signal )
+{
+    [self initSegmentConatinerFromOriginY:64];
     [self initTableView];
+    [self fetchDataMore:NO type:kICRAnnouncementTypeUnread];
 }
 
 - (void)didReceiveMemoryWarning {

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

@@ -58,9 +58,18 @@ SUPPORT_RESOURCE_LOADING( YES )
     chartPieChart.descriptionTextFont  = [UIFont fontWithName:@"微软雅黑" size:12.0];
     chartPieChart.descriptionTextShadowColor = [UIColor clearColor];
     chartPieChart.showAbsoluteValues = NO;
-    chartPieChart.showOnlyValues = NO;
+    chartPieChart.showOnlyValues = YES;
     [chartPieChart strokeChart];
     [self.chartView addSubview:chartPieChart];
+    
+    //Build the legend
+    chartPieChart.legendStyle = PNLegendItemStyleStacked;
+//    chartPieChart.legendFont = 12.0;
+    UIView *legend = [chartPieChart getLegendWithMaxWidth:200];
+    
+    //Move legend to the desired position and add to view
+    [legend setFrame:CGRectMake(10, 0, legend.frame.size.width, legend.frame.size.height)];
+    [self.chartView addSubview:legend];
 }
 
 -(NSArray*) getChartItems {
@@ -80,7 +89,7 @@ SUPPORT_RESOURCE_LOADING( YES )
 }
 
 -(void) initChartColors {
-    chartColors = @[PNYellow, PNBlue, PNTwitterColor, PNLightBlue, PNPinkDark, PNGreen, PNTitleColor,PNLightGreen, PNFreshGreen, PNDeepGreen, PNRed, PNMauve, PNBrown,  PNStarYellow, PNDarkBlue,  PNDeepGrey, PNPinkGrey, PNLightGrey, PNCleanGrey, PNDarkYellow, PNCloudWhite, PNBlack, PNiOSGreenColor];
+    chartColors = @[PNYellow, PNBlue, PNTwitterColor, PNPinkDark, PNGreen, PNTitleColor,PNLightGreen, PNFreshGreen, PNDeepGreen, PNRed, PNMauve, PNBrown,  PNStarYellow, PNDarkBlue,  PNDeepGrey, PNPinkGrey, PNLightGrey, PNCleanGrey, PNDarkYellow, PNCloudWhite, PNLightBlue, PNBlack, PNiOSGreenColor];
 }
 
 @end