bug修复和功能优化

单军华

2018-07-12 3e8437ae559487362fae3525beb79c534c213a51

 screendisplay/screendisplay/Classes/??/Controller/MonitoringMapViewController.m

@@ -423,14 +423,33 @@

-(void)clickPopView
{
    DetailDataViewController * page = [[DetailDataViewController alloc] init];
    //[self presentViewController:page animated:YES  completion:nil];
    page.deviceModel = [self.deviceSevice.deviceViewModels objectAtIndex:hCurrentIndex];
    [UserDefault setObject:page.deviceModel.mac forKey:@"mac"];
    [UserDefault setObject:page.deviceModel.state forKey:@"state"];
    [UserDefault synchronize];//使用synchronize强制立即将数据写入磁盘,防止在写完NSUserDefaults后程序退出导致的数据丢失
    [self.navigationController pushViewController:page animated:YES];
    NSLog(@"clickPopView");
    DeviceModel* model = [self.deviceSevice.deviceViewModels objectAtIndex:hCurrentIndex];
    
    if([model.state intValue] == 4)
    {
        // Make toast with a title
        [self.navigationController.view makeToast:@"该设备维保中，不能获取实时数据!"
                                         duration:3.0
                                         position:CSToastPositionBottom
                                            title:@"温馨提示"
                                            image:nil
                                            style:nil
                                       completion:nil];
        
        //[MBProgressHUD showWarn:@"该设备维保中，不能获取实时数据!" ToView:self.view];
        //[Global alertMessageEx:@"该设备维保中，不能获取实时数据!" title:@"系统提示" okTtitle:nil cancelTitle:@"确定" delegate:self];
    }
    else
    {
        DetailDataViewController * page = [[DetailDataViewController alloc] init];
        //[self presentViewController:page animated:YES  completion:nil];
        page.deviceModel = [self.deviceSevice.deviceViewModels objectAtIndex:hCurrentIndex];
        [UserDefault setObject:page.deviceModel.mac forKey:@"mac"];
        [UserDefault setObject:page.deviceModel.state forKey:@"state"];
        [UserDefault synchronize];//使用synchronize强制立即将数据写入磁盘,防止在写完NSUserDefaults后程序退出导致的数据丢失
        [self.navigationController pushViewController:page animated:YES];
        NSLog(@"clickPopView");
    }
}

-(void)closePopView
@@ -524,7 +543,18 @@
        }
        else
        {
            [Global alertMessageEx:desc title:@"获取设备失败" okTtitle:nil cancelTitle:@"OK" delegate:self];
            // Make toast with a title
            if(!bIsUpdate)
            {
                [Global alertMessageEx:desc title:@"获取设备失败" okTtitle:nil cancelTitle:@"OK" delegate:self];
            }
//            [self.navigationController.view makeToast:@"该设备维保中，不能获取实时数据!"
//                                             duration:3.0
//                                             position:CSToastPositionBottom
//                                                title:@"温馨提示"
//                                                image:nil
//                                                style:nil
//                                           completion:nil];
        }
    }];
}