报警声音和历史数据提交

单军华

2018-05-04 7db6ba57b17fb7c0c364219750b14ee3d5cc351b

 pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m

@@ -11,6 +11,7 @@
#import "NetworkSingleton.h"
#import "AdNoticeView.h"
#import "NoticeModel.h"
#import "HistoryDataModel.h"

@interface HistoryRecordPage ()
{
@@ -27,6 +28,8 @@
    GloriaLabel* _EndTimesLabel;
    NSString * _beginTimeStr;
    NSString * _EndTimeStr;
    GloriaLabel* _StatusLabel;
    GloriaLabel* _YearLabel;
}

@property (nonatomic, strong) AdNoticeView * adNoticeView; // 广告控件
@@ -91,18 +94,18 @@
    ic_line.image = [UIImage imageNamed:@"ic_line"];
    [ic_bottom_bg addSubview:ic_line];
    
    GloriaLabel* _AvgValueLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 15 + 25 + 10,SCREEN_WIDTH/2, 20)];
    GloriaLabel* _AvgValueLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/4, 15 + 25 + 10,SCREEN_WIDTH/4, 20)];
    _AvgValueLabel.font = [UIFont systemFontOfSize:14];
    _AvgValueLabel.textAlignment = UITextAlignmentCenter;
    _AvgValueLabel.textAlignment = UITextAlignmentLeft;
    _AvgValueLabel.textColor = kUIColorFromRGB(0xffffff);
    _AvgValueLabel.text = @"平均值";
    [ic_bottom_bg addSubview:_AvgValueLabel];
    
    GloriaLabel* _YearLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 15 + 25 + 10 + 20,SCREEN_WIDTH/2, 30)];
    _YearLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 15 + 25 + 10 + 20,SCREEN_WIDTH/4, 30)];
    _YearLabel.font = [UIFont boldSystemFontOfSize:18];
    _YearLabel.textAlignment = UITextAlignmentCenter;
    _YearLabel.textAlignment = UITextAlignmentRight;
    _YearLabel.textColor = kUIColorFromRGB(0xffffff);
    _YearLabel.text = @"10";
    _YearLabel.text = @"0";
    [ic_bottom_bg addSubview:_YearLabel];
    
    // 根据字符串大小计算label的大小
@@ -122,11 +125,11 @@
    _StatusTipsLabel.text = @"状况";
    [ic_bottom_bg addSubview:_StatusTipsLabel];
    
    GloriaLabel* _StatusLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/2, 15 + 25 + 10+ 20,SCREEN_WIDTH/2, 20)];
    _StatusLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/2, 15 + 25 + 10+ 20,SCREEN_WIDTH/2, 20)];
    _StatusLabel.font = [UIFont boldSystemFontOfSize:18];
    _StatusLabel.textAlignment = UITextAlignmentCenter;
    _StatusLabel.textColor = kUIColorFromRGB(0xffffff);
    _StatusLabel.text = @"良好";
    _StatusLabel.text = @"未知";
    [ic_bottom_bg addSubview:_StatusLabel];
    
    _BeginTimesLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 0,SCREEN_WIDTH, 20)];
@@ -281,11 +284,36 @@
         
         if(resModel.code == 0)
         {
             //[UserDefault setObject:self.is_open_upload forKey:@"is_open_upload"];
             [UserDefault synchronize];
             _StatusLabel.text = [resModel.content objectForKey:@"status"];
             float avg = [[resModel.content objectForKey:@"avg"] floatValue];
             _YearLabel.text = [NSString stringWithFormat:@"%02.02f",avg];
             
             NSMutableArray * TempArr = [HistoryDataModel mj_objectArrayWithKeyValuesArray:[resModel.content objectForKey:@"data"]];

             if( [TempArr count] == 0 )
             {
                 [Global alertMessageEx:resModel.desc title:@"提示信息" okTtitle:nil cancelTitle:@"OK" delegate:self];
             }
             else
             {
                 [modelArray removeAllObjects];
                 [modelArray addObjectsFromArray:TempArr];
                 [historyRecordLineChart.valueArr removeAllObjects];
                 [historyRecordLineChart.valueArr addObjectsFromArray:modelArray];
                 [historyRecordLineChart.xLineDataArr removeAllObjects];
                 for (NSInteger i = 0; i < modelArray.count; i++)
                 {
                     [historyRecordLineChart.xLineDataArr addObject:[NSString stringWithFormat:@"%d",i]];
                 }
                 
                 //                 [valuepm25Arr replaceObjectAtIndex:7 withObject: [NSString stringWithFormat:@"%ld",[model.x1 integerValue]/100 + i]];
                 //                 [valueco2Arr replaceObjectAtIndex:7 withObject:[NSString stringWithFormat:@"%ld",[model.x5 integerValue]/1000 +i]];
                 
                 [historyRecordLineChart clearLine];
             }

             //[self.tableView reloadData];
             [Global alertMessageEx:resModel.desc title:@"提示信息" okTtitle:nil cancelTitle:@"OK" delegate:self];
             //[Global alertMessageEx:resModel.desc title:@"提示信息" okTtitle:nil cancelTitle:@"OK" delegate:self];
         }
         else
         {
@@ -363,7 +391,7 @@
    {
        //LiveDataModel * model = [modelArray objectAtIndex:i];
        
        [valueTeampArr addObject:[NSString stringWithFormat:@"%d",i*(rand()%10)]];
        [valueTeampArr addObject:[NSString stringWithFormat:@"%d",0]];
        [historyRecordLineChart.xLineDataArr addObject:[NSString stringWithFormat:@"%d",i]];
    }