新版本

This commit is contained in:
roy
2019-03-12 09:26:46 +08:00
parent cbbfcb098a
commit c08d198e11
431 changed files with 19432 additions and 9136 deletions
@@ -79,6 +79,7 @@
@property (nonatomic,strong) NSMutableArray *goodsArr;
@property (nonatomic,strong) MBProgressHUD *progressHud;
@property (nonatomic,strong) UILabel *mesglabel;
@property(nonatomic,assign)NSInteger curDeviceIdx;
//@property (nonatomic,strong) UIView *redView;
@end
@@ -100,6 +101,17 @@
[self addDataRequestQueue];
[[NIMSDK sharedSDK].systemNotificationManager addDelegate:self];
[[NIMSDK sharedSDK].conversationManager addDelegate:self];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deleteCurDevice) name:@"DeleteCurDevice" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDevice) name:@"updateDevice" object:nil];
}
-(void)updateDevice{
[self.tableView reloadData];
}
-(void)dealloc{
[[NSNotificationCenter defaultCenter] removeObserver:self name:@"DeleteCurDevice" object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:@"updateDevice" object:nil];
}
-(void)addDataRequestQueue
@@ -1135,7 +1147,7 @@
}
FormatTankAddCamera *model =self.totalArr[indexPath.row];
self.curDeviceIdx=indexPath.row;
if (!model) {
return;
@@ -1420,6 +1432,55 @@
[weakSelf.view makeToast:@"请求异常"];
}];
}
#pragma mark---删除当前缓存设备
-(void)deleteCurDevice{
FormatTankAddCamera *deviceListModel =self.totalArr[self.curDeviceIdx];
NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"];
for (DeviceCameraModel *model in guanxiiArr) {
if (deviceListModel.device.deviceId == model.deviceId ) {
[guanxiiArr removeObject:model];
//保存新关系数组
[[DataCenter defaultDtacenter] setValue:guanxiiArr forKey:@"devicamerArr"];
}
}
//重置数据
NSArray*deviceArry=[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"];
NSMutableArray *newArr = [NSMutableArray arrayWithArray:deviceArry];
for (DeviceModel *model in deviceArry) {
if ([model.deviceId isEqual:deviceListModel.device.deviceId]) {
[newArr removeObject:model];
}
}
[[DataCenter defaultDtacenter] setValue: newArr forKey:@"deviceInfo"];
[self.totalArr removeObjectAtIndex:self.curDeviceIdx];
NSIndexPath*indexPath=[NSIndexPath indexPathForRow:self.curDeviceIdx inSection:0];
[self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationRight];
//GCD中的dispatch_after 实现单次的延时调用 dispatch_time的单位是纳秒,为防止用户使用时候的出现换算上的错误,Xcode在开发者打dispatch_after的时候会自动补全下面一整段代码
//dispatch_after是延迟提交,不是延迟运行
//NSEC:纳秒。
//USEC:微妙。
//SEC:秒
//PER:每
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self.tableView reloadData];
});
}
#pragma mark - 商品列表加载
-(void)loadGoodsData{
__weak typeof (self)weskSelf=self;