瀏覽代碼

1.分享被封禁nas页面显示红点标识

huangxiaodong 11 月之前
父節點
當前提交
dcd3ac6092

+ 12 - 0
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -402,6 +402,10 @@
 		6B34DC6D2BF2070D002DD1EF /* titleLabelReusableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B34DC6A2BF2070D002DD1EF /* titleLabelReusableView.h */; };
 		6B34DC6E2BF2070D002DD1EF /* titleLabelReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B34DC6B2BF2070D002DD1EF /* titleLabelReusableView.m */; };
 		6B34DC6F2BF2070D002DD1EF /* titleLabelReusableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B34DC6A2BF2070D002DD1EF /* titleLabelReusableView.h */; };
+		6B3941CF2C50A7CA00C8FB28 /* queryShareReportMarkModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3941CE2C50A7CA00C8FB28 /* queryShareReportMarkModel.m */; };
+		6B3941D02C50A7CA00C8FB28 /* queryShareReportMarkModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3941CD2C50A7CA00C8FB28 /* queryShareReportMarkModel.h */; };
+		6B3941D12C50A7CA00C8FB28 /* queryShareReportMarkModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3941CD2C50A7CA00C8FB28 /* queryShareReportMarkModel.h */; };
+		6B3941D22C50A7CA00C8FB28 /* queryShareReportMarkModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3941CE2C50A7CA00C8FB28 /* queryShareReportMarkModel.m */; };
 		6B39586F2C34FA25003FC6C3 /* NasPreviewVideoViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B39586D2C34FA25003FC6C3 /* NasPreviewVideoViewController.h */; };
 		6B3958702C34FA25003FC6C3 /* NasPreviewVideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B39586E2C34FA25003FC6C3 /* NasPreviewVideoViewController.m */; };
 		6B3958712C34FA25003FC6C3 /* NasPreviewVideoViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B39586D2C34FA25003FC6C3 /* NasPreviewVideoViewController.h */; };
@@ -1668,6 +1672,8 @@
 		6B34DC652BF1FFB1002DD1EF /* imageCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = imageCollectionViewCell.m; sourceTree = "<group>"; };
 		6B34DC6A2BF2070D002DD1EF /* titleLabelReusableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = titleLabelReusableView.h; sourceTree = "<group>"; };
 		6B34DC6B2BF2070D002DD1EF /* titleLabelReusableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = titleLabelReusableView.m; sourceTree = "<group>"; };
+		6B3941CD2C50A7CA00C8FB28 /* queryShareReportMarkModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = queryShareReportMarkModel.h; sourceTree = "<group>"; };
+		6B3941CE2C50A7CA00C8FB28 /* queryShareReportMarkModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = queryShareReportMarkModel.m; sourceTree = "<group>"; };
 		6B39586D2C34FA25003FC6C3 /* NasPreviewVideoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NasPreviewVideoViewController.h; sourceTree = "<group>"; };
 		6B39586E2C34FA25003FC6C3 /* NasPreviewVideoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NasPreviewVideoViewController.m; sourceTree = "<group>"; };
 		6B3A4B132B6F69A500F74679 /* cloudPhoneCommonModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cloudPhoneCommonModel.h; sourceTree = "<group>"; };
@@ -3186,6 +3192,8 @@
 				6B5BE57F2BFC81E300A1B9B3 /* NASFileAndFolderModel.m */,
 				6B7EA7A82BF72D3B002D5CC2 /* queryShareModel.h */,
 				6B7EA7A92BF72D3B002D5CC2 /* queryShareModel.m */,
+				6B3941CD2C50A7CA00C8FB28 /* queryShareReportMarkModel.h */,
+				6B3941CE2C50A7CA00C8FB28 /* queryShareReportMarkModel.m */,
 				6B7EA7AE2BF73DEB002D5CC2 /* addShareModel.h */,
 				6B7EA7AF2BF73DEB002D5CC2 /* addShareModel.m */,
 				6B07AC232BF85859005C2B0E /* ShareRecordModel.h */,
@@ -3927,6 +3935,7 @@
 				6B72725B2B0E22D000C03F87 /* uploadFileRecordBgScorllView.h in Headers */,
 				6BC741522C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h in Headers */,
 				6B1F7FD62C00772500954720 /* boxDownloadFileManager.h in Headers */,
+				6B3941D02C50A7CA00C8FB28 /* queryShareReportMarkModel.h in Headers */,
 				18A909982ABC4A3300E6D2BE /* ComontAlretViewController.h in Headers */,
 				6B7272532B0CABC600C03F87 /* cachesFileManager.h in Headers */,
 				6B1FBD3E2B46875300926382 /* backupsFileRecordCell.h in Headers */,
@@ -4190,6 +4199,7 @@
 				6BD506FD2B9576A4006E7CB0 /* uploadFileRecordBgScorllView.h in Headers */,
 				6BC741542C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h in Headers */,
 				6B1F7FD82C00772500954720 /* boxDownloadFileManager.h in Headers */,
+				6B3941D12C50A7CA00C8FB28 /* queryShareReportMarkModel.h in Headers */,
 				6BD506FE2B9576A4006E7CB0 /* ComontAlretViewController.h in Headers */,
 				6BD506FF2B9576A4006E7CB0 /* cachesFileManager.h in Headers */,
 				6BD507002B9576A4006E7CB0 /* backupsFileRecordCell.h in Headers */,
@@ -4735,6 +4745,7 @@
 				6BD5074F2B9576A4006E7CB0 /* uploadFileBottomView.m in Sources */,
 				6BD507502B9576A4006E7CB0 /* LogoSelectView.m in Sources */,
 				6B679DED2C252A4E00D0DC03 /* NASMySpaceViewController.m in Sources */,
+				6B3941D22C50A7CA00C8FB28 /* queryShareReportMarkModel.m in Sources */,
 				6B2C1EA72C070ADE00FDCF82 /* ZFPresentTransition.m in Sources */,
 				6BF2A5AE2C4686C500872525 /* audioPlayDownloadManager.m in Sources */,
 				6B92836F2C4B94310098CC75 /* errorAlertTool.m in Sources */,
@@ -5080,6 +5091,7 @@
 				6B0581B32AFE02B100D37290 /* uploadFileBottomView.m in Sources */,
 				181E85012A8F6B1800292B96 /* LogoSelectView.m in Sources */,
 				6B679DEB2C252A4E00D0DC03 /* NASMySpaceViewController.m in Sources */,
+				6B3941CF2C50A7CA00C8FB28 /* queryShareReportMarkModel.m in Sources */,
 				6B2C1EA62C070ADE00FDCF82 /* ZFPresentTransition.m in Sources */,
 				6BF2A5AD2C4686C500872525 /* audioPlayDownloadManager.m in Sources */,
 				6B92836C2C4B94310098CC75 /* errorAlertTool.m in Sources */,

+ 20 - 0
创维盒子/双子星云手机/Class/Set/previewFile/model/queryShareReportMarkModel.h

@@ -0,0 +1,20 @@
+//
+//  queryShareReportMarkModel.h
+//  双子星云手机
+//
+//  Created by xd h on 2024/7/24.
+//
+
+#import "SuperModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface queryShareReportMarkDataModel : SuperModel
+@property (nonatomic, assign) BOOL reportMark;
+@end
+
+@interface queryShareReportMarkModel : SuperModel
+@property (nonatomic, strong) queryShareReportMarkDataModel*data;
+@end
+
+NS_ASSUME_NONNULL_END

+ 16 - 0
创维盒子/双子星云手机/Class/Set/previewFile/model/queryShareReportMarkModel.m

@@ -0,0 +1,16 @@
+//
+//  queryShareReportMarkModel.m
+//  双子星云手机
+//
+//  Created by xd h on 2024/7/24.
+//
+
+#import "queryShareReportMarkModel.h"
+
+@implementation queryShareReportMarkDataModel
+
+@end
+
+@implementation queryShareReportMarkModel
+
+@end

+ 38 - 1
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -36,6 +36,7 @@
 #import "HaveNoticeView.h"
 #import "audioPlayingView.h"
 #import "DFPlayer.h"
+#import "queryShareReportMarkModel.h"
 
 @interface NASViewController ()<UITableViewDelegate,UITableViewDataSource>
 {
@@ -529,6 +530,8 @@
         case 12:{
             shareRecordViewController *vc = [shareRecordViewController new];
             [self pushViewController:vc animated:YES];
+            [self.NASCommonUsedV setRedPointShow:NO];
+            [self updateShareBeMarkFun];
         }
             break;
        
@@ -624,6 +627,7 @@
     [self getLastFileDataFun];
     
     [self queryShareSwitchFunFun];
+    [self queryShareBeMarkFun];
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self checkFileTransferTask];
@@ -795,7 +799,40 @@
     });
 }
 
-#pragma mark 弹框流程 
+#pragma mark 是否有新的分享被封禁
+-(void)queryShareBeMarkFun
+{
+    NSMutableDictionary *paraDict = [NSMutableDictionary new];
+    
+    KWeakSelf
+    [[netWorkManager shareInstance] CommonGetWithCallBackCode:queryShareReportMarkFun Parameters:paraDict success:^(id  _Nonnull responseObject){
+        queryShareReportMarkModel *ShareMarkMod = [[queryShareReportMarkModel alloc] initWithDictionary:responseObject error:nil];
+        if(ShareMarkMod){
+            [weakSelf.NASCommonUsedV setRedPointShow:ShareMarkMod.data.reportMark];
+        }
+        
+    } failure:^(NSError * _Nonnull error) {
+    }];
+}
+
+#pragma mark 修改分享被封禁的mark状态()
+-(void)updateShareBeMarkFun
+{
+    NSMutableDictionary *paraDict = [NSMutableDictionary new];
+    
+    KWeakSelf
+    [[netWorkManager shareInstance] CommonPostCallBackCode:updateShareReportMarkFun Parameters:paraDict success:^(id  _Nonnull responseObject){
+//        SuperModel *ShareMarkMod = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
+//        if(ShareMarkMod){
+//            
+//        }
+        
+    } failure:^(NSError * _Nonnull error) {
+    }];
+}
+
+
+#pragma mark 弹框流程
 //优先级:1.强制盒子更新弹窗
 //       2.APP版本更新弹窗 > 新手引导弹窗 > 通知公告弹窗
 

+ 1 - 0
创维盒子/双子星云手机/NAS/view/NASCommonUsedView.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NASCommonUsedView : UIView
 @property (nonatomic,copy) void (^didClickButtonFun)(NSInteger tag);
+- (void)setRedPointShow:(BOOL)isShow;
 @end
 
 NS_ASSUME_NONNULL_END

+ 23 - 3
创维盒子/双子星云手机/NAS/view/NASCommonUsedView.m

@@ -9,6 +9,9 @@
 
 
 @interface NASCommonUsedView ()
+{
+    UIView* rightRedView;
+}
 @property(nonatomic,strong) UILabel*titleLabel;
 
 
@@ -115,13 +118,25 @@
             make.top.equalTo(imageV.mas_bottom).offset(5);
         }];
         
+        if(i==2){
+            rightRedView = [[UIView alloc] init];
+            rightRedView.backgroundColor = [UIColor hwColor:@"#DD4E4E" alpha:1.0];
+            [imageV addSubview:rightRedView];
+            rightRedView.layer.cornerRadius = 6;
+            rightRedView.hidden = YES;
+            
+            [rightRedView mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.width.mas_equalTo(12);
+                make.height.mas_equalTo(12);
+                make.right.mas_equalTo(0);
+                make.top.mas_equalTo(0);
+            }];
+        }
+        
     }
     
 }
 
-
-
-
 #pragma mark 按钮事件
 - (void)didClickButtonFun:(UIButton*)but
 {
@@ -132,5 +147,10 @@
         _didClickButtonFun(tag);
     }
 }
+
+- (void)setRedPointShow:(BOOL)isShow
+{
+    rightRedView.hidden = !isShow;
+}
 @end
 

+ 12 - 0
创维盒子/双子星云手机/netWork/newWorkInterface.h

@@ -121,4 +121,16 @@
 #define clientAddDataPointFun  @"/box/data/point/clientAdd"
 
 
+/*18 分享开关接口  GET请求
+输入参数
+ 
+ 返回数据模型 */
+#define queryShareReportMarkFun  @"/box/share/info/queryReportMark"
+
+/*19 分享开关接口  POST请求
+输入参数
+ 
+ 返回数据模型 */
+#define updateShareReportMarkFun  @"/box/share/info/updateReportMark"
+
 #endif /* newWorkInterface_h */