修改log和名称

KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj

@@ -34,7 +34,6 @@
 		044893F92DBC8458006C7493 /* D-DIN-PRO-700-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 044893EF2DBC8458006C7493 /* D-DIN-PRO-700-Bold.otf */; };
 		044893FA2DBC8458006C7493 /* load_start.pag in Resources */ = {isa = PBXBuildFile; fileRef = 044893F02DBC8458006C7493 /* load_start.pag */; };
 		044893FB2DBC8458006C7493 /* AlimamaShuHeiTi.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 044893F12DBC8458006C7493 /* AlimamaShuHeiTi.ttf */; };
-		044893FD2DBC8458006C7493 /* qidonglog.png in Resources */ = {isa = PBXBuildFile; fileRef = 044893F32DBC8458006C7493 /* qidonglog.png */; };
 		044893FF2DBC8458006C7493 /* download_success.pag in Resources */ = {isa = PBXBuildFile; fileRef = 044893F52DBC8458006C7493 /* download_success.pag */; };
 		044894002DBC8458006C7493 /* D-DIN-PRO-500-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 044893F72DBC8458006C7493 /* D-DIN-PRO-500-Medium.otf */; };
 		044894042DBC847D006C7493 /* ConfigManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 044894032DBC847D006C7493 /* ConfigManager.m */; };
@@ -335,6 +334,11 @@
 		044898B12DBC84A0006C7493 /* PGGMoviePlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 044898A22DBC84A0006C7493 /* PGGMoviePlayer.m */; };
 		044898B22DBC84A0006C7493 /* ListAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 044898A42DBC84A0006C7493 /* ListAlterView.m */; };
 		044898B32DBC84A0006C7493 /* MDBwebVIew.m in Sources */ = {isa = PBXBuildFile; fileRef = 044898A52DBC84A0006C7493 /* MDBwebVIew.m */; };
+		CA58B6A72DC1B0830016AF9E /* PinBiUserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA58B6A62DC1B0830016AF9E /* PinBiUserViewController.m */; };
+		CA58B6AB2DC1B2010016AF9E /* PinBiUserTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA58B6AA2DC1B2010016AF9E /* PinBiUserTableViewCell.m */; };
+		CA58B6AE2DC1CA7F0016AF9E /* UserMaterialBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = CA58B6AD2DC1CA7F0016AF9E /* UserMaterialBlock.m */; };
+		CA58B6B12DC1CACD0016AF9E /* UserMaterialListBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = CA58B6B02DC1CACD0016AF9E /* UserMaterialListBlock.m */; };
+		CA58B6B52DC20EBE0016AF9E /* adlogtemp.png in Resources */ = {isa = PBXBuildFile; fileRef = CA58B6B42DC20EBE0016AF9E /* adlogtemp.png */; };
 		CA787DBD2DBF192300F97762 /* TongZhiTSView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA787DBC2DBF192300F97762 /* TongZhiTSView.m */; };
 		CA7883F02DBF200600F97762 /* UserNoticeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7883EF2DBF200600F97762 /* UserNoticeModel.m */; };
 		CA788A552DBF685F00F97762 /* ZhiNengShiPingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A542DBF685F00F97762 /* ZhiNengShiPingViewController.m */; };
@@ -386,7 +390,6 @@
 		044893EF2DBC8458006C7493 /* D-DIN-PRO-700-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "D-DIN-PRO-700-Bold.otf"; sourceTree = "<group>"; };
 		044893F02DBC8458006C7493 /* load_start.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = load_start.pag; sourceTree = "<group>"; };
 		044893F12DBC8458006C7493 /* AlimamaShuHeiTi.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = AlimamaShuHeiTi.ttf; sourceTree = "<group>"; };
-		044893F32DBC8458006C7493 /* qidonglog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = qidonglog.png; sourceTree = "<group>"; };
 		044893F52DBC8458006C7493 /* download_success.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = download_success.pag; sourceTree = "<group>"; };
 		044893F62DBC8458006C7493 /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		044893F72DBC8458006C7493 /* D-DIN-PRO-500-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "D-DIN-PRO-500-Medium.otf"; sourceTree = "<group>"; };
@@ -1107,6 +1110,15 @@
 		330EDDAE347162C82BDFA7DB /* Pods-KuaiCunShiPin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KuaiCunShiPin.debug.xcconfig"; path = "Target Support Files/Pods-KuaiCunShiPin/Pods-KuaiCunShiPin.debug.xcconfig"; sourceTree = "<group>"; };
 		712D49EE9138DEB1CB6E17B0 /* Pods-KuaiCunShiPin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KuaiCunShiPin.release.xcconfig"; path = "Target Support Files/Pods-KuaiCunShiPin/Pods-KuaiCunShiPin.release.xcconfig"; sourceTree = "<group>"; };
 		7C87A8E9DF89F6450BFA48B3 /* Pods_KuaiCunShiPin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_KuaiCunShiPin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		CA58B6A52DC1B0830016AF9E /* PinBiUserViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PinBiUserViewController.h; sourceTree = "<group>"; };
+		CA58B6A62DC1B0830016AF9E /* PinBiUserViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PinBiUserViewController.m; sourceTree = "<group>"; };
+		CA58B6A92DC1B2010016AF9E /* PinBiUserTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PinBiUserTableViewCell.h; sourceTree = "<group>"; };
+		CA58B6AA2DC1B2010016AF9E /* PinBiUserTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PinBiUserTableViewCell.m; sourceTree = "<group>"; };
+		CA58B6AC2DC1CA7F0016AF9E /* UserMaterialBlock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserMaterialBlock.h; sourceTree = "<group>"; };
+		CA58B6AD2DC1CA7F0016AF9E /* UserMaterialBlock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserMaterialBlock.m; sourceTree = "<group>"; };
+		CA58B6AF2DC1CACD0016AF9E /* UserMaterialListBlock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserMaterialListBlock.h; sourceTree = "<group>"; };
+		CA58B6B02DC1CACD0016AF9E /* UserMaterialListBlock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserMaterialListBlock.m; sourceTree = "<group>"; };
+		CA58B6B42DC20EBE0016AF9E /* adlogtemp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = adlogtemp.png; sourceTree = "<group>"; };
 		CA787DBB2DBF192300F97762 /* TongZhiTSView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TongZhiTSView.h; sourceTree = "<group>"; };
 		CA787DBC2DBF192300F97762 /* TongZhiTSView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TongZhiTSView.m; sourceTree = "<group>"; };
 		CA7883EE2DBF200600F97762 /* UserNoticeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserNoticeModel.h; sourceTree = "<group>"; };
@@ -1209,7 +1221,6 @@
 				044893F52DBC8458006C7493 /* download_success.pag */,
 				044893F02DBC8458006C7493 /* load_start.pag */,
 				044893F62DBC8458006C7493 /* PrefixHeader.pch */,
-				044893F32DBC8458006C7493 /* qidonglog.png */,
 				044893B22DBC7A44006C7493 /* AppDelegate.h */,
 				044893B32DBC7A44006C7493 /* AppDelegate.m */,
 				CAED70F42DC05CFB00D9CD40 /* PrivacyInfo.xcprivacy */,
@@ -1218,6 +1229,7 @@
 				044893CC2DBC7AC7006C7493 /* swiftpg.swift */,
 				044893BB2DBC7A44006C7493 /* Main.storyboard */,
 				044893BE2DBC7A46006C7493 /* Assets.xcassets */,
+				CA58B6B42DC20EBE0016AF9E /* adlogtemp.png */,
 				044893C02DBC7A46006C7493 /* LaunchScreen.storyboard */,
 				044893C32DBC7A47006C7493 /* Info.plist */,
 				044893C42DBC7A47006C7493 /* main.m */,
@@ -1545,6 +1557,7 @@
 		044894AD2DBC8491006C7493 /* SheZhi */ = {
 			isa = PBXGroup;
 			children = (
+				CA58B6A42DC1B03D0016AF9E /* 屏蔽用户 */,
 				044894BB2DBC8491006C7493 /* 关于我们 */,
 				044894C82DBC8491006C7493 /* 意见反馈 */,
 				044894AE2DBC8491006C7493 /* 账号绑定 */,
@@ -1592,8 +1605,8 @@
 		044894BB2DBC8491006C7493 /* 关于我们 */ = {
 			isa = PBXGroup;
 			children = (
-				044894BC2DBC8491006C7493 /* GuanYuWoMenViewController.h */,
 				044894BD2DBC8491006C7493 /* 配置信息 */,
+				044894BC2DBC8491006C7493 /* GuanYuWoMenViewController.h */,
 				044894C32DBC8491006C7493 /* GuanYuWoMenViewController.m */,
 			);
 			path = "关于我们";
@@ -1623,9 +1636,9 @@
 		044894C82DBC8491006C7493 /* 意见反馈 */ = {
 			isa = PBXGroup;
 			children = (
-				044894C92DBC8491006C7493 /* YiJianFKViewController.h */,
 				044894CA2DBC8491006C7493 /* cell */,
 				044894CE2DBC8491006C7493 /* view */,
+				044894C92DBC8491006C7493 /* YiJianFKViewController.h */,
 				044894D12DBC8491006C7493 /* YiJianFKViewController.m */,
 			);
 			path = "意见反馈";
@@ -1769,8 +1782,8 @@
 		044895002DBC8491006C7493 /* view */ = {
 			isa = PBXGroup;
 			children = (
-				044895012DBC8491006C7493 /* WoDeView.m */,
 				044895022DBC8491006C7493 /* WoDeView.h */,
+				044895012DBC8491006C7493 /* WoDeView.m */,
 			);
 			path = view;
 			sourceTree = "<group>";
@@ -1886,10 +1899,10 @@
 		044895262DBC8491006C7493 /* 文本 */ = {
 			isa = PBXGroup;
 			children = (
-				044895272DBC8491006C7493 /* UrlXiaZaiWBViewController.m */,
-				044895282DBC8491006C7493 /* UrlXiaZaiWBViewControllerOModel.swift */,
 				044895292DBC8491006C7493 /* cell */,
 				0448952C2DBC8491006C7493 /* UrlXiaZaiWBViewController.h */,
+				044895272DBC8491006C7493 /* UrlXiaZaiWBViewController.m */,
+				044895282DBC8491006C7493 /* UrlXiaZaiWBViewControllerOModel.swift */,
 			);
 			path = "文本";
 			sourceTree = "<group>";
@@ -2079,8 +2092,8 @@
 		044895782DBC8492006C7493 /* 印记 */ = {
 			isa = PBXGroup;
 			children = (
-				044895792DBC8492006C7493 /* ShiPingEditShuiYinView.m */,
 				0448957A2DBC8492006C7493 /* ShiPingEditShuiYinView.h */,
+				044895792DBC8492006C7493 /* ShiPingEditShuiYinView.m */,
 			);
 			path = "印记";
 			sourceTree = "<group>";
@@ -2214,6 +2227,10 @@
 				CA788A742DBF871700F97762 /* VideoGenModel.m */,
 				CA788A762DBF903A00F97762 /* VideoGenDetailModel.h */,
 				CA788A772DBF903A00F97762 /* VideoGenDetailModel.m */,
+				CA58B6AC2DC1CA7F0016AF9E /* UserMaterialBlock.h */,
+				CA58B6AD2DC1CA7F0016AF9E /* UserMaterialBlock.m */,
+				CA58B6AF2DC1CACD0016AF9E /* UserMaterialListBlock.h */,
+				CA58B6B02DC1CACD0016AF9E /* UserMaterialListBlock.m */,
 			);
 			path = model;
 			sourceTree = "<group>";
@@ -2391,10 +2408,10 @@
 		044896292DBC8492006C7493 /* 发布 */ = {
 			isa = PBXGroup;
 			children = (
-				0448962A2DBC8492006C7493 /* ShuCaiKuFaBuViewController.m */,
+				0448962F2DBC8492006C7493 /* view */,
 				0448962B2DBC8492006C7493 /* cell */,
 				0448962E2DBC8492006C7493 /* ShuCaiKuFaBuViewController.h */,
-				0448962F2DBC8492006C7493 /* view */,
+				0448962A2DBC8492006C7493 /* ShuCaiKuFaBuViewController.m */,
 			);
 			path = "发布";
 			sourceTree = "<group>";
@@ -2411,10 +2428,10 @@
 		0448962F2DBC8492006C7493 /* view */ = {
 			isa = PBXGroup;
 			children = (
-				044896302DBC8492006C7493 /* ShuCaiKuFaBuView.m */,
 				044896312DBC8492006C7493 /* ShuCaiKuFaBuTypeAlterView.h */,
-				044896322DBC8492006C7493 /* ShuCaiKuFaBuView.h */,
 				044896332DBC8492006C7493 /* ShuCaiKuFaBuTypeAlterView.m */,
+				044896322DBC8492006C7493 /* ShuCaiKuFaBuView.h */,
+				044896302DBC8492006C7493 /* ShuCaiKuFaBuView.m */,
 			);
 			path = view;
 			sourceTree = "<group>";
@@ -3043,6 +3060,25 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CA58B6A42DC1B03D0016AF9E /* 屏蔽用户 */ = {
+			isa = PBXGroup;
+			children = (
+				CA58B6A82DC1B0E00016AF9E /* cell */,
+				CA58B6A52DC1B0830016AF9E /* PinBiUserViewController.h */,
+				CA58B6A62DC1B0830016AF9E /* PinBiUserViewController.m */,
+			);
+			path = "屏蔽用户";
+			sourceTree = "<group>";
+		};
+		CA58B6A82DC1B0E00016AF9E /* cell */ = {
+			isa = PBXGroup;
+			children = (
+				CA58B6A92DC1B2010016AF9E /* PinBiUserTableViewCell.h */,
+				CA58B6AA2DC1B2010016AF9E /* PinBiUserTableViewCell.m */,
+			);
+			path = cell;
+			sourceTree = "<group>";
+		};
 		CA788A522DBF684C00F97762 /* 智能视频 */ = {
 			isa = PBXGroup;
 			children = (
@@ -3153,7 +3189,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				0448983A2DBC849B006C7493 /* encry.txt in Resources */,
-				044893FD2DBC8458006C7493 /* qidonglog.png in Resources */,
 				044893C22DBC7A46006C7493 /* LaunchScreen.storyboard in Resources */,
 				CAED70F52DC05CFB00D9CD40 /* PrivacyInfo.xcprivacy in Resources */,
 				044893BF2DBC7A46006C7493 /* Assets.xcassets in Resources */,
@@ -3167,6 +3202,7 @@
 				0448988C2DBC849C006C7493 /* loading8@3x.png in Resources */,
 				044893BD2DBC7A44006C7493 /* Main.storyboard in Resources */,
 				044893F82DBC8458006C7493 /* download_progress.pag in Resources */,
+				CA58B6B52DC20EBE0016AF9E /* adlogtemp.png in Resources */,
 				044898822DBC849C006C7493 /* loading7@3x.png in Resources */,
 				044898812DBC849C006C7493 /* loading@3x.png in Resources */,
 				044898702DBC849C006C7493 /* FSActionSheet_cancel@2x.png in Resources */,
@@ -3385,9 +3421,11 @@
 				044896E92DBC8494006C7493 /* ShuCaiKuFaBuView.m in Sources */,
 				044896932DBC8493006C7493 /* XiaZaiAlter.m in Sources */,
 				044896BA2DBC8494006C7493 /* KCSPUserGXModel.m in Sources */,
+				CA58B6AE2DC1CA7F0016AF9E /* UserMaterialBlock.m in Sources */,
 				044898732DBC849C006C7493 /* FSActionSheetCell.m in Sources */,
 				044896902DBC8493006C7493 /* ShiPingEditJGView.m in Sources */,
 				044898B22DBC84A0006C7493 /* ListAlterView.m in Sources */,
+				CA58B6B12DC1CACD0016AF9E /* UserMaterialListBlock.m in Sources */,
 				044896672DBC8493006C7493 /* ZhiBoHuiFangViewController.m in Sources */,
 				0448964C2DBC8493006C7493 /* ZhangHuGuanLiTableViewCell.m in Sources */,
 				044896592DBC8493006C7493 /* HuiYuanZXQuanYiView.m in Sources */,
@@ -3414,6 +3452,7 @@
 				044898462DBC849C006C7493 /* UIButton+HQCustomIcon.m in Sources */,
 				044898712DBC849C006C7493 /* FSActionSheetConfig.m in Sources */,
 				044896412DBC8493006C7493 /* PeiZhiShowViewControllerOModel.swift in Sources */,
+				CA58B6A72DC1B0830016AF9E /* PinBiUserViewController.m in Sources */,
 				044898452DBC849C006C7493 /* TagInfoModel.m in Sources */,
 				0448967A2DBC8493006C7493 /* XiaZaiManager.m in Sources */,
 				044898552DBC849C006C7493 /* TabBarController.m in Sources */,
@@ -3532,6 +3571,7 @@
 				044894A12DBC8487006C7493 /* ffmpeg_videotoolbox.c in Sources */,
 				044893CD2DBC7AC7006C7493 /* swiftpg.swift in Sources */,
 				CA788A722DBF842400F97762 /* ZhiNengShiPingVideoView.m in Sources */,
+				CA58B6AB2DC1B2010016AF9E /* PinBiUserTableViewCell.m in Sources */,
 				0448969E2DBC8493006C7493 /* JinDuTiaoView.m in Sources */,
 				044896712DBC8493006C7493 /* UrlXiaZaiSPCollectionViewCell.m in Sources */,
 				044896B42DBC8494006C7493 /* KCSPCheckActivesModel.m in Sources */,
@@ -3683,7 +3723,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KuaiCunShiPin/KuaiCunShiPin.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 114;
+				CURRENT_PROJECT_VERSION = 121;
 				DEVELOPMENT_TEAM = B8MTNU3W9A;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KuaiCunShiPin/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3712,14 +3752,14 @@
 					"\"$(SRCROOT)/KuaiCunShiPin/OtherFrameworks/Category/RSAEncrypt/lib/include\"",
 				);
 				INFOPLIST_FILE = KuaiCunShiPin/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "快存视频";
+				INFOPLIST_KEY_CFBundleDisplayName = "极光视频";
-				INFOPLIST_KEY_NSCalendarsUsageDescription = "快存视频需要使用日历功能";
+				INFOPLIST_KEY_NSCalendarsUsageDescription = "极光视频需要使用日历功能";
-				INFOPLIST_KEY_NSCameraUsageDescription = "快存视频处理视频、图片处理和意见反馈需要使用相机拍摄照片";
+				INFOPLIST_KEY_NSCameraUsageDescription = "极光视频处理视频、图片处理和意见反馈需要使用相机拍摄照片";
-				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "快存视频友盟SDK需要使用您的位置信息";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "极光视频友盟SDK需要使用您的位置信息";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "快存视频拍摄需要使用麦克风";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "极光视频拍摄需要使用麦克风";
-				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "快存视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "极光视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
-				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "快存视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "极光视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
-				INFOPLIST_KEY_NSUserTrackingUsageDescription = "快存视频用于推荐个性化广告";
+				INFOPLIST_KEY_NSUserTrackingUsageDescription = "极光视频用于推荐个性化广告";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -3758,7 +3798,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KuaiCunShiPin/KuaiCunShiPin.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 114;
+				CURRENT_PROJECT_VERSION = 121;
 				DEVELOPMENT_TEAM = B8MTNU3W9A;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KuaiCunShiPin/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3787,14 +3827,14 @@
 					"\"$(SRCROOT)/KuaiCunShiPin/OtherFrameworks/Category/RSAEncrypt/lib/include\"",
 				);
 				INFOPLIST_FILE = KuaiCunShiPin/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "快存视频";
+				INFOPLIST_KEY_CFBundleDisplayName = "极光视频";
-				INFOPLIST_KEY_NSCalendarsUsageDescription = "快存视频需要使用日历功能";
+				INFOPLIST_KEY_NSCalendarsUsageDescription = "极光视频需要使用日历功能";
-				INFOPLIST_KEY_NSCameraUsageDescription = "快存视频处理视频、图片处理和意见反馈需要使用相机拍摄照片";
+				INFOPLIST_KEY_NSCameraUsageDescription = "极光视频处理视频、图片处理和意见反馈需要使用相机拍摄照片";
-				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "快存视频友盟SDK需要使用您的位置信息";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "极光视频友盟SDK需要使用您的位置信息";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "快存视频拍摄需要使用麦克风";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "极光视频拍摄需要使用麦克风";
-				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "快存视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "极光视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
-				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "快存视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "极光视频处理视频、保存图片、处理图片和意见反馈需要使用相册";
-				INFOPLIST_KEY_NSUserTrackingUsageDescription = "快存视频用于推荐个性化广告";
+				INFOPLIST_KEY_NSUserTrackingUsageDescription = "极光视频用于推荐个性化广告";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;

KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,112 +1,112 @@
 {
   "images" : [
     {
-      "filename" : "51 15.png",
+      "filename" : "WechatIMG184 15.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "51 13.png",
+      "filename" : "WechatIMG184 13.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "51 14.png",
+      "filename" : "WechatIMG184 14.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "51 10.png",
+      "filename" : "WechatIMG184 10.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "51 12.png",
+      "filename" : "WechatIMG184 12.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "38x38"
     },
     {
-      "filename" : "51 9.png",
+      "filename" : "WechatIMG184 9.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "3x",
       "size" : "38x38"
     },
     {
-      "filename" : "51 11.png",
+      "filename" : "WechatIMG184 11.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "51 8.png",
+      "filename" : "WechatIMG184 7.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "51 7.png",
+      "filename" : "WechatIMG184 8.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "51 2.png",
+      "filename" : "WechatIMG184 2.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "51 6.png",
+      "filename" : "WechatIMG184 6.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "64x64"
     },
     {
-      "filename" : "51 1.png",
+      "filename" : "WechatIMG184 1.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "3x",
       "size" : "64x64"
     },
     {
-      "filename" : "51 5.png",
+      "filename" : "WechatIMG184 5.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "68x68"
     },
     {
-      "filename" : "51 4.png",
+      "filename" : "WechatIMG184 4.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "51 3.png",
+      "filename" : "WechatIMG184 3.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "51.png",
+      "filename" : "WechatIMG184.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/logicon.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "150@1x_副本.png",
+      "filename" : "111.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/我的/my_headnomo.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "150@1x_副本.png",
+      "filename" : "111.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/素材库/sc_detail_more.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "sdf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "sdf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KuaiCunShiPin/KuaiCunShiPin/Base.lproj/LaunchScreen.storyboard

@@ -15,14 +15,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logicon" translatesAutoresizingMaskIntoConstraints="NO" id="r5B-sF-i4K">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="adlogtemp.png" translatesAutoresizingMaskIntoConstraints="NO" id="r5B-sF-i4K">
                                 <rect key="frame" x="156.66666666666666" y="209" width="80" height="80"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="80" id="LMq-uD-Qbr"/>
                                     <constraint firstAttribute="height" constant="80" id="qLb-oS-J0b"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="快存视频" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EN-E5-2vu">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="极光视频" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EN-E5-2vu">
                                 <rect key="frame" x="158.33333333333334" y="301" width="76.666666666666657" height="24"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -45,6 +45,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="logicon" width="75" height="75"/>
+        <image name="adlogtemp.png" width="192" height="192"/>
     </resources>
 </document>

KuaiCunShiPin/KuaiCunShiPin/Main/Login/view/LoginView.m

@@ -49,7 +49,7 @@
         }];
         
         UILabel *lbname = [[UILabel alloc] init];
-        [lbname setText:@"快存视频"];
+        [lbname setText:@"极光视频"];
         [lbname setTextColor:RGBACOLOR(255, 255, 255, 0.9)];
         [lbname setTextAlignment:NSTextAlignmentLeft];
         [lbname setFont:[UIFont systemFontOfSize:20]];

KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.h

@@ -23,6 +23,10 @@
 #import "MaterialTagModel.h"
 #import "VideoGenModel.h"
 #import "VideoGenDetailModel.h"
+
+#import "UserMaterialBlock.h"
+#import "UserMaterialListBlock.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KCSPNetManager : NSObject
@@ -276,6 +280,28 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)requestVideoGenStatusData:(UIView *)view
                               ID:(NSString *)ID
                         Callback:(completeModeBlock)callback;
+
+/*
+ 屏蔽用户POST
+ /api/user/material/block
+ 取消屏蔽用户DELETE
+ id
+ type 2post 4删除
+ */
++(void)requestUserMaterialBlockData:(UIView *)view
+                                 ID:(NSString *)ID
+                               type:(int)type
+                           Callback:(completeModeBlock)callback;
+
+/*
+ 屏蔽列表
+ /api/user/material/block
+ page
+ */
++(void)requestUserMaterialBlockListData:(UIView *)view
+                                   page:(NSString *)page
+                               Callback:(completeModeBlock)callback;
+
 @end
 
 NS_ASSUME_NONNULL_END

KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.m

@@ -992,6 +992,88 @@
     }];
 }
 
+/*
+ 屏蔽用户POST
+ /api/user/material/block
+ 取消屏蔽用户DELETE
+ id
+ type 2post 4删除
+ */
++(void)requestUserMaterialBlockData:(UIView *)view
+                                 ID:(NSString *)ID
+                               type:(int)type
+                           Callback:(completeModeBlock)callback
+{
+    NSMutableDictionary *dicQuery = [NSMutableDictionary new];
+    if(type==4)
+    {
+        [dicQuery setObject:[Tools isStringnil:ID] forKey:@"id"];
+    }
+    
+    NSMutableDictionary *dicHeader = [NSMutableDictionary new];
+    
+    NSMutableDictionary *dicpush = [NSMutableDictionary new];
+    if(type==2)
+    {
+        [dicpush setObject:[Tools isStringnil:ID] forKey:@"material_id"];
+    }
+    
+    [YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:type url:@"api/user/material/block" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id  _Nullable responseObject, NSError * _Nullable error) {
+        BOOL state = NO;
+        NSString *describle = @"";
+        if (responseObject==nil) {
+            describle = @"网络错误";
+            BaseModel *model = [BaseModel new];
+            model.message =describle;
+            callback(state,model,describle);
+        }else{
+            NSDictionary *dicAll=responseObject;
+            describle = dicAll[@"message"];
+            if ([[NSString stringWithFormat:@"%@",dicAll[@"code"]] intValue] == 0) {
+                state = YES;
+            }
+            callback(state,[UserMaterialBlock yy_modelWithJSON:dicAll],describle);
+        }
+    }];
+}
+
+/*
+ 屏蔽列表
+ /api/user/material/block
+ page
+ */
++(void)requestUserMaterialBlockListData:(UIView *)view
+                                   page:(NSString *)page
+                               Callback:(completeModeBlock)callback
+{
+    NSMutableDictionary *dicQuery = [NSMutableDictionary new];
+    [dicQuery setObject:[Tools isStringnil:page] forKey:@"page"];
+    [dicQuery setObject:@"100" forKey:@"size"];
+    
+    
+    NSMutableDictionary *dicHeader = [NSMutableDictionary new];
+    
+    NSMutableDictionary *dicpush = [NSMutableDictionary new];
+    
+    [YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:1 url:@"api/user/material/block" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id  _Nullable responseObject, NSError * _Nullable error) {
+        BOOL state = NO;
+        NSString *describle = @"";
+        if (responseObject==nil) {
+            describle = @"网络错误";
+            BaseModel *model = [BaseModel new];
+            model.message =describle;
+            callback(state,model,describle);
+        }else{
+            NSDictionary *dicAll=responseObject;
+            describle = dicAll[@"message"];
+            if ([[NSString stringWithFormat:@"%@",dicAll[@"code"]] intValue] == 0) {
+                state = YES;
+            }
+            callback(state,[UserMaterialListBlock yy_modelWithJSON:dicAll],describle);
+        }
+    }];
+}
+
 
 @end
 

KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/UserMaterialBlock.h

@@ -0,0 +1,17 @@
+//
+//  UserMaterialBlock.h
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "BaseModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UserMaterialBlock : BaseModel
+///
+@property (nonatomic , strong) NSString *data;
+@end
+
+NS_ASSUME_NONNULL_END

KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/UserMaterialBlock.m

@@ -0,0 +1,12 @@
+//
+//  UserMaterialBlock.m
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "UserMaterialBlock.h"
+
+@implementation UserMaterialBlock
+
+@end

KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/UserMaterialListBlock.h

@@ -0,0 +1,33 @@
+//
+//  UserMaterialListBlock.h
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "BaseModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+@class UserMaterialListBlockData,UserMaterialListBlockDataItems;
+@interface UserMaterialListBlock : BaseModel
+///
+@property (nonatomic , strong) UserMaterialListBlockData *data;
+@end
+@interface UserMaterialListBlockData : NSObject
+///
+@property (nonatomic , strong) NSArray *items;
+
+@end
+@interface UserMaterialListBlockDataItems : NSObject
+///
+@property (nonatomic , strong) NSString *ID;
+///
+@property (nonatomic , strong) NSString *avatar;
+///
+@property (nonatomic , strong) NSString *user_name;
+///
+@property (nonatomic , strong) NSString *create_time;
+@end
+
+
+NS_ASSUME_NONNULL_END

KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/UserMaterialListBlock.m

@@ -0,0 +1,26 @@
+//
+//  UserMaterialListBlock.m
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "UserMaterialListBlock.h"
+
+@implementation UserMaterialListBlock
++ (NSDictionary *)modelContainerPropertyGenericClass {
+    return @{@"data" : [UserMaterialListBlockData class]};
+}
+@end
+@implementation UserMaterialListBlockData
++ (NSDictionary *)modelContainerPropertyGenericClass {
+    return @{@"items" : [UserMaterialListBlockDataItems class]};
+}
+@end
+@implementation UserMaterialListBlockDataItems
++ (nullable NSDictionary<NSString *, id> *)modelCustomPropertyMapper
+{
+    return @{@"ID" : @"id"};
+}
+@end
+

KuaiCunShiPin/KuaiCunShiPin/Main/我的/SheZhi/SheZhiViewController.m

@@ -18,6 +18,7 @@
 #import "AppDelegate.h"
 #import "NavgationController.h"
 #import "LoginViewController.h"
+#import "PinBiUserViewController.h"
 
 @interface SheZhiViewController ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -58,7 +59,7 @@
     }];
     _tableView = tableView;
     
-    self.arrdata = @[@"意见反馈",@"账号管理",@"关于我们",@"清除缓存",@"注销账号"];
+    self.arrdata = @[@"屏蔽用户",@"意见反馈",@"账号管理",@"关于我们",@"清除缓存",@"注销账号"];
     
     UIView *viewbottom = [[UIView alloc] init];
     [viewbottom setBackgroundColor:[UIColor clearColor]];
@@ -85,7 +86,7 @@
     [Tools changedView:btsend colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     if([UserDetailModel shareModel].temp.intValue == 1)
     {
-        self.arrdata = @[@"意见反馈",@"账号管理",@"关于我们",@"清除缓存"];
+        self.arrdata = @[@"屏蔽用户",@"意见反馈",@"账号管理",@"关于我们",@"清除缓存"];
         [btsend setHidden:YES];
     }
 }
@@ -203,6 +204,11 @@
             });
         }];
     }
+    else if([str isEqualToString:@"屏蔽用户"])
+    {
+        PinBiUserViewController *vc = [PinBiUserViewController new];
+        [self.navigationController pushViewController:vc animated:YES];
+    }
     else if([str isEqualToString:@"注销账号"])
     {
         [ZhangHaoBDJBAlterView showTitle:@"提示" info:@"为了您的账户安全，注销账户后将会永久清除与该账户相关的所有信息，服务器不在保存" back:^(NSInteger tag) {

KuaiCunShiPin/KuaiCunShiPin/Main/我的/SheZhi/关于我们/GuanYuWoMenViewController.m

@@ -53,7 +53,7 @@
     
     
     UILabel *lbname = [[UILabel alloc] init];
-    [lbname setText:@"快存视频"];
+    [lbname setText:@"极光视频"];
     [lbname setTextColor:[UIColor whiteColor]];
     [lbname setTextAlignment:NSTextAlignmentLeft];
     [lbname setFont:[UIFont fontWithName:@"PingFangSC-Medium" size:16]];

KuaiCunShiPin/KuaiCunShiPin/Main/我的/SheZhi/屏蔽用户/PinBiUserViewController.h

@@ -0,0 +1,16 @@
+//
+//  PinBiUserViewController.h
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PinBiUserViewController : BaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

KuaiCunShiPin/KuaiCunShiPin/Main/我的/SheZhi/屏蔽用户/PinBiUserViewController.m

@@ -0,0 +1,148 @@
+//
+//  PinBiUserViewController.m
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "PinBiUserViewController.h"
+#import "PinBiUserTableViewCell.h"
+#import "UIAlertController+Blocks.h"
+#import "KCSPNetManager.h"
+
+@interface PinBiUserViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
+///
+@property (nonatomic , strong) UITableView *tableView;
+///
+@property (nonatomic , strong) NSMutableArray *arrdata;
+@end
+
+@implementation PinBiUserViewController
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
+    [self showNaviGationView:YES];
+    [self.navigationView setTitle:@"屏蔽用户" titleColor:RGBACOLOR(255, 255, 255, 0.9)];
+    [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)];
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+    [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone];
+    [tableView setBackgroundColor:[UIColor clearColor]];
+    [tableView setDelegate:self];
+    [tableView setDataSource:self];
+    [self.view addSubview:tableView];
+    [tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.bottom.equalTo(self.view);
+        make.top.offset(NavHeight);
+    }];
+    _tableView = tableView;
+    [tableView setEmptyDataSetDelegate:self];
+    [tableView setEmptyDataSetSource:self];
+    
+    [self getdata];
+}
+-(void)getdata
+{
+    [KCSPHUDAlterView showView];
+    [KCSPNetManager requestUserMaterialBlockListData:self.view page:@"1" Callback:^(BOOL state, UserMaterialListBlock *responseObject, NSString * _Nullable describle) {
+        [KCSPHUDAlterView dismis];
+        if(state)
+        {
+            self.arrdata = [NSMutableArray new];
+            [self.arrdata addObjectsFromArray:responseObject.data.items];
+        }
+        else
+        {
+            [HXHud showMessage:responseObject.message afterDelayType:1];
+        }
+        [self.tableView reloadData];
+    }];
+}
+#pragma mark - UITableView
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return self.arrdata.count;
+}
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 1;
+}
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *strcell = @"PinBiUserTableViewCell";
+    PinBiUserTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+    if(!cell)
+    {
+        cell = [[PinBiUserTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+        [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+        [cell setBackgroundColor:[UIColor clearColor]];
+    }
+    cell.model = self.arrdata[indexPath.section];
+    return cell;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    return 0.01;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    return 10;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 80;
+}
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    return [UIView new];
+}
+-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+{
+    return [UIView new];
+}
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [UIAlertController showActionSheetInViewController:self withTitle:nil message:nil cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@[@"解除屏蔽"] popoverPresentationControllerBlock:^(UIPopoverPresentationController * _Nonnull popover) {
+        
+    } tapBlock:^(UIAlertController * _Nonnull controller, UIAlertAction * _Nonnull action, NSInteger buttonIndex) {
+        if(buttonIndex==2)
+        {
+            
+            UserMaterialListBlockDataItems *model = self.arrdata[indexPath.section];
+            [KCSPHUDAlterView showView];
+            [KCSPNetManager requestUserMaterialBlockData:self.view ID:model.ID type:4 Callback:^(BOOL state, UserMaterialBlock *responseObject, NSString * _Nullable describle) {
+                [KCSPHUDAlterView dismis];
+                if(state)
+                {
+                    [self.arrdata removeObject:model];
+                    [self.tableView reloadData];
+                    
+                    [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"refSCHomelist"];
+                }
+                else
+                {
+                    [HXHud showMessage:responseObject.message afterDelayType:1];
+                }
+            }];
+        }
+    }];
+}
+#pragma mark - DZNEmptyDataSetSource
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    NSString *str = @"暂无数据";
+    return [Tools arrstring:str andstart:0 andend:(int)str.length andfont:[UIFont systemFontOfSize:14] andcolor:RGBCOLOR(158, 158, 158)];
+}
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    NSString *strimg = @"jl_暂无图片";
+    return [UIImage imageNamed:strimg];
+}
+
+@end

KuaiCunShiPin/KuaiCunShiPin/Main/我的/SheZhi/屏蔽用户/cell/PinBiUserTableViewCell.h

@@ -0,0 +1,17 @@
+//
+//  PinBiUserTableViewCell.h
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import <UIKit/UIKit.h>
+#import "UserMaterialListBlock.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PinBiUserTableViewCell : UITableViewCell
+///
+@property (nonatomic , strong) UserMaterialListBlockDataItems *model;
+@end
+
+NS_ASSUME_NONNULL_END

KuaiCunShiPin/KuaiCunShiPin/Main/我的/SheZhi/屏蔽用户/cell/PinBiUserTableViewCell.m

@@ -0,0 +1,88 @@
+//
+//  PinBiUserTableViewCell.m
+//  KuaiCunShiPin
+//
+//  Created by 工作 on 2025/4/30.
+//
+
+#import "PinBiUserTableViewCell.h"
+
+@interface PinBiUserTableViewCell ()
+///
+@property (nonatomic , strong) UIImageView *imgvhd;
+///
+@property (nonatomic , strong) UILabel *lbname;
+@property (nonatomic , strong) UILabel *lbtime;
+@end
+
+@implementation PinBiUserTableViewCell
+
+-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
+    {
+        UIView *viewback = [[UIView alloc] init];
+        [self.contentView addSubview:viewback];
+        [viewback mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.equalTo(self.contentView);
+        }];
+        
+        UIImageView *imgvhd = [[UIImageView alloc] init];
+        [viewback addSubview:imgvhd];
+        [imgvhd mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.height.offset(40);
+            make.left.offset(12);
+            make.centerY.equalTo(viewback);
+        }];
+        [imgvhd.layer setMasksToBounds:YES];
+        [imgvhd.layer setCornerRadius:20];
+        _imgvhd = imgvhd;
+        
+        UILabel *lbname = [[UILabel alloc] init];
+        [lbname setText:@""];
+        [lbname setTextColor:[UIColor whiteColor]];
+        [lbname setTextAlignment:NSTextAlignmentLeft];
+        [lbname setFont:[UIFont systemFontOfSize:14]];
+        [viewback addSubview:lbname];
+        [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(imgvhd.mas_right).offset(10);
+            make.centerY.equalTo(viewback);
+        }];
+        _lbname = lbname;
+        
+        UILabel *lbtime = [[UILabel alloc] init];
+        [lbtime setText:@""];
+        [lbtime setTextColor:RGBCOLOR(241, 241, 241)];
+        [lbtime setTextAlignment:NSTextAlignmentRight];
+        [lbtime setFont:[UIFont systemFontOfSize:14]];
+        [viewback addSubview:lbtime];
+        [lbtime mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerY.equalTo(viewback);
+            make.right.equalTo(viewback).offset(-12);
+        }];
+        _lbtime = lbtime;
+        
+        UIView *viewline = [[UIView alloc] init];
+        [viewline setBackgroundColor:RGBACOLOR(255, 255, 255, 0.1)];
+        [viewback addSubview:viewline];
+        [viewline mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.bottom.equalTo(viewback);
+            make.left.offset(16);
+            make.right.equalTo(viewback).offset(-16);
+            make.height.offset(1);
+        }];
+    }
+    return self;
+}
+
+-(void)setModel:(UserMaterialListBlockDataItems *)model
+{
+    _model = model;
+    
+    [self.imgvhd sd_setImageWithURL:[NSURL URLWithString:model.avatar] placeholderImage:[UIImage imageNamed:@"my_headnomo"]];
+    NSString *sstrname = model.user_name;
+    self.lbname.text = sstrname.length==0?@"游客":[Tools isStringnilkong:sstrname];
+    self.lbtime.text = model.create_time;
+}
+
+@end

KuaiCunShiPin/KuaiCunShiPin/Main/我的/view/WoDeView.m

@@ -208,7 +208,7 @@
     [view setUserInteractionEnabled:YES];
     
     UILabel *lbnameHY = [[UILabel alloc] init];
-    [lbnameHY setText:@"快存视频·会员"];
+    [lbnameHY setText:@"极光视频·会员"];
     [lbnameHY setTextColor:RGBACOLOR(255, 255, 255, 0.9)];
     [lbnameHY setTextAlignment:NSTextAlignmentLeft];
     [lbnameHY setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:18]];
@@ -278,7 +278,7 @@
         }];
         [self.imgvback setHidden:NO];
         [self.imgvback setImage:imagebc];
-        [self.lbnameHY setText:@"快存视频·普通会员"];
+        [self.lbnameHY setText:@"极光视频·普通会员"];
         [self.lbinfoHY setText:[NSString stringWithFormat:@"%@ 会员到期",modelDetail.vip_expire]];
     }
     else if([UserDetailModel shareModel].vip.intValue==3)
@@ -290,7 +290,7 @@
         [self.imgvback setHidden:NO];
         [self.imgvback setImage:imagebc];
         
-        [self.lbnameHY setText:@"快存视频·终身会员"];
+        [self.lbnameHY setText:@"极光视频·终身会员"];
         [self.lbinfoHY setText:@"享受永久会员专属权益"];
         [self.btkt setHidden:YES];
     }
@@ -303,7 +303,7 @@
         [self.imgvback setHidden:NO];
         [self.imgvback setImage:imagebc];
         
-        [self.lbnameHY setText:@"快存视频"];
+        [self.lbnameHY setText:@"极光视频"];
         [self.lbinfoHY setText:@"点击成为会员解锁所有功能"];
         if([Tools isStringnil:self.modelDetail.vip_expire].length>6)
         {
@@ -315,10 +315,16 @@
 {
     self.arrdata = [NSMutableArray new];
     [self.arrdata addObject:@"账号绑定"];
-//    [self.arrdata addObject:@"发布素材"];
+    [self.arrdata addObject:@"发布素材"];
     [self.arrdata addObject:@"兑换钻石"];
+//    if(DEBUG)
+//    {
 //        [self.arrdata addObject:@"分享APP"];
+//        if([UserDetailModel zhiFuState])
+//        {
 //            [self.arrdata addObject:@"联系客服"];
+//        }
+//    }
     [self.arrdata addObject:@"系统设置"];
     [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.offset(60*self.arrdata.count);
@@ -402,9 +408,9 @@
     }
     else if([str isEqualToString:@"分享APP"])
     {
-        [UserDetailModel pushActionInfo:0 key:@"click.share.action" value:@"分享APP" extra:@""];
+//        [UserDetailModel pushActionInfo:0 key:@"click.share.action" value:@"分享APP" extra:@""];
-        ShareAlterView *view = [[ShareAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
+//        ShareAlterView *view = [[ShareAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
-        [[UIApplication sharedApplication].delegate.window addSubview:view];
+//        [[UIApplication sharedApplication].delegate.window addSubview:view];
     }
     else if([str isEqualToString:@"系统设置"])
     {
@@ -421,6 +427,10 @@
         MyFaBuShiPinViewController *vc = [MyFaBuShiPinViewController new];
         [self.viewController.navigationController pushViewController:vc animated:YES];
     }
+//    else if([str isEqualToString:@"联系客服"])
+//    {
+//        [self getKeFuData];
+//    }
 }
 
 //-(void)getKeFuData

KuaiCunShiPin/KuaiCunShiPin/Main/我的/会员中心/view/HuiYuanZXUserView.m

@@ -42,7 +42,7 @@
         _imgvhd = imgvhd;
         
         UILabel *lbname = [[UILabel alloc] init];
-        [lbname setText:@"快存视频·会员"];
+        [lbname setText:@"极光视频·会员"];
         [lbname setTextColor:RGBCOLOR(14, 3, 24)];
         [lbname setTextAlignment:NSTextAlignmentLeft];
         [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:22]];//PingFangSC-Medium 18

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/ShuCaiKuViewController.m

@@ -20,7 +20,7 @@
 @property (nonatomic , strong) ShuCaiKuSonViewController *vcnow;
 
 @property (nonatomic , assign) BOOL islist;
-
+@property (nonatomic , assign) BOOL isgetdata;
 @end
 
 @implementation ShuCaiKuViewController
@@ -30,6 +30,18 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
+    if(self.arrdata.count>0)
+    {
+        if([[[NSUserDefaults standardUserDefaults] objectForKey:@"refSCHomelist"] intValue]==1)
+        {
+            [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:@"refSCHomelist"];
+            [self refShowTS];
+        }
+    }
+    else
+    {
+        [self getdata];
+    }
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -46,6 +58,7 @@
     }];
     [viewheader setBackSearchValue:^(NSString * _Nonnull value) {
         [self.vcnow searchNow:value];
+        [UserDetailModel pushActionInfo:0 key:@"click.sucaiku.search" value:[Tools isStringnil:value] extra:@"素材库搜索"];
     }];
     if([[[NSUserDefaults standardUserDefaults] objectForKey:ShuCaiShowList] intValue]==1)
     {
@@ -83,7 +96,15 @@
             [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:ShuCaiShowList];
             [extraBtn setImage:[UIImage imageNamed:@"sc_listY"] forState:UIControlStateNormal];
         }
+        [UserDetailModel pushActionInfo:0 key:@"click.sucaiku.show.change" value:@"" extra:@"素材库显示切换"];
+        [self refShowTS];
+    }];
+    [self getdata];
     
+}
+
+-(void)refShowTS
+{
     NSMutableArray *arrtemp = [NSMutableArray new];
     
     for(UserMaterialModelDataItemsTags *model in self.arrdata)
@@ -91,14 +112,13 @@
         [arrtemp addObject:[Tools isStringnilkong:model.name]];
     }
     [self.scrollPageView reloadWithNewTitles:arrtemp];
-    }];
-    
-    [self getdata];
 }
+
 -(void)getdata
 {
 //    [KCSPHUDAlterView showView];
-    
+    if(self.isgetdata)return;
+    self.isgetdata = YES;
     [KCSPNetManager requestMaterialtagData:self.view Callback:^(BOOL state, MaterialTagModel *responseObject, NSString * _Nullable describle) {
 //        [KCSPHUDAlterView dismis];
         if(state)
@@ -122,6 +142,7 @@
         }
         else
         {
+            self.isgetdata = NO;
             [HXHud showMessage:responseObject.message afterDelayType:1];
         }
     }];

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/cell/ShuCaiKuSonListCollectionViewCell.m

@@ -191,11 +191,11 @@
         self.lbsc.text = [NSString stringWithFormat:@"%@s",model.file_time];
     }
     [self.imgvhd sd_setImageWithURL:[NSURL URLWithString:model.user_avatar] placeholderImage:[UIImage imageNamed:@"my_headnomo"]];
-    self.lbname.text = model.user_name.length==0?@"游客":[Tools isStringnilkong:model.user_name];
+    self.lbname.text = model.user_name.length==0?@"匿名用户":[Tools isStringnilkong:model.user_name];
-    if([model.user_name isEqualToString:@"用户已注销"])
+//    if([model.user_name isEqualToString:@"用户已注销"])
-    {
+//    {
-        self.lbname.text = @"管理员";
+//        self.lbname.text = @"管理员";
-    }
+//    }
     self.lbdown.text = [NSString stringWithFormat:@"%d",model.download.intValue];
     if(model.download.intValue>10000)
     {

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/cell/ShuCaiKuViewCollectionViewCell.m

@@ -190,12 +190,12 @@
     }
     
     [self.imgvhd sd_setImageWithURL:[NSURL URLWithString:model.user_avatar] placeholderImage:[UIImage imageNamed:@"my_headnomo"]];
-    self.lbname.text = model.user_name.length==0?@"游客":[Tools isStringnilkong:model.user_name];
+    self.lbname.text = model.user_name.length==0?@"匿名用户":[Tools isStringnilkong:model.user_name];
     
-    if([model.user_name isEqualToString:@"用户已注销"])
+//    if([model.user_name isEqualToString:@"用户已注销"])
-    {
+//    {
-        self.lbname.text = @"管理员";
+//        self.lbname.text = @"管理员";
-    }
+//    }
     
     self.lbdown.text = [NSString stringWithFormat:@"%d",model.download.intValue];
     if(model.download.intValue>10000)

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/view/ShuCaiKuHeaderView.m

@@ -27,8 +27,8 @@
             make.left.offset(16);
             make.height.offset(34);
             make.centerY.equalTo(self);
-//            make.right.equalTo(self).offset(-100);
+            make.right.equalTo(self).offset(-100);
-            make.right.equalTo(self).offset(-16);
+//            make.right.equalTo(self).offset(-16);
         }];
         [viewback.layer setMasksToBounds:YES];
         [viewback.layer setCornerRadius:17];
@@ -73,31 +73,31 @@
         }];
         [btsearch addTarget:self action:@selector(searchAction) forControlEvents:UIControlEventTouchUpInside];
         
-//        UIView *viewsend = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 74, 30)];
+        UIView *viewsend = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 74, 30)];
-//        [viewsend setBackgroundColor:[UIColor whiteColor]];
+        [viewsend setBackgroundColor:[UIColor whiteColor]];
-//        [viewsend.layer setMasksToBounds:YES];
+        [viewsend.layer setMasksToBounds:YES];
-//        [viewsend.layer setCornerRadius:15];
+        [viewsend.layer setCornerRadius:15];
-//        [self addSubview:viewsend];
+        [self addSubview:viewsend];
-//        [viewsend mas_makeConstraints:^(MASConstraintMaker *make) {
+        [viewsend mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.size.sizeOffset(CGSizeMake(74, 30));
+            make.size.sizeOffset(CGSizeMake(74, 30));
-//            make.centerY.equalTo(self);
+            make.centerY.equalTo(self);
-//            make.right.equalTo(self).offset(-16);
+            make.right.equalTo(self).offset(-16);
-//        }];
+        }];
-//        [Tools changedView:viewsend colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+        [Tools changedView:viewsend colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
-//        
+        
-//        UIButton *btsend = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 74, 30)];
+        UIButton *btsend = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 74, 30)];
-//        [btsend setTitle:@"发布" forState:UIControlStateNormal];
+        [btsend setTitle:@"发布" forState:UIControlStateNormal];
-//        [btsend setTitleColor:RGBACOLOR(255, 255, 255, 0.9) forState:UIControlStateNormal];
+        [btsend setTitleColor:RGBACOLOR(255, 255, 255, 0.9) forState:UIControlStateNormal];
-//        [btsend.titleLabel setFont:[UIFont systemFontOfSize:13]];
+        [btsend.titleLabel setFont:[UIFont systemFontOfSize:13]];
-//        [btsend setImage:[UIImage imageNamed:@"sc_send"] forState:UIControlStateNormal];
+        [btsend setImage:[UIImage imageNamed:@"sc_send"] forState:UIControlStateNormal];
-//        [self addSubview:btsend];
+        [self addSubview:btsend];
-//        [btsend mas_makeConstraints:^(MASConstraintMaker *make) {
+        [btsend mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.size.sizeOffset(CGSizeMake(74, 30));
+            make.size.sizeOffset(CGSizeMake(74, 30));
-//            make.centerY.equalTo(self);
+            make.centerY.equalTo(self);
-//            make.right.equalTo(self).offset(-16);
+            make.right.equalTo(self).offset(-16);
-//        }];
+        }];
-//        [btsend setIconInLeft];
+        [btsend setIconInLeft];
-//        [btsend addTarget:self action:@selector(sendAction) forControlEvents:UIControlEventTouchUpInside];
+        [btsend addTarget:self action:@selector(sendAction) forControlEvents:UIControlEventTouchUpInside];
         
     }
     return self;

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/发布/ShuCaiKuFaBuViewController.m

@@ -8,6 +8,7 @@
 #import "ShuCaiKuFaBuViewController.h"
 #import "ShuCaiKuFaBuView.h"
 #import "KCSPNetManager.h"
+#import "NomoAlterView.h"
 
 @interface ShuCaiKuFaBuViewController ()
 
@@ -28,6 +29,13 @@
     [super viewDidLoad];
     [self.view setBackgroundColor:RGBCOLOR(20, 20, 20)];
     
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [NomoAlterView showInfo:@"请遵守法律，请不要发布违规的内容，违规将会删除发布内容。" SelectTag:^(NSInteger tag) {
+            
+        }];
+    });
+    
+    
     ShuCaiKuFaBuView *view = [ShuCaiKuFaBuView new];
     [self.view addSubview:view];
     [view mas_makeConstraints:^(MASConstraintMaker *make) {

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/详情/ShuCaiKuDetailViewController.m

@@ -7,9 +7,13 @@
 
 #import "ShuCaiKuDetailViewController.h"
 #import "ShuCaiKuDetailView.h"
+#import "UIAlertController+Blocks.h"
+#import "GongGongNetManager.h"
+#import "KCSPNetManager.h"
 
 @interface ShuCaiKuDetailViewController ()
-
+///
+@property (nonatomic , strong) NSString *strpbid;
 @end
 
 @implementation ShuCaiKuDetailViewController
@@ -22,7 +26,94 @@
     [self showNaviGationView:YES];
     [self.navigationView setTitle:@" " titleColor:RGBACOLOR(255, 255, 255, 0.9)];
     [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)];
+    [self.navigationView.muenButton setImage:[Tools imageWithImageName:[UIImage imageNamed:@"sc_detail_more"] imageColor:[UIColor whiteColor]] forState:UIControlStateNormal];
 }
+-(void)navMuenButtonAction
+{
+    NSArray *arraction = @[@"不看对方发布素材",@"举报"];
+    if(self.strpbid.length>0)
+    {
+        arraction = @[@"接收对方发布素材",@"举报"];
+    }
+    
+    [UIAlertController showActionSheetInViewController:self withTitle:nil message:nil cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:arraction popoverPresentationControllerBlock:^(UIPopoverPresentationController * _Nonnull popover) {
+        
+    } tapBlock:^(UIAlertController * _Nonnull controller, UIAlertAction * _Nonnull action, NSInteger buttonIndex) {
+        if(buttonIndex==2)
+        {
+            if(self.strpbid.length>0)
+            {
+                [self requestPinBi:self.strpbid type:4];
+            }
+            else
+            {
+                
+                [self requestPinBi:self.modelDetail.ID type:2];
+            }
+        }
+        else if (buttonIndex==3)
+        {
+            [self jubaoAction];
+        }
+    }];
+}
+
+-(void)requestPinBi:(NSString *)strid type:(int)type
+{
+    [KCSPHUDAlterView showView];
+    [KCSPNetManager requestUserMaterialBlockData:self.view ID:strid type:type Callback:^(BOOL state, UserMaterialBlock *responseObject, NSString * _Nullable describle) {
+        [KCSPHUDAlterView dismis];
+        if(state)
+        {
+            if(type==2)
+            {
+                [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"refSCHomelist"];
+                [HXHud showMessage:@"已设置不看" afterDelayType:0];
+                self.strpbid = responseObject.data;
+            }
+            else
+            {
+                [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:@"refSCHomelist"];
+                self.strpbid = @"";
+                [HXHud showMessage:@"已设置" afterDelayType:0];
+            }
+        }
+        else
+        {
+            [HXHud showMessage:responseObject.message afterDelayType:1];
+        }
+    }];
+}
+
+-(void)jubaoAction
+{
+    NSArray *arrtemp = @[@"色情擦边",@"违法违规",@"垃圾广告",@"政治敏感",@"引人不适",@"攻击他人",@"知识侵权",@"其他"];
+    [UIAlertController showActionSheetInViewController:self withTitle:@"违规内容" message:nil cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:arrtemp popoverPresentationControllerBlock:^(UIPopoverPresentationController * _Nonnull popover) {
+        
+    } tapBlock:^(UIAlertController * _Nonnull controller, UIAlertAction * _Nonnull action, NSInteger buttonIndex) {
+        if(buttonIndex>=2)
+        {
+            [self jubaoPushData:arrtemp[buttonIndex-2]];
+        }
+    }];
+}
+
+-(void)jubaoPushData:(NSString *)strvalue
+{
+    [KCSPHUDAlterView showView];
+    [GongGongNetManager getUserFeedbackData:self.view type:@"其他问题" contact:@"" images:@[] content:[NSString stringWithFormat:@"举报素材-%@-%@",strvalue,self.modelDetail.ID] Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
+        [KCSPHUDAlterView dismis];
+        if(state)
+        {
+            [HXHud showMessage:@"已提交" afterDelayType:0];
+        }
+        else
+        {
+            [HXHud showMessage:responseObject.message afterDelayType:1];
+        }
+    }];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.view setBackgroundColor:RGBCOLOR(20, 20, 20)];

KuaiCunShiPin/KuaiCunShiPin/Main/素材库/详情/view/ShuCaiKuDetailView.m

@@ -128,11 +128,7 @@
         make.width.lessThanOrEqualTo(@(220));
     }];
     _lbname = lbname;
-    self.lbname.text = self.modelDetail.user_name.length==0?@"游客":[Tools isStringnilkong:self.modelDetail.user_name];
+    self.lbname.text = self.modelDetail.user_name.length==0?@"匿名用户":[Tools isStringnilkong:self.modelDetail.user_name];
-    if([self.modelDetail.user_name isEqualToString:@"用户已注销"])
-    {
-        self.lbname.text = @"管理员";
-    }
     
     UILabel *lbdown = [[UILabel alloc] init];
     [lbdown setText:@"1"];

KuaiCunShiPin/KuaiCunShiPin/Main/首页/ShiPingHao/view/ShiPingHaoSPView.m

@@ -367,7 +367,7 @@
     }];
     
     UILabel *lbthree = [[UILabel alloc] init];
-    [lbthree setText:@"3、返回【快存视频APP】微信视频号页面，下拉刷新即可 微信号视频。"];
+    [lbthree setText:@"3、返回【极光视频APP】微信视频号页面，下拉刷新即可 微信号视频。"];
     [lbthree setTextColor:RGBACOLOR(255, 255, 255, 0.6)];
     [lbthree setTextAlignment:NSTextAlignmentLeft];
     [lbthree setFont:[UIFont systemFontOfSize:12]];

KuaiCunShiPin/KuaiCunShiPin/Main/首页/cell/ShouYeBigCollectionViewCell.m

@@ -33,8 +33,8 @@
         [imgvback setContentMode:UIViewContentModeScaleAspectFit];
         [viewback addSubview:imgvback];
         [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.offset(15);
+            make.top.offset(10);
-            make.width.height.offset(70);
+            make.width.height.offset(60);
             make.centerX.equalTo(viewback);
         }];
         _imgvback = imgvback;
@@ -50,16 +50,17 @@
         }];
         _lbname = lbname;
         
-//        UILabel *lbinfo = [[UILabel alloc] init];
+        UILabel *lbinfo = [[UILabel alloc] init];
-//        [lbinfo setTextColor:RGBACOLOR(255, 255, 255, 0.5)];
+        [lbinfo setTextColor:RGBACOLOR(0, 0, 0, 0.5)];
-//        [lbinfo setTextAlignment:NSTextAlignmentLeft];
+        [lbinfo setTextAlignment:NSTextAlignmentLeft];
-//        [lbinfo setFont:[UIFont systemFontOfSize:15]];
+        [lbinfo setFont:[UIFont systemFontOfSize:13]];
-//        [viewback addSubview:lbinfo];
+        lbinfo.text = @"素材一键生成视频";
-//        [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
+        [viewback addSubview:lbinfo];
-//            make.top.equalTo(lbname.mas_bottom).offset(2);
+        [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.centerX.equalTo(viewback);
+            make.top.equalTo(lbname.mas_bottom).offset(2);
-//        }];
+            make.centerX.equalTo(viewback);
-//        _lbinfo = lbinfo;
+        }];
+        _lbinfo = lbinfo;
         
     }
     return self;

KuaiCunShiPin/KuaiCunShiPin/Main/首页/saveManger/ImagesConnectManager.m

@@ -9,7 +9,7 @@
 #import "KCSPXZManager.h"
 #import "VChangeManager.h"
 
-#define ZDYXCName @"快存视频"
+#define ZDYXCName @"极光视频"
 static PHAssetChangeRequest *changeRequest;
 @implementation ImagesConnectManager
 // 获得刚才添加到【相机胶卷】中的图片

KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeNewView.m

@@ -482,7 +482,7 @@
 // 定义每个UICollectionViewCell 的大小
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    return CGSizeMake((UISCREEN_WIDTH-24)/5.0, 84);
+    return CGSizeMake((UISCREEN_WIDTH-54)/5.0, 84);
 }
 -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {

KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.m

@@ -28,6 +28,8 @@
 
 @interface ShouYeView ()<UICollectionViewDelegate,UICollectionViewDataSource,SDCycleScrollViewDelegate,WYCamaImageToolsDelegate>
 ///
+@property (nonatomic , strong) NSMutableArray *arrTop;
+///
 @property (nonatomic , strong) TongZhiTSView *viewtz;
 ///
 @property (nonatomic , strong) UIView *viewsh;
@@ -75,6 +77,7 @@
 //        viewtz.arrdata = @[@"视频号出现故障，预计2天后完善，请耐心等待",@"视频号出现故障，预计2天后完善，请耐心等待1",@"视频号出现故障，预计2天后完善，请耐心等待2"];
         [viewtz setHidden:YES];
         
+        self.arrTop = [NSMutableArray new];
         float f_w = (UISCREEN_WIDTH-44)/3.0;
         NSArray *arr = @[@"链接提取",@"视频号",@"直播回放"];
         NSArray *arrinfo = @[@"涵盖大多数平台",@"支持微信视频号",@"支持微信直播回放"];
@@ -91,8 +94,10 @@
                 make.width.offset(f_w);
                 make.height.offset(f_w*image.size.height/image.size.width);
             }];
+            [imgvitem setHidden:YES];
             [imgvitem setUserInteractionEnabled:YES];
             viewlast = imgvitem;
+            [self.arrTop addObject:imgvitem];
             
             UILabel *lbinfo = [[UILabel alloc] init];
             [lbinfo setText:arrinfo[i]];
@@ -148,7 +153,7 @@
         [imgvlog.layer setCornerRadius:6];
         
         UILabel *lbname = [[UILabel alloc] init];
-        [lbname setText:@"快存视频"];
+        [lbname setText:@"极光视频"];
         [lbname setTextColor:[UIColor whiteColor]];
         [lbname setTextAlignment:NSTextAlignmentCenter];
         [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:36]];
@@ -251,6 +256,10 @@
     if([UserDetailModel zhiFuState])
     {
         [self.viewsh setHidden:YES];
+        for(UIView *view in self.arrTop)
+        {
+            [view setHidden:NO];
+        }
     }
 }
 -(void)showTSData:(NSArray *)arr
@@ -270,7 +279,7 @@
     self.arrdata = [NSMutableArray new];
     
     NSArray *arr = @[@"智能视频",@"视频时长剪切",@"视频加水印",@"加背景音乐",@"视频裁剪",@"视频转音频",@"去背景音乐",@"视频倒放",@"视频拼接"];
-    NSArray *arrinfo = @[@"赋予不同的声音",@"轻松裁剪多余部分",@"快捷留下专属标记",@"赋予不同的声音",@"留下一切美好瞬间",@"提取视频中的音频",@"无声世界更有意境",@"趣味视频生成",@"一键拼接视频"];
+    NSArray *arrinfo = @[@"素材一键生成视频",@"轻松裁剪多余部分",@"快捷留下专属标记",@"赋予不同的声音",@"留下一切美好瞬间",@"提取视频中的音频",@"无声世界更有意境",@"趣味视频生成",@"一键拼接视频"];
     ///视频去除音频 视频时长剪切
     for(int i = 0 ; i < arr.count; i++)
     {

KuaiCunShiPin/KuaiCunShiPin/Main/首页/视频处理/印记/ShiPingEditShuiYinView.m

@@ -9,7 +9,7 @@
 #import "UIImageView+VideoImageView.h"
 #import "WYCamaImageTools.h"
 
-@interface ShiPingEditShuiYinView ()<WYCamaImageToolsDelegate>
+@interface ShiPingEditShuiYinView ()<WYCamaImageToolsDelegate,UITextFieldDelegate>
 ///
 @property (nonatomic , strong) UIImage *imageEdit;
 ///
@@ -92,6 +92,7 @@
         [field mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(viewboy);
         }];
+        [field setDelegate:self];
         [field setTag:10];
     }
     else if(type==2)
@@ -340,4 +341,49 @@
     }return _tools;
 }
 
+#pragma mark - UITextFieldDelegate
+- (void)textFieldDidBeginEditing:(UITextField *)textField
+{
+//    if(DEBUG)
+//    {
+//        UIView *viewTextEdit = [[UIView alloc] init];
+//        [viewTextEdit setBackgroundColor:[UIColor whiteColor]];
+//        [self addSubview:viewTextEdit];
+//        [viewTextEdit mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.right.equalTo(self);
+//            make.height.offset(100);
+//            make.bottom.equalTo(self).offset(-400);
+//        }];
+//        
+//        NSArray *arr = @[@"字体大小",@"字体颜色"];
+//        for(int i = 0 ; i < arr.count; i++)
+//        {
+//            
+//            UIButton *btitem = [[UIButton alloc] init];
+//            [btitem setTitle:arr[i] forState:UIControlStateNormal];
+//            [btitem setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+//            [btitem.titleLabel setFont:[UIFont systemFontOfSize:15]];
+//            [btitem.layer setMasksToBounds:YES];
+//            [btitem.layer setCornerRadius:4];
+//            [btitem setBackgroundColor:RGBCOLOR(0, 184, 156)];
+//            [viewTextEdit addSubview:btitem];
+//            [btitem mas_makeConstraints:^(MASConstraintMaker *make) {
+//                make.top.offset(5);
+//                make.left.offset(12+80*i);
+//                make.height.offset(30);
+//                make.width.offset(70);
+//            }];
+//            [btitem addTarget:self action:@selector(itemAction:) forControlEvents:UIControlEventTouchUpInside];
+//        }
+//    }
+    
+    
+    
+    
+}
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+    
+    return YES;
+}
 @end

KuaiCunShiPin/KuaiCunShiPin/OtherFrameworks/UserInfo/UserDetailModel.m

@@ -209,12 +209,15 @@ static UserDetailModel *userinfo;
     {
         strtype = @"error";
     }
-    if([UserDetailModel zhiFuState])
+//    if([UserDetailModel zhiFuState])
-    {
+//    {
+//        [GongGongNetManager postUserEventsData:nil type:strtype key:key value:value extra:extra Callback:^(BOOL state, id  _Nullable responseObject, NSString * _Nullable describle) {
+//            
+//        }];
+//    }
     [GongGongNetManager postUserEventsData:nil type:strtype key:key value:value extra:extra Callback:^(BOOL state, id  _Nullable responseObject, NSString * _Nullable describle) {
         
     }];
-    }
 }
 
 +(BOOL)zhiFuState