|
@@ -24,6 +24,7 @@
|
|
|
//#import "audioPlayerViewController.h"
|
|
|
#import "videoPlayByAVPlayerViewController.h"
|
|
|
#import "MJRefresh.h"
|
|
|
+#import "getInstalledAppListModel.h"
|
|
|
|
|
|
@interface NasPreviewAPPViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
|
|
|
{
|
|
@@ -50,7 +51,7 @@
|
|
|
@property(nonatomic,strong) UIButton*uploadFileButton;
|
|
|
|
|
|
@property (nonatomic, strong) NSMutableArray*didSelectListArr;//选中的数据
|
|
|
-@property (nonatomic, strong)NASFileAudioModel * curNASFileAudioMod;
|
|
|
+@property (nonatomic, strong)getInstalledAppListModel*getInstalledAppListMod;
|
|
|
@end
|
|
|
|
|
|
@implementation NasPreviewAPPViewController
|
|
@@ -351,7 +352,7 @@
|
|
|
}
|
|
|
|
|
|
self.defaultDiskPath = pathStr;
|
|
|
- _curNASFileAudioMod = nil;
|
|
|
+ _getInstalledAppListMod = nil;
|
|
|
[self getFileListFun:NO];
|
|
|
[self setTitleAfterGetdiskFun];
|
|
|
[self hideDiskListVieFun];
|
|
@@ -363,10 +364,10 @@
|
|
|
}
|
|
|
|
|
|
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
|
|
|
- if(!_curNASFileAudioMod){
|
|
|
+ if(!_getInstalledAppListMod){
|
|
|
return 0;
|
|
|
}
|
|
|
- return _curNASFileAudioMod.data.list.count;
|
|
|
+ return _getInstalledAppListMod.data.count;
|
|
|
}
|
|
|
|
|
|
- (downLoadPreViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
|
|
@@ -390,9 +391,9 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
- if(row < _curNASFileAudioMod.data.list.count){
|
|
|
- NASFileAndFolderDataModel* dataModel = _curNASFileAudioMod.data.list[row];
|
|
|
- cell.curNASFileAndFolderDataModel = dataModel;
|
|
|
+ if(row < _getInstalledAppListMod.data.count){
|
|
|
+ getInstalledAppModel* dataModel = _getInstalledAppListMod.data[row];
|
|
|
+ cell.curGetInstalledAppMod = dataModel;
|
|
|
|
|
|
KWeakSelf
|
|
|
cell.didClickSwitch = ^(BOOL SwitchOn) {
|
|
@@ -408,23 +409,23 @@
|
|
|
return 70;
|
|
|
}
|
|
|
|
|
|
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
|
|
|
-{
|
|
|
- NSInteger row = indexPath.row;
|
|
|
- if(row < _curNASFileAudioMod.data.list.count){
|
|
|
-
|
|
|
- NASFilePicDataArrModel *dataModel = _curNASFileAudioMod.data.list[row];
|
|
|
- //videoPlayViewController *vc = [videoPlayViewController new];
|
|
|
- videoPlayByAVPlayerViewController *vc = [videoPlayByAVPlayerViewController new];
|
|
|
- vc.VideoDataMode = dataModel;
|
|
|
- [self.navigationController pushViewController:vc animated:YES];
|
|
|
-
|
|
|
- KWeakSelf
|
|
|
- vc.didNeedDeleteFile = ^(NSString * _Nonnull filePath) {
|
|
|
- [weakSelf deleteNetDataByFilePath:filePath];
|
|
|
- };
|
|
|
- }
|
|
|
-}
|
|
|
+//- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
|
|
|
+//{
|
|
|
+// NSInteger row = indexPath.row;
|
|
|
+// if(row < _curNASFileAudioMod.data.list.count){
|
|
|
+//
|
|
|
+// NASFilePicDataArrModel *dataModel = _curNASFileAudioMod.data.list[row];
|
|
|
+// //videoPlayViewController *vc = [videoPlayViewController new];
|
|
|
+// videoPlayByAVPlayerViewController *vc = [videoPlayByAVPlayerViewController new];
|
|
|
+// vc.VideoDataMode = dataModel;
|
|
|
+// [self.navigationController pushViewController:vc animated:YES];
|
|
|
+//
|
|
|
+// KWeakSelf
|
|
|
+// vc.didNeedDeleteFile = ^(NSString * _Nonnull filePath) {
|
|
|
+// [weakSelf deleteNetDataByFilePath:filePath];
|
|
|
+// };
|
|
|
+// }
|
|
|
+//}
|
|
|
|
|
|
#pragma mark 空数据
|
|
|
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView {
|
|
@@ -549,8 +550,8 @@
|
|
|
|
|
|
- (void)userCheckFilePreviewByRow:(NSInteger)row
|
|
|
{
|
|
|
- if(row < _curNASFileAudioMod.data.list.count){
|
|
|
- NASFileAudioDataModel* dataModel = _curNASFileAudioMod.data.list[row];
|
|
|
+ if(row < _getInstalledAppListMod.data.count){
|
|
|
+ NASFileAudioDataModel* dataModel = _getInstalledAppListMod.data[row];
|
|
|
|
|
|
if(dataModel.isSelectType){
|
|
|
[_didSelectListArr removeObject:dataModel];
|
|
@@ -571,7 +572,7 @@
|
|
|
|
|
|
[_didSelectListArr removeAllObjects];
|
|
|
|
|
|
- for (NASFileAudioDataModel* dataModel in _curNASFileAudioMod.data.list) {
|
|
|
+ for (NASFileAudioDataModel* dataModel in _getInstalledAppListMod.data) {
|
|
|
|
|
|
if(!button.selected){
|
|
|
dataModel.isSelectType = button.selected;
|
|
@@ -749,7 +750,7 @@
|
|
|
[self showDownloadTipFun];
|
|
|
[self checkFileTransferTask];
|
|
|
|
|
|
- if(!_curNASFileAudioMod){
|
|
|
+ if(!_getInstalledAppListMod){
|
|
|
[self getFileListFun:NO];
|
|
|
[self queryShareSwitchFunFun];
|
|
|
}
|
|
@@ -865,14 +866,9 @@
|
|
|
[[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getInstalledApk" Parameters:paraDict success:^(id _Nonnull responseObject) {
|
|
|
//[weakSelf.tableView.mj_footer endRefreshing];
|
|
|
[weakSelf removeNewIndicatorHaveStr];
|
|
|
- NASFileAudioModel*NASFileAudioMod = [[NASFileAudioModel alloc] initWithDictionary:responseObject error:nil];
|
|
|
-
|
|
|
-// if(NASFileAudioMod.data.list.count < pageSizeNum){
|
|
|
-// [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
|
|
|
-// }
|
|
|
+ weakSelf.getInstalledAppListMod = [[getInstalledAppListModel alloc] initWithDictionary:responseObject error:nil];
|
|
|
|
|
|
- [weakSelf handelNetDataAfterFilterDataBy:NASFileAudioMod];
|
|
|
- if(weakSelf.curNASFileAudioMod && weakSelf.curNASFileAudioMod.status == 0){
|
|
|
+ if(weakSelf.getInstalledAppListMod && weakSelf.getInstalledAppListMod.status == 0){
|
|
|
[weakSelf.tableView reloadData];
|
|
|
}
|
|
|
|
|
@@ -899,22 +895,22 @@
|
|
|
#pragma mark 分页数据组装
|
|
|
- (void)handelNetDataAfterFilterDataBy:(NASFileAudioModel*)NASFileAudioMod
|
|
|
{
|
|
|
- if(_curNASFileAudioMod && _curNASFileAudioMod.data && _curNASFileAudioMod.data.list){
|
|
|
- NSMutableArray *handelDataArr = [NSMutableArray arrayWithArray:_curNASFileAudioMod.data.list];//旧数据
|
|
|
- [handelDataArr addObjectsFromArray:NASFileAudioMod.data.list];//新数据
|
|
|
-
|
|
|
- _curNASFileAudioMod.data.list = (NSArray<NASFileAudioDataModel>*)handelDataArr;
|
|
|
- }
|
|
|
- else{
|
|
|
- _curNASFileAudioMod = NASFileAudioMod;
|
|
|
- }
|
|
|
-
|
|
|
- if(_curNASFileAudioMod.data.list.count == 0 ){
|
|
|
- self.tableView.mj_footer.hidden = YES;
|
|
|
- }
|
|
|
- else{
|
|
|
- self.tableView.mj_footer.hidden = NO;
|
|
|
- }
|
|
|
+// if(_getInstalledAppListMod && _getInstalledAppListMod.data ){
|
|
|
+// NSMutableArray *handelDataArr = [NSMutableArray arrayWithArray:_getInstalledAppListMod.data];//旧数据
|
|
|
+// [handelDataArr addObjectsFromArray:NASFileAudioMod.data.list];//新数据
|
|
|
+//
|
|
|
+// _curNASFileAudioMod.data.list = (NSArray<NASFileAudioDataModel>*)handelDataArr;
|
|
|
+// }
|
|
|
+// else{
|
|
|
+// _curNASFileAudioMod = NASFileAudioMod;
|
|
|
+// }
|
|
|
+//
|
|
|
+// if(_curNASFileAudioMod.data.list.count == 0 ){
|
|
|
+// self.tableView.mj_footer.hidden = YES;
|
|
|
+// }
|
|
|
+// else{
|
|
|
+// self.tableView.mj_footer.hidden = NO;
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
#pragma mark 调整文件上传
|
|
@@ -1038,13 +1034,13 @@
|
|
|
- (void)deleteNetDataByDeleteSucFun
|
|
|
{
|
|
|
NSMutableArray *afterFilterArr = [NSMutableArray new];
|
|
|
- for (NASFileAudioDataModel *model in _curNASFileAudioMod.data.list) {
|
|
|
+ for (getInstalledAppModel *model in _getInstalledAppListMod.data) {
|
|
|
if (!model.isSelectType) {
|
|
|
[afterFilterArr addObject:model];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- _curNASFileAudioMod.data.list = (NSArray<NASFileAudioDataModel>*)afterFilterArr;
|
|
|
+ _getInstalledAppListMod.data = (NSArray<getInstalledAppModel>*)afterFilterArr;
|
|
|
|
|
|
[self.tableView reloadData];
|
|
|
}
|
|
@@ -1057,13 +1053,13 @@
|
|
|
}
|
|
|
|
|
|
NSMutableArray *afterFilterArr = [NSMutableArray new];
|
|
|
- for (NASFileAudioDataModel *model in _curNASFileAudioMod.data.list) {
|
|
|
+ for (getInstalledAppModel *model in _getInstalledAppListMod.data) {
|
|
|
if (![model.path isEqualToString:filePath]) {
|
|
|
[afterFilterArr addObject:model];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- _curNASFileAudioMod.data.list = (NSArray<NASFileAudioDataModel>*)afterFilterArr;
|
|
|
+ _getInstalledAppListMod.data = (NSArray<getInstalledAppModel>*)afterFilterArr;
|
|
|
[self.tableView reloadData];
|
|
|
}
|
|
|
|