moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dangerous Modify: 移除 Firebase/Analytics lib; 移除埋点文件（不使用）；移除部分不使用的 分享功能 相关代码；

Browse Source
This commit is contained in:
edwinQQQ
2025-02-10 18:49:34 +08:00
parent f582077804
commit fc399e0afc
48 changed files with 100 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
YuMi/Modules/YMLogin/Presenter/LoginPresenter.m
View File

@@ -21,8 +21,7 @@
#import "ThirdUserInfo.h"
#import "AccountModel.h"
#import "DESEncrypt.h"
//#import <FBSDKCoreKit/FBSDKCoreKit.h>
//#import <FBSDKLoginKit/FBSDKLoginKit.h>
#import "YuMi-swift.h"
#import "FeedBackConfigModel.h"
@@ -33,25 +32,7 @@
- (instancetype)init{
self = [super init];
if(self){
// [[NSNotificationCenter defaultCenter] addObserverForName:FBSDKProfileDidChangeNotification
// object:nil
// queue:[NSOperationQueue mainQueue]
// usingBlock:
// ^(NSNotification *notification) {
// if ([FBSDKProfile currentProfile]) {
// //获取当前用户名
// [FBSDKProfile loadCurrentProfileWithCompletion:
// ^(FBSDKProfile *profile, NSError *error) {
// if (profile) {
// dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
// AccountInfoStorage *accountStorage = [AccountInfoStorage instance];
// accountStorage.thirdUserInfo.userName = profile.name;
// accountStorage.thirdUserInfo.avatarUrl = profile.imageURL.absoluteString;
// });
// }
// }];
// }
// }];
}
return self;
}
@@ -200,31 +181,7 @@
}];
}
-(void)thirdLoginByFBWithPresentingViewController:(UIViewController *)presentingViewController {
// [FBSDKProfile enableUpdatesOnAccessTokenChange:YES];
// [FBSDKAccessToken setCurrentAccessToken:nil];
// FBSDKLoginManager *manager = [[FBSDKLoginManager alloc] init];
// [manager logOut];
// [XNDJTDDLoadingTool showOnlyView:kWindow];
// @kWeakify(self);
// [manager logInWithPermissions:@[@"public_profile"]
// fromViewController:presentingViewController
// handler:^(FBSDKLoginManagerLoginResult * _Nullable result, NSError * _Nullable error) {
// @kStrongify(self);
// if (error) {
// [XNDJTDDLoadingTool hideOnlyView:kWindow];
// [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter1")];
// } else if (result.isCancelled) {
// [XNDJTDDLoadingTool hideOnlyView:kWindow];
// [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter0")];
// } else {
// ThirdUserInfo * userInfo = [[ThirdUserInfo alloc] init];
// userInfo.openid = result.token.userID;
// userInfo.access_token = result.token.tokenString;
// userInfo.unionid = result.token.userID;
// [AccountInfoStorage instance].thirdUserInfo = userInfo;
// [self loginWithThirdPartWithType:ThirdLoginType_FB];
// }
// }];
}
-(void)thirdLoginByGoogleWithPresentingViewController:(UIViewController *)presentingViewController configuration:(GIDConfiguration *)configuration{
@kWeakify(self);

77
YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m
View File

@@ -11,7 +11,6 @@
#import <NIMSDK/NIMSDK.h>
///Tool
#import "TTPopup.h"
#import "XPShareView.h"
#import "AccountInfoStorage.h"
#import "Api+Moments.h"
///Model
@@ -20,7 +19,7 @@
#import "XPWebViewController.h"
#import "XCCurrentVCStackManager.h"
@interface XPMomentsTooBarView ()<XCShareViewDelegate>
@interface XPMomentsTooBarView ()
///喜欢的容器
@property (nonatomic,strong) UIView * likeView;
///喜欢
@@ -33,8 +32,7 @@
@property (nonatomic,strong) UIButton *commentButton;
///评论数
@property (nonatomic,strong) UILabel *commentLabel;
///分享
@property (nonatomic,strong) UIButton *shareButton;
///分割线
@property (nonatomic,strong) UIView * lineView;
///举报
@@ -84,7 +82,6 @@
- (void)initSubViews {
[self addSubview:self.likeView];
[self addSubview:self.commentView];
[self addSubview:self.shareButton];
[self addSubview:self.lineView];
[self addSubview:self.reportButton];
@@ -132,12 +129,6 @@
make.trailing.equalTo(self.commentView);
}];
[self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.centerY.equalTo(self.likeView);
make.leading.mas_equalTo(self.commentView.mas_trailing).mas_offset(5);
}];
[self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(self).offset(-12);
make.centerY.mas_equalTo(self.commentView);
@@ -180,11 +171,6 @@
make.centerY.mas_equalTo(self.commentView);
make.trailing.equalTo(self.commentView);
}];
[self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.centerY.equalTo(self.likeView);
make.leading.mas_equalTo(self.commentView.mas_trailing).mas_offset(5);
}];
[self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(self).offset(-18);
@@ -291,54 +277,6 @@
}
}
- (void)shareButtonAction:(UIButton *)sender {
XPShareItem *cycle = [XPShareItem itemWitTag:XPShareItemTagFaceBook title:@"FaceBook" imageName:@"share_fb" disableImageName:@"share_fb"];
XPShareItem *wechat = [XPShareItem itemWitTag:XPShareItemTagLine title:@"Line" imageName:@"share_line" disableImageName:@"share_line"];
XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"RoomHeaderView3") imageName:@"share_copy_link" disableImageName:@"share_copy_link"];
NSArray * items = @[wechat,cycle, qq];
CGFloat margin = 15;
CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65);
XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init];
NSString * title= self.momentsInfo.nick;
if (self.momentsInfo.nick.length > 6) {
title = [title substringToIndex:6];
}
shareInfo.nick = title;
shareInfo.content = self.momentsInfo.content;
shareInfo.imageUrl = self.momentsInfo.avatar;
shareInfo.shareTitle = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsTooBarView7"), title];
shareInfo.shareContent = self.momentsInfo.content;
shareInfo.shareImageUrl = self.momentsInfo.avatar;
NSString * uid = [AccountInfoStorage instance].getUid;
NSString *urlStr = [NSString stringWithFormat:@"%@/%@?uid=%@&dynamicId=%@&worldId=%ld",[HttpRequestHelper getHostUrl], URLWithType(kMonentsShareURL), uid, self.momentsInfo.dynamicId, self.momentsInfo.worldId];
shareInfo.shareUrl = urlStr;
shareInfo.dynamicId = self.momentsInfo.dynamicId;
shareInfo.uid = self.momentsInfo.uid;
shareInfo.worldId = [NSString stringWithFormat:@"%ld", self.momentsInfo.worldId];
XPShareView *shareView = [[XPShareView alloc] initWithItems:items itemSize:itemSize shareInfo:shareInfo];
shareView.delegate = self;
[TTPopup popupView:shareView style:TTPopupStyleActionSheet];
}
#pragma mark - #pragma mark - XCShareViewDelegate
- (void)shareView:(XPShareView *)shareView shareFail:(NSString *)message {
[TTPopup dismiss];
[XNDJTDDLoadingTool showErrorWithMessage:message];
}
- (void)shareView:(XPShareView *)shareView didSuccess:(XPShareInfoModel *)shareInfo{
[Api userShareMoments:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
} dynamicId:shareInfo.dynamicId uid:shareInfo.uid worldId:shareInfo.worldId shareUid:[AccountInfoStorage instance].getUid];
[TTPopup dismiss];
}
- (void)shareViewDidClickCancel:(XPShareView *)shareView {
[TTPopup dismiss];
}
#pragma mark - Getters And Setters
- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo {
_momentsInfo = monentsInfo;
@@ -407,17 +345,6 @@
return _commentLabel;
}
- (UIButton *)shareButton {
if (!_shareButton) {
_shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_shareButton setImage:[UIImage imageNamed:@"monents_info_like_share"] forState:UIControlStateNormal];
[_shareButton setImage:[UIImage imageNamed:@"monents_info_like_share"] forState:UIControlStateSelected];
[_shareButton addTarget:self action:@selector(shareButtonAction:) forControlEvents:UIControlEventTouchUpInside];
_shareButton.hidden = YES;
}
return _shareButton;
}
- (UIView *)lineView {
if (!_lineView) {
_lineView = [[UIView alloc] init];

16
YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.h Normal file
View File

@@ -0,0 +1,16 @@
//
// LuckyPackageLogicManager.h
// YuMi
//
// Created by P on 2025/2/7.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface LuckyPackageLogicManager : NSObject
@end
NS_ASSUME_NONNULL_END

12
YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.m Normal file
View File

@@ -0,0 +1,12 @@
//
// LuckyPackageLogicManager.m
// YuMi
//
// Created by P on 2025/2/7.
//
#import "LuckyPackageLogicManager.h"
@implementation LuckyPackageLogicManager
@end

16
YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.h Normal file
View File

@@ -0,0 +1,16 @@
//
// LuckyPackagePresenter.h
// YuMi
//
// Created by P on 2025/2/7.
//
#import "BaseMvpPresenter.h"
NS_ASSUME_NONNULL_BEGIN
@interface LuckyPackagePresenter : BaseMvpPresenter
@end
NS_ASSUME_NONNULL_END

12
YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.m Normal file
View File

@@ -0,0 +1,12 @@
//
// LuckyPackagePresenter.m
// YuMi
//
// Created by P on 2025/2/7.
//
#import "LuckyPackagePresenter.h"
@implementation LuckyPackagePresenter
@end

2
YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.h
View File

@@ -12,7 +12,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface RoomHeaderView : UIView<RoomGuestDelegate>
- (void)showSharePanel;
- (void)updateLevel:(NSString *)levelIcon;
- (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate;

114
YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m
View File

@@ -29,7 +29,6 @@
#import "MicroQueueModel.h"
#import "XPRoomRecommendModel.h"
///View
#import "XPShareView.h"
#import "XPRoomTopicAlertView.h"
#import "XPRoomRecommendView.h"
///VC
@@ -40,7 +39,7 @@
#import "XPRoomTopicViewController.h"
@interface RoomHeaderView ()<XCShareViewDelegate, XPRoomRecommendViewDelegate>
@interface RoomHeaderView ()<XPRoomRecommendViewDelegate>
///容器
@property (nonatomic,strong) UIStackView *nickStackView;
///
@@ -60,8 +59,6 @@
@property (nonatomic,strong) YYLabel *idLabel;
///收藏
@property (nonatomic,strong) UIButton *collectButton;
///分享
@property (nonatomic,strong) UIButton *shareButton;
///设置
@property (nonatomic,strong) UIButton *settingButton;
///话题设置
@@ -93,10 +90,6 @@
[self.hostDelegate miniRoom];
}
- (void)shareButtonAction:(UIButton *)sender{
[self showSharePanel];
}
- (void)settingButtonAction:(UIButton *)sender {
self.recommendRoomView.frame = CGRectMake(KScreenWidth, 0, 250, KScreenHeight);
FFPopup *popup = [FFPopup popupWithContentView:self.recommendRoomView];
@@ -159,7 +152,6 @@
[self addSubview:self.nickStackView];
[self addSubview:self.collectButton];
[self addSubview:self.shareButton];
[self addSubview:self.settingButton];
[self addSubview:self.topicButton];
[self addSubview:self.backBtn];
@@ -188,12 +180,6 @@
make.bottom.mas_equalTo(-11);
make.width.height.mas_equalTo(22);
}];
[self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.trailing.equalTo(self.settingButton.mas_leading).offset(-15);
make.centerY.mas_equalTo(self.settingButton);
make.width.height.mas_equalTo(22);
}];
[self.collectButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.settingButton);
@@ -280,55 +266,7 @@
#pragma mark - Event Response
- (void)showSharePanel {
XPShareItem *cycle = [XPShareItem itemWitTag:XPShareItemTagFaceBook title:@"FaceBook" imageName:@"share_fb" disableImageName:@"share_fb"];
XPShareItem *wechat = [XPShareItem itemWitTag:XPShareItemTagLine title:@"Line" imageName:@"share_line" disableImageName:@"share_line"];
XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"RoomHeaderView3") imageName:@"share_copy_link" disableImageName:@"share_copy_link"];
NSArray * items = @[wechat,cycle, qq];
RoomInfoModel * roomInfo = [self.hostDelegate getRoomInfo];
XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init];
shareInfo.shareTitle = YMLocalizedString(@"RoomHeaderView4");
shareInfo.shareContent = YMLocalizedString(@"RoomHeaderView5");
shareInfo.shareImageUrl = [self.hostDelegate getRoomInfo].avatar;
shareInfo.type = ShareType_Room;
shareInfo.roomUid = roomInfo.uid;
NSString * uid = [AccountInfoStorage instance].getUid;
NSString * urlString = [NSString stringWithFormat:@"%@/%@?shareUid=%@&uid=%ld&room_name=%@&room_id=%ld&room_avatar=%@&share_name=%@",[HttpRequestHelper getHostUrl],URLWithType(kShareRoomURL),uid,roomInfo.uid,roomInfo.title,roomInfo.erbanNo,roomInfo.avatar,roomInfo.nick];
shareInfo.shareUrl = urlString;
CGFloat margin = 15;
CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65);
XPShareView *shareView = [[XPShareView alloc] initWithItems:items itemSize:itemSize shareInfo:shareInfo];
shareView.delegate = self;
[TTPopup popupView:shareView style:TTPopupStyleActionSheet];
}
///保存一下分享的内容的 不需要处理错误码
- (void)saveShare:(XPShareInfoModel *)shareInfo {
NSMutableDictionary *params = [NSMutableDictionary dictionary];
NSString *uid = [AccountInfoStorage instance].getUid;
NSString *ticket = [AccountInfoStorage instance].getTicket;
[params setObject:uid forKey:@"uid"];
[params setObject:@(shareInfo.shareType) forKey:@"shareType"];
[params setObject:ticket forKey:@"ticket"];
[params setObject:@(shareInfo.type) forKey:@"sharePageId"];
if (shareInfo.shareUrl.length > 0) {
[params setObject:shareInfo.shareUrl forKey:@"shareUrl"];
}
if (shareInfo.roomUid > 0) {
[params setObject:@(shareInfo.roomUid) forKey:@"targetUid"];
}
[HttpRequestHelper POST:@"usershare/save" params:params success:^(BaseModel * _Nonnull data) {
NSLog(@"%@",data);
} failure:^(NSInteger resCode, NSString * _Nonnull message) {
}];
}
- (void)collectButtonAction:(UIButton *)sender {
NSString * type = self.collectButton.selected ? @"2" : @"1";
NSString * uid = [AccountInfoStorage instance].getUid;
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
@@ -368,45 +306,6 @@
} roomUid:roomUid uid:uid type:type roomUids:nil];
}
#pragma mark - XCShareViewDelegate
- (void)shareView:(XPShareView *)shareView shareFail:(NSString *)message {
[TTPopup dismiss];
[XNDJTDDLoadingTool showErrorWithMessage:message];
}
- (void)shareView:(XPShareView *)shareView didSuccess:(XPShareInfoModel *)shareInfo{
[TTPopup dismiss];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"RoomHeaderView7")];
AttachmentModel * attachMent = [[AttachmentModel alloc] init];
attachMent.first = CustomMessageType_Room_Tip;
attachMent.second = Custom_Message_Sub_Room_Tip_ShareRoom;
NSMutableDictionary * dic = [NSMutableDictionary dictionary];
NSString * uid = [AccountInfoStorage instance].getUid;
[dic setValue:uid forKey:@"uid"];
NSMutableDictionary * userDic = [NSMutableDictionary dictionary];
UserInfoModel * userInfo = [self.hostDelegate getUserInfo];
RoomInfoModel * roomInfo = [self.hostDelegate getRoomInfo];
[userDic setValue:roomInfo.nick.length > 0 ? roomInfo.nick : @"" forKey:@"targetNick"];
[userDic setValue:@(roomInfo.uid) forKey:@"targetUid"];
[userDic setValue:userInfo.nick.length > 0 ? userInfo.nick : @"" forKey:@"nick"];
[dic setValue:userDic forKey:@"data"];
attachMent.data = dic;
NSString *sessionID = [NSString stringWithFormat:@"%ld", [self.hostDelegate getRoomInfo].roomId];
NIMMessage *message = [[NIMMessage alloc]init];
NIMCustomObject *object = [[NIMCustomObject alloc] init];
object.attachment = attachMent;
message.messageObject = object;
//构造会话
NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom];
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil];
///上报一下
[self saveShare:shareInfo];
}
- (void)shareViewDidClickCancel:(XPShareView *)shareView {
[TTPopup dismiss];
}
#pragma mark - XPRoomRecommendViewDelegate
- (void)xPRoomRecommendViewReport {
@@ -443,17 +342,6 @@
}
#pragma mark - Getters And Setters
- (UIButton *)shareButton {
if(!_shareButton){
_shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_shareButton setImage:[UIImage imageNamed:@"room_info_share"] forState:UIControlStateNormal];
[_shareButton addTarget:self action:@selector(shareButtonAction:) forControlEvents:UIControlEventTouchUpInside];
[_shareButton setEnlargeEdgeWithTop:8 right:8 bottom:8 left:8];
_shareButton.hidden = YES;
}
return _shareButton;
}
- (UIButton *)settingButton {
if (!_settingButton) {
_settingButton = [UIButton buttonWithType:UIButtonTypeCustom];

3
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -299,7 +299,6 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[XPSkillCardPlayerManager shareInstance].isInRoom = NO;
[XPSkillCardPlayerManager shareInstance].roomUid = @"";
if([[XPRoomMiniManager shareManager] getRoomInfo]==nil){
[XPSkillCardPlayerManager shareInstance].isMineInMic = NO;
}
@@ -482,7 +481,7 @@ XPCandyTreeInsufficientBalanceViewDelegate>
if(type == 2){
[self.messageContainerView showUserCard:userId];
}else if (type == 3){
[self.roomHeaderView showSharePanel];
// [self.roomHeaderView showSharePanel];
}else if (type == 4){
NSString *scrolling = redPacketDic[@"scrolling"];
[self.menuContainerView showInputView:scrolling];