Skip to content

Commit ae0cdc8

Browse files
NJHuNJHu
committed
bug update
1 parent 7bfb421 commit ae0cdc8

16 files changed

Lines changed: 43 additions & 40 deletions

File tree

‎iOSProject/iOSProject.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2028,18 +2028,18 @@
20282028
58DC83951FFB43AB0060DC03 /* View */ = {
20292029
isa = PBXGroup;
20302030
children = (
2031-
58DC83DB1FFB44360060DC03 /* WPFAttachmentView.h */,
2032-
58DC83E01FFB44370060DC03 /* WPFAttachmentView.m */,
20332031
58DC83E51FFB44370060DC03 /* WPFBaseView.h */,
20342032
58DC83E41FFB44370060DC03 /* WPFBaseView.m */,
2035-
58DC83DF1FFB44360060DC03 /* WPFCollisionView.h */,
2036-
58DC83E21FFB44370060DC03 /* WPFCollisionView.m */,
2037-
58DC83DC1FFB44360060DC03 /* WPFPushView.h */,
2038-
58DC83E31FFB44370060DC03 /* WPFPushView.m */,
20392033
58DC83DD1FFB44360060DC03 /* WPFSnapView.h */,
20402034
58DC83DE1FFB44360060DC03 /* WPFSnapView.m */,
2035+
58DC83DC1FFB44360060DC03 /* WPFPushView.h */,
2036+
58DC83E31FFB44370060DC03 /* WPFPushView.m */,
2037+
58DC83DB1FFB44360060DC03 /* WPFAttachmentView.h */,
2038+
58DC83E01FFB44370060DC03 /* WPFAttachmentView.m */,
20412039
58DC83E11FFB44370060DC03 /* WPFSpringView.h */,
20422040
58DC83DA1FFB44350060DC03 /* WPFSpringView.m */,
2041+
58DC83DF1FFB44360060DC03 /* WPFCollisionView.h */,
2042+
58DC83E21FFB44370060DC03 /* WPFCollisionView.m */,
20432043
);
20442044
path = View;
20452045
sourceTree = "<group>";
@@ -2082,8 +2082,8 @@
20822082
58DC83B41FFB43E20060DC03 /* LMJDrawBoardViewController.h */,
20832083
58DC83A21FFB43E20060DC03 /* LMJDrawBoardViewController.m */,
20842084
58DC83A41FFB43E20060DC03 /* LMJDrawBoardViewController.xib */,
2085-
58DC83AB1FFB43E20060DC03 /* LMJFingerLockViewController.m */,
20862085
58DC83BB1FFB43E20060DC03 /* LMJFingerLockViewController.h */,
2086+
58DC83AB1FFB43E20060DC03 /* LMJFingerLockViewController.m */,
20872087
);
20882088
path = CoreGraphics;
20892089
sourceTree = "<group>";
@@ -2189,13 +2189,13 @@
21892189
isa = PBXGroup;
21902190
children = (
21912191
58DC847A1FFC97280060DC03 /* libopenssl.a */,
2192-
58DC847B1FFC97280060DC03 /* NJVitamioViewController.m */,
21932192
58DC847C1FFC97280060DC03 /* libVitamio.a */,
21942193
58DC847D1FFC97280060DC03 /* LICENSE */,
21952194
58DC847E1FFC97280060DC03 /* CHANGELOG.md */,
21962195
58DC847F1FFC97280060DC03 /* include */,
21972196
58DC84891FFC97280060DC03 /* libffmpeg.a */,
21982197
58DC848A1FFC97280060DC03 /* NJVitamioViewController.h */,
2198+
58DC847B1FFC97280060DC03 /* NJVitamioViewController.m */,
21992199
);
22002200
path = Vitamio;
22012201
sourceTree = "<group>";
@@ -2251,8 +2251,8 @@
22512251
58DC84A51FFC97290060DC03 /* BSJPublishViewController.m */,
22522252
58DC84961FFC97280060DC03 /* BSJPublishWordViewController.h */,
22532253
58DC84A41FFC97290060DC03 /* BSJPublishWordViewController.m */,
2254-
58DC84991FFC97280060DC03 /* BSJPictureShowViewController.m */,
22552254
58DC84A11FFC97290060DC03 /* BSJPictureShowViewController.h */,
2255+
58DC84991FFC97280060DC03 /* BSJPictureShowViewController.m */,
22562256
);
22572257
path = Controller;
22582258
sourceTree = "<group>";

‎iOSProject/iOSProject/Classes/Helpers/广告页/AdvertiseView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ - (instancetype)initWithFrame:(CGRect)frame
3636
// 2.跳过按钮
3737
CGFloat btnW = 60;
3838
CGFloat btnH = 30;
39-
_countBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth - btnW - 24, btnH, btnW, btnH)];
39+
_countBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth - btnW - 24, [UIApplication sharedApplication].statusBarFrame.size.height + btnH, btnW, btnH)];
4040
[_countBtn addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
4141
[_countBtn setTitle:[NSString stringWithFormat:@"跳过%d", showtime] forState:UIControlStateNormal];
4242
_countBtn.titleLabel.font = [UIFont systemFontOfSize:15];

‎iOSProject/iOSProject/Classes/新浪微博/Tools/SINStatusListDAL.m‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ @interface SINStatusListDAL ()
2727
@implementation SINStatusListDAL
2828

2929

30-
+ (void)loadStatusListFromDiskWithSinceId:(NSString *)since_id maxId:(NSString *)max_id completion:(void(^)(NSMutableArray<NSMutableDictionary *> *dictArrayM, NSError *error))completion
31-
{
32-
33-
34-
35-
36-
}
37-
3830

3931
+ (void)cachesStatusList:(NSMutableArray<NSMutableDictionary *> *)status
4032
{

‎iOSProject/iOSProject/Classes/核心动画/CoreAnimationControllers/LMJCAKeyFrameAnimationViewController.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ - (void)loadView
2525

2626
- (void)viewDidLoad {
2727
[super viewDidLoad];
28-
29-
self.fd_interactivePopDisabled = YES;
28+
3029
}
3130

3231

‎iOSProject/iOSProject/Classes/核心动画/CoreAnimationControllers/LMJCALayerBaseViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
4848

4949
// 快速进行图层缩放,KVC
5050
// x,y同时缩放0.5
51-
[self.redView.layer setValue:@0.5 forKeyPath:@"transform.scale"];
52-
53-
[self.redView.layer setValue:@(M_PI) forKeyPath:@"transform.rotation"];
51+
// [self.redView.layer setValue:@0.5 forKeyPath:@"transform.scale"];
52+
//
53+
// [self.redView.layer setValue:@(M_PI) forKeyPath:@"transform.rotation"];
5454

5555

5656
}];

‎iOSProject/iOSProject/Classes/核心动画/CoreAnimationControllers/LMJCALayerViewController.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ @implementation LMJCALayerViewController
1717
- (void)viewDidLoad {
1818
[super viewDidLoad];
1919
// Do any additional setup after loading the view.
20+
self.fd_interactivePopDisabled = YES;
2021
}
2122

2223
- (UIView *)redView

‎iOSProject/iOSProject/Classes/核心动画/CoreAnimationControllers/LMJCATransitionViewController.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ @implementation LMJCATransitionViewController
2020
- (void)viewDidLoad {
2121
[super viewDidLoad];
2222

23-
24-
[self touchesBegan:[NSSet new] withEvent:[UIEvent new]];
2523
}
2624

2725
static int i = 2;

‎iOSProject/iOSProject/Classes/物理仿真/LMJDynamicViewController.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
221221
// 执行代理方法
222222
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
223223

224+
[tableView deselectRowAtIndexPath:indexPath animated:YES];
224225
// 1. 实例化一个仿真管理器
225226
WPFDemoController *demoVc = [[WPFDemoController alloc] init];
226227

‎iOSProject/iOSProject/Classes/物理仿真/View/WPFBaseView.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ - (instancetype)initWithFrame:(CGRect)frame {
1818

1919
// 设置方块
2020
UIImageView *boxView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Box1"]];
21-
boxView.center = CGPointMake(200, 220);
21+
boxView.center = CGPointMake(200, 200);
22+
boxView.userInteractionEnabled = YES;
2223
[self addSubview:boxView];
2324
self.boxView = boxView;
2425

‎iOSProject/iOSProject/Classes/物理仿真/View/WPFPushView.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ - (instancetype)init {
3434

3535
// 2. 添加图片框，拖拽起点
3636
UIImageView *smallView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"AttachmentPoint_Mask"]];
37-
smallView.hidden = YES;
37+
smallView.hidden = NO;
38+
smallView.lmj_x = 100;
39+
smallView.lmj_y = 200;
3840
[self addSubview:smallView];
3941
_smallView = smallView;
4042

0 commit comments

Comments
 (0)