Commit 3bf1397e by xuning

派单弹窗

parent 7c757c81
......@@ -48,6 +48,10 @@
79DC8B842B8CD5DF00DBD8EA /* XVOrderSettiingTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B832B8CD5DF00DBD8EA /* XVOrderSettiingTitleView.m */; };
79DC8B872B8CD5F000DBD8EA /* XVOrderSettingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B862B8CD5F000DBD8EA /* XVOrderSettingView.m */; };
79DC8B8A2B8D818000DBD8EA /* XVVerticalButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B892B8D818000DBD8EA /* XVVerticalButton.m */; };
79DC8B8D2B8D887000DBD8EA /* XVDispatchOrderAlter.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B8C2B8D887000DBD8EA /* XVDispatchOrderAlter.m */; };
79DC8B902B8DABF900DBD8EA /* XVNewOrderAlter.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B8F2B8DABF800DBD8EA /* XVNewOrderAlter.m */; };
79DC8B962B8DB05900DBD8EA /* XVGetOrderAlterButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B952B8DB05900DBD8EA /* XVGetOrderAlterButtonView.m */; };
79DC8B992B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC8B982B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.m */; };
FA5E55D5A48FDC04BA4CCD08 /* Pods_fastservice.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08D109EE60B32403F3655A70 /* Pods_fastservice.framework */; };
/* End PBXBuildFile section */
......@@ -137,6 +141,14 @@
79DC8B862B8CD5F000DBD8EA /* XVOrderSettingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVOrderSettingView.m; sourceTree = "<group>"; };
79DC8B882B8D818000DBD8EA /* XVVerticalButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XVVerticalButton.h; sourceTree = "<group>"; };
79DC8B892B8D818000DBD8EA /* XVVerticalButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVVerticalButton.m; sourceTree = "<group>"; };
79DC8B8B2B8D887000DBD8EA /* XVDispatchOrderAlter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XVDispatchOrderAlter.h; sourceTree = "<group>"; };
79DC8B8C2B8D887000DBD8EA /* XVDispatchOrderAlter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVDispatchOrderAlter.m; sourceTree = "<group>"; };
79DC8B8E2B8DABF800DBD8EA /* XVNewOrderAlter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XVNewOrderAlter.h; sourceTree = "<group>"; };
79DC8B8F2B8DABF800DBD8EA /* XVNewOrderAlter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVNewOrderAlter.m; sourceTree = "<group>"; };
79DC8B942B8DB05900DBD8EA /* XVGetOrderAlterButtonView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XVGetOrderAlterButtonView.h; sourceTree = "<group>"; };
79DC8B952B8DB05900DBD8EA /* XVGetOrderAlterButtonView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVGetOrderAlterButtonView.m; sourceTree = "<group>"; };
79DC8B972B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XVGetOrderAlterSliderView.h; sourceTree = "<group>"; };
79DC8B982B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVGetOrderAlterSliderView.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -197,6 +209,7 @@
7981EAD02B6F655500F357E7 /* View */ = {
isa = PBXGroup;
children = (
79DC8B9A2B8DB0E700DBD8EA /* OrderAlter */,
7981EAFD2B712CC700F357E7 /* HBLockSliderView.h */,
7981EAFE2B712CC700F357E7 /* HBLockSliderView.m */,
7981EAD12B6F656900F357E7 /* XVCustomBarView.h */,
......@@ -418,6 +431,21 @@
path = Controller;
sourceTree = "<group>";
};
79DC8B9A2B8DB0E700DBD8EA /* OrderAlter */ = {
isa = PBXGroup;
children = (
79DC8B8B2B8D887000DBD8EA /* XVDispatchOrderAlter.h */,
79DC8B8C2B8D887000DBD8EA /* XVDispatchOrderAlter.m */,
79DC8B8E2B8DABF800DBD8EA /* XVNewOrderAlter.h */,
79DC8B8F2B8DABF800DBD8EA /* XVNewOrderAlter.m */,
79DC8B942B8DB05900DBD8EA /* XVGetOrderAlterButtonView.h */,
79DC8B952B8DB05900DBD8EA /* XVGetOrderAlterButtonView.m */,
79DC8B972B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.h */,
79DC8B982B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.m */,
);
path = OrderAlter;
sourceTree = "<group>";
};
C642CCEC71A6009B069B11C8 /* Frameworks */ = {
isa = PBXGroup;
children = (
......@@ -561,6 +589,7 @@
files = (
79DC8B6F2B74A8E600DBD8EA /* XVPersonalFooterView.m in Sources */,
79DC8B752B74B69600DBD8EA /* XVOrderDetailsViewController.m in Sources */,
79DC8B962B8DB05900DBD8EA /* XVGetOrderAlterButtonView.m in Sources */,
79DC8B872B8CD5F000DBD8EA /* XVOrderSettingView.m in Sources */,
7981EAB72B6E669000F357E7 /* UIScrollView+XVAdd.m in Sources */,
7981EACF2B6F63CF00F357E7 /* XVMainJobViewController.m in Sources */,
......@@ -585,7 +614,9 @@
7981EAFF2B712CC700F357E7 /* HBLockSliderView.m in Sources */,
7981EAF92B71205A00F357E7 /* XVJobStatusToolView.m in Sources */,
799DF0D72B6BD8B100680907 /* main.m in Sources */,
79DC8B902B8DABF900DBD8EA /* XVNewOrderAlter.m in Sources */,
7981EB042B7273B500F357E7 /* XVPersonalViewController.m in Sources */,
79DC8B992B8DB07A00DBD8EA /* XVGetOrderAlterSliderView.m in Sources */,
7981EAF32B6FC08F00F357E7 /* XVCategoryTitleCell.m in Sources */,
7981EAF62B6FD62200F357E7 /* XVOrderSortView.m in Sources */,
7981EAC42B6E800900F357E7 /* XVInputFieldView.m in Sources */,
......@@ -594,6 +625,7 @@
799DF11A2B6D2B3200680907 /* XVLoginViewController.m in Sources */,
7981EAED2B6FC05B00F357E7 /* XVCategoryTitleView.m in Sources */,
799DF1102B6D25B400680907 /* UIBarButtonItem+SXCreate.m in Sources */,
79DC8B8D2B8D887000DBD8EA /* XVDispatchOrderAlter.m in Sources */,
799DF10F2B6D25B400680907 /* UINavigation+SXFixSpace.m in Sources */,
7981EB0B2B73BC1500F357E7 /* XVPersonalViewCell.m in Sources */,
799DF0F92B6BDA1400680907 /* UINavigationController+FDFullscreenPopGesture.m in Sources */,
......
......@@ -12,6 +12,7 @@
#import "XVNaviViewController.h"
#import "XVMainJobViewController.h"
@interface AppDelegate ()
......@@ -43,6 +44,8 @@
[self setupIQKeyboard];
return YES;
}
......
//
// XVDispatchOrderAlter.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface XVDispatchOrderAlter : UIView
+ (void)show;
@end
NS_ASSUME_NONNULL_END
//
// XVGetOrderAlterButtonView.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface XVGetOrderAlterButtonView : UIView
@end
NS_ASSUME_NONNULL_END
//
// XVGetOrderAlterButtonView.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVGetOrderAlterButtonView.h"
@interface XVGetOrderAlterButtonView()
@property (nonatomic, strong) UIButton *leftRefuseButton;
// 抢单
@property (nonatomic, strong) UIButton *orderButton;
@property (nonatomic, strong) UIButton *rightRefuseButton;
@end
@implementation XVGetOrderAlterButtonView
- (instancetype)initWithFrame:(CGRect)frame {
if(self = [super initWithFrame:frame]) {
[self setupUI];
}
return self;
}
- (void)setupUI {
CGFloat x = (SCREEN_WIDTH - 16) / 4;
[self addSubview:self.orderButton];
[self.orderButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self);
make.size.mas_equalTo(CGSizeMake(75, 75));
}];
[self addSubview:self.leftRefuseButton];
[self.leftRefuseButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self);
make.centerX.mas_equalTo(self).mas_offset(-x);
make.size.mas_equalTo(CGSizeMake(44, 44));
}];
[self addSubview:self.rightRefuseButton];
[self.rightRefuseButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self);
make.centerX.mas_equalTo(self).mas_offset(x);
make.size.mas_equalTo(CGSizeMake(44, 44));
}];
self.orderButton.layer.shadowColor = RGBAColor(0, 0, 0, 0.4).CGColor;
self.orderButton.layer.shadowOffset = CGSizeMake(0,0);
self.orderButton.layer.shadowOpacity = 0.8f;
kViewBorderRadius(self.orderButton, 75/2, 1, F_BBBBBB_COLOR);
self.rightRefuseButton.layer.shadowColor = RGBAColor(0, 0, 0, 0.4).CGColor;
self.rightRefuseButton.layer.shadowOffset = CGSizeMake(0,0);
self.rightRefuseButton.layer.shadowOpacity = 0.8f;
kViewBorderRadius(self.rightRefuseButton, 22, 1, F_BBBBBB_COLOR);
self.leftRefuseButton.layer.shadowColor = RGBAColor(0, 0, 0, 0.4).CGColor;
self.leftRefuseButton.layer.shadowOffset = CGSizeMake(0,0);
self.leftRefuseButton.layer.shadowOpacity = 0.8f;
kViewBorderRadius(self.leftRefuseButton, 22, 1, F_BBBBBB_COLOR);
}
- (UIButton *)leftRefuseButton {
if(_leftRefuseButton == nil) {
_leftRefuseButton = [[UIButton alloc]initWithTitle:@"拒绝" fontSize:14 titleColor:F_101010_COLOR bgColor:[UIColor whiteColor]];
}
return _leftRefuseButton;
}
- (UIButton *)orderButton {
if(_orderButton == nil) {
_orderButton = [[UIButton alloc]initWithTitle:@"接受\n10S" fontSize:14 titleColor:[UIColor whiteColor] bgColor:COLOR_THEMEGRENN];
}
return _orderButton;
}
- (UIButton *)rightRefuseButton {
if(_rightRefuseButton == nil) {
_rightRefuseButton = [[UIButton alloc]initWithTitle:@"拒绝" fontSize:14 titleColor:F_101010_COLOR bgColor:[UIColor whiteColor]];
}
return _rightRefuseButton;
}
@end
//
// XVGetOrderAlterSliderView.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface XVGetOrderAlterSliderView : UIView
@end
NS_ASSUME_NONNULL_END
//
// XVGetOrderAlterSliderView.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVGetOrderAlterSliderView.h"
#import "HBLockSliderView.h"
@interface XVGetOrderAlterSliderView()<HBLockSliderDelegate>
// 拒绝
@property (nonatomic, strong) UIButton *refuseButton;
// 滑动
@property (nonatomic, strong) HBLockSliderView *sliderView;
@end
@implementation XVGetOrderAlterSliderView
- (instancetype)initWithFrame:(CGRect)frame {
if(self = [super initWithFrame:frame]) {
[self addSubview:self.refuseButton];
self.refuseButton.frame = CGRectMake(0, 0, 84, 51);
[self addSubview:self.sliderView];
}
return self;
}
- (UIButton *)refuseButton {
if(_refuseButton == nil) {
_refuseButton = [[UIButton alloc]initWithTitle:@"拒绝" fontSize:14 titleColor:F_101010_COLOR bgColor:[UIColor colorWithHexString:@"#E4E1E1"]];
}
return _refuseButton;
}
- (HBLockSliderView *)sliderView {
if (_sliderView == nil) {
_sliderView = [[HBLockSliderView alloc] initWithFrame:CGRectMake(84, 0, SCREEN_WIDTH-100, 51)];
_sliderView.text = @"滑动接受派单";
[_sliderView setColorForBackgroud:COLOR_THEMEGRENN
foreground:COLOR_THEMEGRENN
thumb:COLOR_THEMEGRENN
border:[UIColor clearColor]
textColor:[UIColor whiteColor]];
_sliderView.thumbBack = YES;
[_sliderView setThumbBeginImage:[UIImage imageNamed:@"huadong"] finishImage:[UIImage imageNamed:@"huadong"]];
[_sliderView setRoundCorners:0];
_sliderView.delegate = self;
}
return _sliderView;
}
@end
//
// XVNewOrderAlter.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface XVNewOrderAlter : UIView
@end
NS_ASSUME_NONNULL_END
//
// XVNewOrderAlter.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVNewOrderAlter.h"
@implementation XVNewOrderAlter
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
......@@ -10,6 +10,7 @@
#import "XVOrderSettiingTitleView.h"
#import "XVOrderSettingView.h"
#import "XVVerticalButton.h"
#import "XVDispatchOrderAlter.h"
@interface XVOrderSettingViewController ()
......@@ -44,6 +45,12 @@
[self setupUI];
}
- (void)setupUI {
XVDispatchOrderAlter *view = [[XVDispatchOrderAlter alloc]init];
[self.view addSubview:view];
[view mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.mas_equalTo(self.view);
}];
return;
[self.view addSubview:self.scrollView];
[self.scrollView addSubview:self.title1View];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment