xjw/cdts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.4.4代码提交

Browse Source
This commit is contained in:
CYH 2023-08-18 17:46:45 +08:00
parent 16acc90cd8
commit 8308699531
9 changed files with 146 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xdts-ios 3/TreeHole.xcodeproj/project.pbxproj
View File

@ -4286,10 +4286,12 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = TreeHole/TreeHole.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = C39VUKAY2Z;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y797QLF5AW;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
FRAMEWORK_SEARCH_PATHS = (
@ -4323,10 +4325,11 @@
"$(inherited)",
"$(PROJECT_DIR)/TreeHole/Code/WechatSDK/OpenSDK2.0.2",
);
MARKETING_VERSION = 2.4.2;
PRODUCT_BUNDLE_IDENTIFIER = com.zncdts.app123;
MARKETING_VERSION = 2.4.4;
PRODUCT_BUNDLE_IDENTIFIER = com.zncdts.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = app1;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@ -4347,10 +4350,12 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = TreeHole/TreeHole.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = C39VUKAY2Z;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y797QLF5AW;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
@ -4385,10 +4390,11 @@
"$(inherited)",
"$(PROJECT_DIR)/TreeHole/Code/WechatSDK/OpenSDK2.0.2",
);
MARKETING_VERSION = 2.4.2;
PRODUCT_BUNDLE_IDENTIFIER = com.zncdts.app123;
MARKETING_VERSION = 2.4.4;
PRODUCT_BUNDLE_IDENTIFIER = com.zncdts.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = app1;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

4
xdts-ios 3/TreeHole/Code/Base/PYAppService.m
View File

@ -107,11 +107,13 @@ static AppConfig *gAppConfig;
config.otherTitle = @"确定";
if ([path isEqualToString:@"open_clone"]) { //
config.cancelTitle = @"取消";
config.otherTitle = @"下一步";
config.otherTitle = @"开通VIP";
} else if ([message containsString:@"缘分匹配"]) {
config.otherTitle = @"开通VIP";
} else if ([message containsString:@"发布次数"]) {
config.otherTitle = @"开通VIP";
} else if ([message containsString:@"切换分身"]) {
config.otherTitle = @"开通VIP";
}
config.otherHandler = ^(MTAlertButton *button) {

11
xdts-ios 3/TreeHole/Code/Base/PYHTTPManager.h
View File

@ -22,18 +22,19 @@ typedef enum : NSUInteger {
#if IS_DEBUG
#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/"
//#define PYHttpBaseUrl @"http://192.168.3.5:8890/v1/"
//#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/"
///正式
//#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/"
#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/"
#else
//#define PYHttpBaseUrl @"http://192.168.3.5:8890/v1/"
//本地
#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/"
//#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/"
///正式
//#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/"
#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/"
#endif

1
xdts-ios 3/TreeHole/Code/Features/Bottle/View/MessageNotificationCell.m
View File

@ -34,6 +34,7 @@
iconView.size = CGSizeMake(FIX_SIZE(44), FIX_SIZE(44));
iconView.y = FIX_SIZE(12);
iconView.x = FIX_SIZE(15);
iconView.userInteractionEnabled = false;
iconView.layer.cornerRadius = FIX_SIZE(8);
[self.contentView addSubview:iconView];
self.iconView = iconView;

5
xdts-ios 3/TreeHole/Code/Features/Profile/View/ProfilePhotoCell.m
View File

@ -37,7 +37,12 @@ NSString * const ProfilePhotoCellID = @"ProfilePhotoCellID";
- (void)setPhoto:(ProfilePhoto *)photo {
_photo = photo;
if ([photo.url containsString:@".web"]) {
self.imageView.image = [UIImage imageNamed:@"TH_defalut_avatar"];
} else {
self.imageView.imageUrl = photo.url;
}
}
@end

176
xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/MineViewController.m
View File

@ -182,7 +182,7 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli
[view removeFromSuperview];
}
_userView= [[UIView alloc]initWithFrame:CGRectMake(0, STATUS_BAR_HEIGHT + FIX_SIZE(12), SCREEN_WIDTH, FIX_SIZE(182))];
_userView= [[UIView alloc]initWithFrame:CGRectMake(0, STATUS_BAR_HEIGHT + FIX_SIZE(12), SCREEN_WIDTH, FIX_SIZE(98))];
[self.contentScrollView addSubview:self.userView];
// NSArray * xibArray = [[NSBundle mainBundle]loadNibNamed:NSStringFromClass(THMineHeaderView.class) owner:nil options:nil] ;
@ -279,94 +279,94 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli
// add_friend_count
// add_user_followed_count
// add_followed_user_count
NSArray* functionArray = @[@{@"num":@(_userModel.friend_count),@"title":@"互关"},
@{@"num":@(_userModel.user_followed_count),@"title":@"关注"},
@{@"num":@(_userModel.followed_user_count),@"title":@"粉丝"}];
// NSArray* functionArray = @[@{@"num":@(_userModel.friend_count),@"title":@"互关"},
// @{@"num":@(_userModel.user_followed_count),@"title":@"关注"},
// @{@"num":@(_userModel.followed_user_count),@"title":@"粉丝"}];
//
// UIView* functionView = [[UIView alloc]initWithFrame:CGRectMake(0, userImgV.bottom, SCREEN_WIDTH, _userView.height - userImgV.bottom)];
//// functionView.backgroundColor = [UIColor whiteColor];
// [_userView addSubview:functionView];
UIView* functionView = [[UIView alloc]initWithFrame:CGRectMake(0, userImgV.bottom, SCREEN_WIDTH, _userView.height - userImgV.bottom)];
// functionView.backgroundColor = [UIColor whiteColor];
[_userView addSubview:functionView];
CGFloat functionBtnW = FIX_SIZE(120);
CGFloat functionBtnH = functionView.height;
CGFloat functionBtnJianGe = (SCREEN_WIDTH - FIX_SIZE(40) - functionBtnW*functionArray.count)/(functionArray.count-1);
for (NSInteger i = 0 ; i < functionArray.count; i++) {
UIButton* functionBtn = [[UIButton alloc]initWithFrame:CGRectMake(FIX_SIZE(20) + (functionBtnJianGe + functionBtnW)*i, 0, functionBtnW, functionBtnH)];
[functionBtn setTitle:functionArray[i][@"title"] forState:UIControlStateNormal];
[functionBtn setTitleColor:HEX_COLOR_A(0x000000, 0) forState:UIControlStateNormal];
[functionBtn addTarget:self action:@selector(functionBtnClick:) forControlEvents:UIControlEventTouchUpInside];
[functionView addSubview:functionBtn];
UILabel* functionBtnNumLab = [[UILabel alloc]initWithFrame:CGRectMake(-2, FIX_SIZE(26), functionBtn.width-3, FIX_SIZE(20))];
functionBtnNumLab.text = [NSString stringWithFormat:@"%@",functionArray[i][@"num"]];
functionBtnNumLab.textAlignment = NSTextAlignmentCenter;
functionBtnNumLab.font = MT_FONT_MEDIUM_SIZE(18);
functionBtnNumLab.textColor = HEX_COLOR_A(0xFFFFFF, 0.7);
functionBtnNumLab.textAlignment = NSTextAlignmentCenter;
[functionBtn addSubview:functionBtnNumLab];
UILabel*NumLab = [[UILabel alloc]initWithFrame:CGRectMake(functionBtn.frame.size.width-FIX_SIZE(55), FIX_SIZE(26), 26, FIX_SIZE(20))];
NumLab.textAlignment = NSTextAlignmentRight;
NumLab.font = MT_FONT_MEDIUM_SIZE(14);
NumLab.textColor = HEX_COLOR_A(0xFFFFFF, 0.7);
NumLab.textAlignment = NSTextAlignmentCenter;
[functionBtn addSubview:NumLab];
NumLab.backgroundColor = [UIColor redColor];
NumLab.layer.cornerRadius = FIX_SIZE(10);
NumLab.layer.masksToBounds = YES;
NSLog(@"_userModel.new_friend_count==%d",_userModel
.new_friend_count);
if (i==0) {
if (_userModel.new_friend_count>=99) {
NumLab.text = @"99+";
}else{
if (_userModel.new_friend_count==0) {
NumLab.hidden = YES;
}else{
NumLab.text = [NSString stringWithFormat:@"%d",_userModel.new_friend_count];
}
}
}else if (i==1)
{
if (_userModel.new_followed_user_count>=99) {
NumLab.text = @"99+";
}else{
if (_userModel.new_followed_user_count==0) {
NumLab.hidden = YES;
}else{
NumLab.text = [NSString stringWithFormat:@"%d",_userModel.new_followed_user_count];
}
}
}else{
if (_userModel.new_user_followed_count>=99) {
NumLab.text = @"99+";
}else{
if (_userModel.new_user_followed_count==0) {
NumLab.hidden = YES;
}else{
NumLab.text = [NSString stringWithFormat:@"%d",_userModel.new_user_followed_count];
}
}
}
// [NumLab sizeToFit];
UILabel* functionBtnTitleLab = [[UILabel alloc]initWithFrame:CGRectMake(0, functionBtnNumLab.bottom + FIX_SIZE(9), functionBtn.width, FIX_SIZE(26))];
functionBtnTitleLab.text = functionArray[i][@"title"];
functionBtnTitleLab.textAlignment = NSTextAlignmentCenter;
functionBtnTitleLab.font = MT_FONT_MEDIUM_SIZE(18);
functionBtnTitleLab.textColor = HEX_COLOR_A(0xFFFFFF, 0.7);
[functionBtn addSubview:functionBtnTitleLab];
}
// CGFloat functionBtnW = FIX_SIZE(120);
// CGFloat functionBtnH = functionView.height;
// CGFloat functionBtnJianGe = (SCREEN_WIDTH - FIX_SIZE(40) - functionBtnW*functionArray.count)/(functionArray.count-1);
// for (NSInteger i = 0 ; i < functionArray.count; i++) {
// UIButton* functionBtn = [[UIButton alloc]initWithFrame:CGRectMake(FIX_SIZE(20) + (functionBtnJianGe + functionBtnW)*i, 0, functionBtnW, functionBtnH)];
// [functionBtn setTitle:functionArray[i][@"title"] forState:UIControlStateNormal];
// [functionBtn setTitleColor:HEX_COLOR_A(0x000000, 0) forState:UIControlStateNormal];
// [functionBtn addTarget:self action:@selector(functionBtnClick:) forControlEvents:UIControlEventTouchUpInside];
// [functionView addSubview:functionBtn];
//
// UILabel* functionBtnNumLab = [[UILabel alloc]initWithFrame:CGRectMake(-2, FIX_SIZE(26), functionBtn.width-3, FIX_SIZE(20))];
// functionBtnNumLab.text = [NSString stringWithFormat:@"%@",functionArray[i][@"num"]];
// functionBtnNumLab.textAlignment = NSTextAlignmentCenter;
// functionBtnNumLab.font = MT_FONT_MEDIUM_SIZE(18);
// functionBtnNumLab.textColor = HEX_COLOR_A(0xFFFFFF, 0.7);
// functionBtnNumLab.textAlignment = NSTextAlignmentCenter;
// [functionBtn addSubview:functionBtnNumLab];
//
//
// UILabel*NumLab = [[UILabel alloc]initWithFrame:CGRectMake(functionBtn.frame.size.width-FIX_SIZE(55), FIX_SIZE(26), 26, FIX_SIZE(20))];
//
// NumLab.textAlignment = NSTextAlignmentRight;
// NumLab.font = MT_FONT_MEDIUM_SIZE(14);
// NumLab.textColor = HEX_COLOR_A(0xFFFFFF, 0.7);
// NumLab.textAlignment = NSTextAlignmentCenter;
// [functionBtn addSubview:NumLab];
//
// NumLab.backgroundColor = [UIColor redColor];
// NumLab.layer.cornerRadius = FIX_SIZE(10);
// NumLab.layer.masksToBounds = YES;
//
// NSLog(@"_userModel.new_friend_count==%d",_userModel
// .new_friend_count);
// if (i==0) {
// if (_userModel.new_friend_count>=99) {
// NumLab.text = @"99+";
// }else{
//
// if (_userModel.new_friend_count==0) {
// NumLab.hidden = YES;
// }else{
// NumLab.text = [NSString stringWithFormat:@"%d",_userModel.new_friend_count];
// }
// }
//
// }else if (i==1)
// {
// if (_userModel.new_followed_user_count>=99) {
// NumLab.text = @"99+";
// }else{
// if (_userModel.new_followed_user_count==0) {
// NumLab.hidden = YES;
// }else{
// NumLab.text = [NSString stringWithFormat:@"%d",_userModel.new_followed_user_count];
// }
// }
//
//
// }else{
// if (_userModel.new_user_followed_count>=99) {
// NumLab.text = @"99+";
// }else{
// if (_userModel.new_user_followed_count==0) {
// NumLab.hidden = YES;
// }else{
// NumLab.text = [NSString stringWithFormat:@"%d",_userModel.new_user_followed_count];
// }
// }
// }
//
//// [NumLab sizeToFit];
//
// UILabel* functionBtnTitleLab = [[UILabel alloc]initWithFrame:CGRectMake(0, functionBtnNumLab.bottom + FIX_SIZE(9), functionBtn.width, FIX_SIZE(26))];
// functionBtnTitleLab.text = functionArray[i][@"title"];
// functionBtnTitleLab.textAlignment = NSTextAlignmentCenter;
// functionBtnTitleLab.font = MT_FONT_MEDIUM_SIZE(18);
// functionBtnTitleLab.textColor = HEX_COLOR_A(0xFFFFFF, 0.7);
// [functionBtn addSubview:functionBtnTitleLab];
//
// }
[self.contentScrollView addSubview:self.openVipBtn];

6
xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/ProfileCardViewController.m
View File

@ -629,11 +629,17 @@
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
ProfilePhotoCell *cell = (ProfilePhotoCell *)[collectionView cellForItemAtIndexPath:indexPath];
NSMutableArray *items = @[].mutableCopy;
for (int i = 0; i < self.photosM.count; i++) {
if ([self.photosM[i].url containsString:@".wep"]) {
KSPhotoItem *item = [KSPhotoItem itemWithSourceView:cell.imageView image:cell.imageView.image];
} else {
KSPhotoItem *item = [KSPhotoItem itemWithSourceView:indexPath.item == i ? cell.imageView : nil imageUrl:[NSURL URLWithString:self.photosM[i].url ?: @""]];
[items addObject:item];
}
}
KSPhotoBrowser *browser = [KSPhotoBrowser browserWithPhotoItems:items selectedIndex:indexPath.item];
browser.delegate = self;
browser.pageindicatorStyle = KSPhotoBrowserPageIndicatorStyleText;

2
xdts-ios 3/TreeHole/Code/Features/User/UserService.h
View File

@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
//封号（仅限管理员账户操作）
//+ (void)banAccount:(int)uid hours:(int)hours completion:(PYHTTPManagerCallback)completion;
+ (void)warnAccount:(int)uid completion:(PYHTTPManagerCallback)completion;
@end
NS_ASSUME_NONNULL_END

19
xdts-ios 3/TreeHole/Code/Features/User/UserService.m
View File

@ -438,6 +438,15 @@ static NSMutableDictionary<NSString *, UserOtherInfo *> *gUserOtherInfoDicM;
} callback:completion];
}
/// 封号（仅限管理员账户操作）
+ (void)warnAccount:(int)uid completion:(PYHTTPManagerCallback)completion {
[PYHTTPManager postWithPath:@"banaccount" params:@{
@"user_id": @(uid),
} callback:completion];
}
/// 仅限管理员账户操作
+ (void)modifyAccount:(int)uid param:(NSString *)param completion:(PYHTTPManagerCallback)completion {
@ -462,7 +471,7 @@ static NSMutableDictionary<NSString *, UserOtherInfo *> *gUserOtherInfoDicM;
+ (void)dealUser:(int)userId{
MTActionSheet *actionSheet = [[MTActionSheet alloc] initWithTitle:@"处理账户（ad/se/porn会被限制行为且聊天需VIP）" delegate:nil cancelButtonTitle:@"取消" destructiveButtonTitle:@"封号" otherButtonTitles:@"解封该账户", @"账户信息违规",@"标记为普通号", @"标记为good号",
@"标记为se号", @"标记为porn号",@"标记为ad号", @"标记为adapp号", nil];
@"标记为se号", @"标记为porn号",@"标记为ad号", @"标记为adapp号",@"警告", nil];
actionSheet.onClickAction = ^(MTActionSheet *sheet, NSInteger buttonIndex){
if (buttonIndex == 0) {
@ -508,7 +517,7 @@ static NSMutableDictionary<NSString *, UserOtherInfo *> *gUserOtherInfoDicM;
[UserService banAccount:userId hours:banDay completion:^(id _Nullable rsp, NSError * _Nullable error) {
if (!error) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[SVProgressHUD showSuccessWithStatus:[NSString stringWithFormat:@"用户(%d)被封号（%d天）", userId, banDay]];
[SVProgressHUD showSuccessWithStatus:[NSString stringWithFormat:@"用户(%d)被封号（%d天）", userId, banDay == 9999 ? banDay : banDay/24]];
});
}
}];
@ -559,6 +568,12 @@ static NSMutableDictionary<NSString *, UserOtherInfo *> *gUserOtherInfoDicM;
};
[actionSheet show];
} else if (buttonIndex == 9) {
[UserService banAccount:userId hours:9998 completion:^(id _Nullable rsp, NSError * _Nullable error) {
if (!error) {
[SVProgressHUD showSuccessWithStatus:@"已发送警告消息"];
}
}];
}else {
//标记账户类型
NSString *dealString = nil;