yinmeng/yinmeng-ios-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liyuhua
2024-01-22 10:03:33 +08:00
parent 3328c58c41
commit d418005746
19 changed files with 45 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yinmeng-ios/Podfile
View File

@@ -15,8 +15,7 @@ target 'yinmeng-ios' do
pod 'ReactiveObjC'
pod 'FFPopup'
pod 'TZImagePickerController'
#易盾 本机一键登录
pod 'NTESQuickPass'
#模型转化
pod 'MJExtension'
#图片加载
@@ -25,28 +24,25 @@ target 'yinmeng-ios' do
pod 'SDWebImageFLPlugin' # 对FLAnimatedImage和SDWebImage的桥接
#上传图片
pod 'Qiniu'
#内购
pod 'IAPHelper'
#持久化存储
pod 'SSKeychain'
pod 'Base64'
#云信
pod 'NIMSDK_LITE', '~> 8.9.0'
#七鱼
pod 'QY_NIM_iOS_SDK', '~> 6.6.1'
#TRTC
pod 'TXLiteAVSDK_TRTC', '~> 10.3.12271'
#下拉刷新控件
pod 'MJRefresh'
#pop动画
pod 'pop'
pod 'SVGAPlayer'
#vap礼物动画
pod 'QGVAPlayer'
pod 'IQKeyboardManager', '~> 6.5.11'
#调试
pod 'LookinServer', :configurations => ['Debug']
pod 'SnapKit'
pod 'RxSwift'
pod 'RxCocoa'

45
yinmeng-ios/Podfile.lock
View File

@@ -21,11 +21,7 @@ PODS:
- FFPopup (1.1.5)
- FLAnimatedImage (1.0.17)
- HappyDNS (1.0.3)
- IAPHelper (1.1)
- IQKeyboardManager (6.5.16)
- LookinServer (1.2.3):
- LookinServer/Core (= 1.2.3)
- LookinServer/Core (1.2.3)
- Masonry (1.1.0)
- MBProgressHUD (1.2.0)
- MJExtension (3.4.1)
@@ -45,16 +41,10 @@ PODS:
- Moya/Core
- RxSwift (~> 5.0)
- NIMSDK_LITE (8.9.119)
- NTESBaseComponent (1.8)
- NTESQuickPass (3.4.5):
- NTESBaseComponent
- ObjectMapper (4.2.0)
- pop (1.0.12)
- Protobuf (3.25.0)
- QGVAPlayer (1.0.19)
- Qiniu (8.7.0):
- HappyDNS (~> 1.0.3)
- QY_NIM_iOS_SDK (6.6.1)
- R.swift (7.3.2)
- ReactiveObjC (3.1.1)
- RxCocoa (5.1.3):
@@ -75,15 +65,6 @@ PODS:
- SDWebImage/Core (~> 5.10)
- SnapKit (5.6.0)
- SSKeychain (1.4.1)
- SSZipArchive (2.4.3)
- SVGAPlayer (2.5.7):
- SVGAPlayer/Core (= 2.5.7)
- SVGAPlayer/ProtoFiles (= 2.5.7)
- SVGAPlayer/Core (2.5.7):
- SSZipArchive (>= 1.8.1)
- SVGAPlayer/ProtoFiles
- SVGAPlayer/ProtoFiles (2.5.7):
- Protobuf (~> 3.4)
- SwiftyJSON (5.0.1)
- TXLiteAVSDK_TRTC (10.3.12363):
- TXLiteAVSDK_TRTC/TRTC (= 10.3.12363)
@@ -101,9 +82,7 @@ DEPENDENCIES:
- CryptoSwift
- FFPopup
- FLAnimatedImage
- IAPHelper
- IQKeyboardManager (~> 6.5.11)
- LookinServer
- Masonry
- MBProgressHUD
- MJExtension
@@ -111,11 +90,8 @@ DEPENDENCIES:
- Moya-ObjectMapper/RxSwift
- Moya/RxSwift
- NIMSDK_LITE (~> 8.9.0)
- NTESQuickPass
- pop
- QGVAPlayer
- Qiniu
- QY_NIM_iOS_SDK (~> 6.6.1)
- R.swift
- ReactiveObjC
- RxCocoa
@@ -125,7 +101,6 @@ DEPENDENCIES:
- SDWebImageFLPlugin
- SnapKit
- SSKeychain
- SVGAPlayer
- SwiftyJSON
- TXLiteAVSDK_TRTC (~> 10.3.12271)
- TZImagePickerController
@@ -141,9 +116,7 @@ SPEC REPOS:
- FFPopup
- FLAnimatedImage
- HappyDNS
- IAPHelper
- IQKeyboardManager
- LookinServer
- Masonry
- MBProgressHUD
- MJExtension
@@ -151,14 +124,9 @@ SPEC REPOS:
- Moya
- Moya-ObjectMapper
- NIMSDK_LITE
- NTESBaseComponent
- NTESQuickPass
- ObjectMapper
- pop
- Protobuf
- QGVAPlayer
- Qiniu
- QY_NIM_iOS_SDK
- R.swift
- ReactiveObjC
- RxCocoa
@@ -169,8 +137,6 @@ SPEC REPOS:
- SDWebImageFLPlugin
- SnapKit
- SSKeychain
- SSZipArchive
- SVGAPlayer
- SwiftyJSON
- TXLiteAVSDK_TRTC
- TZImagePickerController
@@ -185,9 +151,7 @@ SPEC CHECKSUMS:
FFPopup: a208dcee8db3e54ec4a88fcd6481f6f5d85b7a83
FLAnimatedImage: bbf914596368867157cc71b38a8ec834b3eeb32b
HappyDNS: 5421fc84775a299517e994afadb9e732b265ec65
IAPHelper: fd74f53b0ac142eed085777b88b86a11746a2dd4
IQKeyboardManager: 024b54d7dcb765c5bc99882cb4d5ea24a8cb7c3c
LookinServer: 535f5d1ffd5823a3b0abaf97ba5c4108bd8cb5ea
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
MJExtension: 21c5f6f8c4d5d8844b7ae8fbae08fed0b501f961
@@ -195,14 +159,9 @@ SPEC CHECKSUMS:
Moya: 5b45dacb75adb009f97fde91c204c1e565d31916
Moya-ObjectMapper: 967a99d9ea3aa9c93ddbe112aeca3667f53bfe93
NIMSDK_LITE: c4895574b3e519c34e2c70ae013f0863efc87661
NTESBaseComponent: 7b310e7e80bb6c27183176188b98356d200dbbc5
NTESQuickPass: 7baf2a68a091fd69dbf70b84ecdc4eb6aa7dd7ad
ObjectMapper: 1eb41f610210777375fa806bf161dc39fb832b81
pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
Protobuf: 6a4183ec1d51649eb2be7b86ccc286e5c539219c
QGVAPlayer: a0bca68c9bd6f1c8de5ac2d10ddf98be6038cce9
Qiniu: da7204f1bf7d0ce18f2b8c541c7fafb301aab624
QY_NIM_iOS_SDK: 7fbf411c9c299f3b904fcc5b494542f41a11f70c
R.swift: 0af0d882f49f03711415cb4e5215daa977d8a480
ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
RxCocoa: e2ed092d5432e4296aa818021d27de4090ac0354
@@ -213,13 +172,11 @@ SPEC CHECKSUMS:
SDWebImageFLPlugin: 72efd2cfbf565bc438421abb426f4bcf7b670754
SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
SSKeychain: 55cc80f66f5c73da827e3077f02e43528897db41
SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
SVGAPlayer: 318b85a78b61292d6ae9dfcd651f3f0d1cdadd86
SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
TXLiteAVSDK_TRTC: c4e42ef113788558b7c5f4250bad5f81925bcfb4
TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
PODFILE CHECKSUM: df3727b44d7c6d0114a23d493fb475de24f13655
PODFILE CHECKSUM: 76cc4e3bfadcd4e40b285ad4a1f8bf58798623f8
COCOAPODS: 1.12.1

74
yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj
View File

@@ -44,7 +44,6 @@
230D63BB2B592D0D00DADC14 /* MewMainHomeMakeFriendModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63B92B592D0C00DADC14 /* MewMainHomeMakeFriendModel.m */; };
230D63BE2B592EA800DADC14 /* UserGameInfoVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63BD2B592EA800DADC14 /* UserGameInfoVo.m */; };
230D63C12B5931E800DADC14 /* MewMainHomeGameTabModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63C02B5931E800DADC14 /* MewMainHomeGameTabModel.m */; };
230D63C42B59813D00DADC14 /* UIButton+MewSetButtomArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63C32B59813D00DADC14 /* UIButton+MewSetButtomArea.m */; };
230D63C82B59835C00DADC14 /* MewSaveBaseUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63C72B59835C00DADC14 /* MewSaveBaseUserModel.m */; };
230D63CB2B5A0A5B00DADC14 /* MewOCServerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63CA2B5A0A5B00DADC14 /* MewOCServerManager.m */; };
23107DBA2B5BA9E600F96550 /* MewNIMMsgInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23107DB92B5BA9E600F96550 /* MewNIMMsgInfoModel.m */; };
@@ -190,8 +189,6 @@
230D63BD2B592EA800DADC14 /* UserGameInfoVo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserGameInfoVo.m; sourceTree = "<group>"; };
230D63BF2B5931E800DADC14 /* MewMainHomeGameTabModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMainHomeGameTabModel.h; sourceTree = "<group>"; };
230D63C02B5931E800DADC14 /* MewMainHomeGameTabModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMainHomeGameTabModel.m; sourceTree = "<group>"; };
230D63C22B59813D00DADC14 /* UIButton+MewSetButtomArea.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+MewSetButtomArea.h"; sourceTree = "<group>"; };
230D63C32B59813D00DADC14 /* UIButton+MewSetButtomArea.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+MewSetButtomArea.m"; sourceTree = "<group>"; };
230D63C62B59835C00DADC14 /* MewSaveBaseUserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewSaveBaseUserModel.h; sourceTree = "<group>"; };
230D63C72B59835C00DADC14 /* MewSaveBaseUserModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewSaveBaseUserModel.m; sourceTree = "<group>"; };
230D63C92B5A0A5B00DADC14 /* MewOCServerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewOCServerManager.h; sourceTree = "<group>"; };
@@ -625,8 +622,8 @@
237053672B1F3AA100F5DE14 /* View */ = {
isa = PBXGroup;
children = (
237053682B1F3AA100F5DE14 /* MewHomeViewController.m */,
237053692B1F3AA100F5DE14 /* MewHomeViewController.h */,
237053682B1F3AA100F5DE14 /* MewHomeViewController.m */,
2370536A2B1F3AA100F5DE14 /* SubView */,
);
path = View;
@@ -635,26 +632,26 @@
2370536A2B1F3AA100F5DE14 /* SubView */ = {
isa = PBXGroup;
children = (
2370536B2B1F3AA100F5DE14 /* MewVoiceGuideView.m */,
2370536C2B1F3AA100F5DE14 /* MewPushExclusiveVoiceView.m */,
2370536D2B1F3AA100F5DE14 /* MewVoiceDiscView.m */,
2370536E2B1F3AA100F5DE14 /* MewHomeFilterView.m */,
2370536F2B1F3AA100F5DE14 /* MewHeaderView.h */,
237053702B1F3AA100F5DE14 /* MewUserIntroductionView.h */,
237053712B1F3AA100F5DE14 /* MewShowVoiceView.h */,
237053722B1F3AA100F5DE14 /* MewPlayVoiceView.m */,
237053732B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.h */,
237053742B1F3AA100F5DE14 /* MewRightFollowVoiceView.m */,
237053752B1F3AA100F5DE14 /* MewVoiceDiscView.h */,
237053762B1F3AA100F5DE14 /* MewPushExclusiveVoiceView.h */,
237053772B1F3AA100F5DE14 /* MewVoiceGuideView.h */,
237053782B1F3AA100F5DE14 /* MewShowVoiceView.m */,
237053792B1F3AA100F5DE14 /* MewUserIntroductionView.m */,
2370537A2B1F3AA100F5DE14 /* MewHeaderView.m */,
2370537B2B1F3AA100F5DE14 /* MewHomeFilterView.h */,
2370537C2B1F3AA100F5DE14 /* MewRightFollowVoiceView.h */,
2370537D2B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m */,
2370536E2B1F3AA100F5DE14 /* MewHomeFilterView.m */,
2370537E2B1F3AA100F5DE14 /* MewPlayVoiceView.h */,
237053722B1F3AA100F5DE14 /* MewPlayVoiceView.m */,
237053762B1F3AA100F5DE14 /* MewPushExclusiveVoiceView.h */,
2370536C2B1F3AA100F5DE14 /* MewPushExclusiveVoiceView.m */,
237053732B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.h */,
2370537D2B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m */,
2370537C2B1F3AA100F5DE14 /* MewRightFollowVoiceView.h */,
237053742B1F3AA100F5DE14 /* MewRightFollowVoiceView.m */,
237053712B1F3AA100F5DE14 /* MewShowVoiceView.h */,
237053782B1F3AA100F5DE14 /* MewShowVoiceView.m */,
237053702B1F3AA100F5DE14 /* MewUserIntroductionView.h */,
237053792B1F3AA100F5DE14 /* MewUserIntroductionView.m */,
237053752B1F3AA100F5DE14 /* MewVoiceDiscView.h */,
2370536D2B1F3AA100F5DE14 /* MewVoiceDiscView.m */,
237053772B1F3AA100F5DE14 /* MewVoiceGuideView.h */,
2370536B2B1F3AA100F5DE14 /* MewVoiceGuideView.m */,
);
path = SubView;
sourceTree = "<group>";
@@ -757,15 +754,6 @@
path = MewIAP;
sourceTree = "<group>";
};
2370547C2B1F3B3200F5DE14 /* UIButton */ = {
isa = PBXGroup;
children = (
230D63C22B59813D00DADC14 /* UIButton+MewSetButtomArea.h */,
230D63C32B59813D00DADC14 /* UIButton+MewSetButtomArea.m */,
);
path = UIButton;
sourceTree = "<group>";
};
237054B72B1F3BF600F5DE14 /* View */ = {
isa = PBXGroup;
children = (
@@ -867,7 +855,6 @@
237054272B1F3B3200F5DE14 /* MVP */,
237054422B1F3B3200F5DE14 /* Tool */,
237053F32B1F3B3200F5DE14 /* UI */,
2370547C2B1F3B3200F5DE14 /* UIButton */,
);
path = Base;
sourceTree = "<group>";
@@ -1025,7 +1012,6 @@
8C9C839E2B0C697A00A601BC /* View */ = {
isa = PBXGroup;
children = (
8CAB97392B239ECE00ED8639 /* MewView */,
8C9C83A12B0C697A00A601BC /* MewLoginForgetPasswordViewController.h */,
8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */,
8C9C83A22B0C697A00A601BC /* CustomView */,
@@ -1072,13 +1058,6 @@
path = Model;
sourceTree = "<group>";
};
8CAB97392B239ECE00ED8639 /* MewView */ = {
isa = PBXGroup;
children = (
);
path = MewView;
sourceTree = "<group>";
};
8CAB973A2B239F1900ED8639 /* MiewMineView */ = {
isa = PBXGroup;
children = (
@@ -1125,7 +1104,6 @@
8C4D53492AFD4CF600238AE6 /* Frameworks */,
8C4D534A2AFD4CF600238AE6 /* Resources */,
D550463D226DF98945DA2E1C /* [CP] Embed Pods Frameworks */,
E0404295390912036FCD308C /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -1243,23 +1221,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E0404295390912036FCD308C /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -1281,7 +1242,6 @@
237054882B1F3B3200F5DE14 /* MewEmptyTableViewCell.m in Sources */,
237053142B1F3A3D00F5DE14 /* MewClientConfig.m in Sources */,
230D63252B55955900DADC14 /* MewDevice.swift in Sources */,
230D63C42B59813D00DADC14 /* UIButton+MewSetButtomArea.m in Sources */,
230D63922B5902D600DADC14 /* MewGiftDataModel.swift in Sources */,
23F1E6A62B5AC155004777A2 /* MewChatMsgItemModel.swift in Sources */,
2370531D2B1F3A6E00F5DE14 /* MewWebViewController.m in Sources */,

2
yinmeng-ios/yinmeng-ios.xcodeproj/xcshareddata/xcschemes/yinmeng-ios.xcscheme
View File

@@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

13
yinmeng-ios/yinmeng-ios/AppDelegate/AppDelegate+ThirdConfig.m
View File

@@ -7,15 +7,13 @@
#import "AppDelegate+ThirdConfig.h"
#import <NIMSDK/NIMSDK.h>
#import <QYSDK_NIM/QYSDK.h>
#import "MewCustomAttachmentDecoder.h"
@implementation AppDelegate (ThirdConfig)
- (void)initThirdConfig {
[self configNIMSDK];
}
- (void)configNIMSDK {
//推荐在程序启动的时候初始化 NIMSDK
@@ -40,10 +38,5 @@
[[UIApplication sharedApplication] registerForRemoteNotifications];
}
- (void)configQIYUSDK {
[[QYSDK sharedSDK] registerAppId:@"b6b7ca22f8ce319dea3a7456dc211fec" appName:@"yinmeng"];
[QYSDK sharedSDK].customUIConfig.showAudioEntry = NO;
[QYSDK sharedSDK].customUIConfig.autoShowKeyboard = NO;
[QYSDK sharedSDK].customUIConfig.serviceHeadImage = [UIImage imageNamed:@"ming_setting_about_us"];
}
@end

2
yinmeng-ios/yinmeng-ios/AppDelegate/AppDelegate.m
View File

@@ -23,7 +23,7 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[self createTabbarController];
[self initThirdConfig];
// [self initThirdConfig];
// [IQKeyboardManager sharedManager].enable = YES;
// [[IQKeyboardManager sharedManager] setKeyboardDistanceFromTextField:50];

55
yinmeng-ios/yinmeng-ios/Base/MewApi/MewGetPointList.m
View File

@@ -8,60 +8,5 @@
#import "MewGetPointList.h"
@implementation MewGetPointList
+ (CAAnimationGroup *)mewGEtPoint:(CGPoint)startPoint endPoint:(CGPoint)endPoint {
CGPoint centerPoint = CGPointMake(KMewGetScreenWidth / 2, KMewGetScreenHeight / 2);
CAKeyframeAnimation *animation0 = [CAKeyframeAnimation animation];
animation0.duration = 0.8;
animation0.keyPath = @"transform.scale";
animation0.values = @[@1.0,@1.5,@2.0,@1.5];
animation0.repeatCount = 1;
animation0.calculationMode = kCAAnimationCubic;
animation0.removedOnCompletion = NO;
animation0.fillMode = kCAFillModeForwards;
CAKeyframeAnimation *animation1 = [CAKeyframeAnimation animation];
animation1.duration = 0.8;
animation1.beginTime = 0.8;
animation1.keyPath = @"transform.scale";
animation1.values = @[@1.5,@2.0,@2.5,@3.0];
animation1.repeatCount = 1;
animation1.calculationMode = kCAAnimationCubic;
animation1.removedOnCompletion = NO;
animation1.fillMode = kCAFillModeForwards;
CAKeyframeAnimation *animation2 = [CAKeyframeAnimation animation];
animation2.duration = 0.8;
animation2.beginTime = 0.8;
animation2.keyPath = @"position";
animation2.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];;
animation2.values = @[[NSValue valueWithCGPoint:startPoint],[NSValue valueWithCGPoint:CGPointMake(centerPoint.x ,centerPoint.y)]];
animation2.repeatCount = 1;
animation2.removedOnCompletion = NO;
animation2.fillMode = kCAFillModeForwards;
CAKeyframeAnimation *animation3 = [CAKeyframeAnimation animation];
animation3.duration = 0.8;
animation3.beginTime = 2.6;//0.8+0.8+1
animation3.keyPath = @"transform.scale";
animation3.values = @[@3,@2.5,@2,@1.5,@1];
animation3.repeatCount = 1;
CAKeyframeAnimation *animation4 = [CAKeyframeAnimation animation];
animation4.duration = 0.8;
animation4.beginTime = 2.6;
animation4.keyPath = @"position";
animation4.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
animation4.values = @[[NSValue valueWithCGPoint:CGPointMake(centerPoint.x ,centerPoint.y)],[NSValue valueWithCGPoint:endPoint]];
animation4.repeatCount = 1;
CAAnimationGroup *group = [CAAnimationGroup animation];
group.duration = 3.2;
group.animations = @[animation0,animation1,animation2, animation3,animation4];
group.repeatCount = 1;
group.removedOnCompletion = NO;
group.fillMode = kCAFillModeForwards;
return group;
}
@end

1
yinmeng-ios/yinmeng-ios/Base/MewPrefixHeader.h
View File

@@ -18,7 +18,6 @@
#import <MJExtension/MJExtension.h>
#import "MewNIMMsgInfoModel.h"
#import "MewNavigationVC.h"
#import "UIButton+MewSetButtomArea.h"
#import "MewNetworkDataModel.h"
#import "MewSaveBaseUserModel.h"
#import "MewOCServerManager.h"

7
yinmeng-ios/yinmeng-ios/Base/UI/MewGetColorTool.m
View File

@@ -15,11 +15,4 @@
+ (UIColor *)mewGetalphaColorWithColorText:(int)colorText alpha:(CGFloat)alpha{
return [UIColor colorWithRed:((float)((colorText & 0xFF0000) >> 16))/255.0 green:((float)((colorText & 0xFF00) >> 8))/255.0 blue:((float)(colorText & 0xFF))/255.0 alpha:(alpha)];
}
+ (CGFloat) mewGetColorValue: (NSString *) text begin: (NSUInteger) begin count: (NSUInteger) count {
NSString *subText = [text substringWithRange: NSMakeRange(begin, count)];
NSString *colorValue= count == 2 ? subText : [NSString stringWithFormat: @"%@%@", subText, subText];
unsigned getValue;
[[NSScanner scannerWithString: colorValue] scanHexInt: &getValue];
return getValue / 255.0;
}
@end

16
yinmeng-ios/yinmeng-ios/Base/UIButton/UIButton+MewSetButtomArea.h
View File

@@ -1,16 +0,0 @@
//
// MewSetButtomArea.h
// yinmeng-ios
//
// Created by duoban on 2024/1/18.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UIButton (MewSetButtomArea)
- (void)mew_setEnlargeEdgeWithTop:(CGFloat)top right:(CGFloat)right bottom:(CGFloat)bottom left:(CGFloat)left;
@end
NS_ASSUME_NONNULL_END

58
yinmeng-ios/yinmeng-ios/Base/UIButton/UIButton+MewSetButtomArea.m
View File

@@ -1,58 +0,0 @@
//
// MewSetButtomArea.m
// yinmeng-ios
//
// Created by duoban on 2024/1/18.
//
#import "UIButton+MewSetButtomArea.h"
#import <objc/runtime.h>
@interface UIButton ()
@end
@implementation UIButton (MewSetButtomArea)
static char topNameKey;
static char rightNameKey;
static char bottomNameKey;
static char leftNameKey;
- (void)mew_setEnlargeEdgeWithTop:(CGFloat)top right:(CGFloat)right bottom:(CGFloat)bottom left:(CGFloat)left
{
objc_setAssociatedObject(self, &topNameKey, [NSNumber numberWithFloat:top], OBJC_ASSOCIATION_COPY_NONATOMIC);
objc_setAssociatedObject(self, &rightNameKey, [NSNumber numberWithFloat:right], OBJC_ASSOCIATION_COPY_NONATOMIC);
objc_setAssociatedObject(self, &bottomNameKey, [NSNumber numberWithFloat:bottom], OBJC_ASSOCIATION_COPY_NONATOMIC);
objc_setAssociatedObject(self, &leftNameKey, [NSNumber numberWithFloat:left], OBJC_ASSOCIATION_COPY_NONATOMIC);
}
- (CGRect)enlargedRect
{
NSNumber* topEdge = objc_getAssociatedObject(self, &topNameKey);
NSNumber* rightEdge = objc_getAssociatedObject(self, &rightNameKey);
NSNumber* bottomEdge = objc_getAssociatedObject(self, &bottomNameKey);
NSNumber* leftEdge = objc_getAssociatedObject(self, &leftNameKey);
if (topEdge && rightEdge && bottomEdge && leftEdge)
{
return CGRectMake(self.bounds.origin.x - leftEdge.floatValue,
self.bounds.origin.y - topEdge.floatValue,
self.bounds.size.width + leftEdge.floatValue + rightEdge.floatValue,
self.bounds.size.height + topEdge.floatValue + bottomEdge.floatValue);
}
else
{
return self.bounds;
}
}
- (UIView*)hitTest:(CGPoint)point withEvent:(UIEvent*)event
{
if(self.hidden) return nil;
CGRect rect = [self enlargedRect];
if (CGRectEqualToRect(rect, self.bounds))
{
return [super hitTest:point withEvent:event];
}
return CGRectContainsPoint(rect, point) ? self : nil;
}
@end

1
yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeMoreGameVC.m
View File

@@ -216,7 +216,6 @@
if(!_mewBackBtn){
_mewBackBtn = [UIButton new];
[_mewBackBtn setImage:kMewGetImageData(@"mew_mainHome_more_game_back") forState:UIControlStateNormal];
[_mewBackBtn mew_setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
[_mewBackBtn addTarget:self action:@selector(mew_dissViewAction) forControlEvents:UIControlEventTouchUpInside];
}
return _mewBackBtn;

29
yinmeng-ios/yinmeng-ios/Main/Game/UserGameInfoVo.h
View File

@@ -11,35 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
@class UserGameTagInfo;
@interface UserGameInfoVo : NSObject
@property(nonatomic,copy) NSString *firstGameName;
@property(nonatomic,copy) NSString *firstLogo;
@property(nonatomic,copy) NSString *secondGameName;
@property(nonatomic,copy) NSArray<UserGameTagInfo *> *tags;
@property(nonatomic,copy) NSString *finishNum;
@property(nonatomic,copy) NSString *gameId;
@property(nonatomic,copy) NSString *gameName;
@property(nonatomic,copy) NSString *logo;
@property(nonatomic,copy) NSString *gameLogo;
@property(nonatomic,copy) NSString *price;
@property(nonatomic,copy) NSString *seq;
@property(nonatomic,copy) NSString *uid;
@property(nonatomic,copy) NSString *background;
@property(nonatomic,copy) NSString *tier;
@property(nonatomic,copy) NSString *amount;
@property(nonatomic,copy) NSString *orderNo;
@property(nonatomic,copy) NSString *inning;
@property(nonatomic,copy) NSString *toErBanNo;
@property(nonatomic,copy) NSString *toNick;
@property(nonatomic,copy) NSString *toAvatar;
@property(nonatomic,copy) NSString *fromNick;
@property(nonatomic,copy) NSString *fromAvatar;
@property(nonatomic,copy) NSString *createTime;
@property(nonatomic,copy) NSString *orderTime;
@property(nonatomic,copy) NSString *toUid;
@property(nonatomic,copy) NSString *fromUid;
@property(nonatomic,copy) NSString *tagRgb;
@property(nonatomic,copy) NSString *tagBg;
@property(nonatomic,copy) NSString *btnRgb;
@property(nonatomic,copy) NSString *btnBg;
@end

8
yinmeng-ios/yinmeng-ios/Main/Login/Swift/MewFillInfoVC.swift
View File

@@ -91,7 +91,7 @@ class MewFillInfoVC: MewBaseViewController {
let uid = MewSaveBaseUserModel.share().mewGetUserId()
let t = MewSaveBaseUserModel.share().mewUserTicket()
var dic:[String:Any] = [:]
dic["avatar"] = MewSaveBaseUserModel.share().mewAppleInfo.avatarUrl.count > 0 ? MewSaveBaseUserModel.share().mewAppleInfo.avatarUrl : MewEncryptManager.mewAESDecryptText("xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15")
dic["avatar"] = MewEncryptManager.mewAESDecryptText("xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15")
dic["gender"] = self.mewGenderText
dic["nick"] = mewNameTextView.text
dic["uid"] = uid
@@ -129,9 +129,7 @@ class MewFillInfoVC: MewBaseViewController {
mewGenderVeiw.addArrangedSubview(mewManBtn)
mewGenderVeiw.addArrangedSubview(mewWomanBtn)
view.addSubview(mewSendBtn)
if MewSaveBaseUserModel.share().mewAppleInfo.userName.count > 0{
mewTextView.text = MewSaveBaseUserModel.share().mewAppleInfo.userName;
}else{
MewOCServerManager.mewGetUserNick { obj, code, msg in
if (obj?.code == 200){
if let data = obj?.data as? String{
@@ -140,7 +138,7 @@ class MewFillInfoVC: MewBaseViewController {
}
}
}
mewBgImageView.snp.makeConstraints { make in

8
yinmeng-ios/yinmeng-ios/Main/Login/Swift/MewUserLoginViewController.swift
View File

@@ -290,7 +290,13 @@ extension MewUserLoginViewController:ASAuthorizationControllerDelegate,ASAuthori
}
MewHUDTool .mew_showLoading(withMessage: "正在登录中")
MewOCServerManager.mewAppleLogin({ obj, code, msg in
if obj?.code == 200{
if let model = MewLoginTokenInfoModel.mj_object(withKeyValues: obj?.data){
MewSaveBaseUserModel.share().mewSaveBaseUserData(model)
self.dismiss(animated: true, completion: nil)
self.mew_showErrorToast("登录成功")
}
}
}, openid: token! as String, unionid: userId , access_token: token! as String, type: "5")
}
}

1
yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.m
View File

@@ -260,7 +260,6 @@
- (UIButton *)forgetButton {
if (!_forgetButton) {
_forgetButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_forgetButton mew_setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5];
[_forgetButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
[_forgetButton setTitle:@"忘记密码？" forState:UIControlStateNormal];
_forgetButton.titleLabel.font = [UIFont systemFontOfSize:13];

1
yinmeng-ios/yinmeng-ios/Main/Mine/View/SubView/MewMineModifPayPwdView.m
View File

@@ -103,7 +103,6 @@
- (UIButton *)commandButton {
if (!_commandButton) {
_commandButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_commandButton mew_setEnlargeEdgeWithTop:20 right:20 bottom:20 left:20];
[_commandButton addTarget:self action:@selector(onClickHiddenBtn:) forControlEvents:UIControlEventTouchUpInside];
[_commandButton setImage:[UIImage imageNamed:@"mine_setting_modif_pay_pwd_hidden"] forState:UIControlStateNormal];
[_commandButton setImage:[UIImage imageNamed:@"mine_setting_modif_pay_pwd_show"] forState:UIControlStateSelected];

9
yinmeng-ios/yinmeng-ios/Main/Tabbar/View/MewTabBarController.m
View File

@@ -13,7 +13,7 @@
#import "MewMacro.h"
#import <NIMSDK/NIMSDK.h>
#import <QYSDK_NIM/QYSDK.h>
#import <AFNetworkReachabilityManager.h>
///VC
#import "MewNavigationVC.h"
@@ -144,8 +144,11 @@
MewPersonInfoModel *userInfo = [MewPersonInfoModel mj_objectWithKeyValues:obj.data];
if (userInfo.nick == nil || userInfo.avatar == nil) {
NSLog(@"%@",userInfo.nick);
NSLog(@"%@",userInfo.nick);
NSLog(@"%@",obj.data);
NSLog(@"%@",obj.data);
if (userInfo.nick.length == 0 || userInfo.avatar.length == 0) {
[self mew_completeUserInfo];
return;
}

8
yinmeng-ios/yinmeng-ios/Swift/MewRoomPlay/MewView/MewSubView/MewRoomMicSeatView.swift
View File

@@ -193,14 +193,6 @@ class MewRoomMicSeatView: UIView {
let getUid = "\(uid)"
if getUid == MewSaveBaseUserModel.share().mewGetUserId(){
mewDownMic(down: String(index), next: nil)
// let alert = UIAlertController.init(title: "提示", message: "", preferredStyle: .actionSheet)
// let alertAction = UIAlertAction.init(title: "下麦旁听", style:.default) { action in
//
// }
// alert.addAction(alertAction)
// UIApplication.shared.keyWindow?.rootViewController?.present(alert, animated: true)
}else{
subView.layer.borderWidth = 2
}