Skip to content

O
Opple-iOS
Commit 968d8665 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：优化打印

parent c9c85863
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 15 deletions
Class/OrderdetailsViewController.m
View file @ 968d8665
......@@ -141,9 +141,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
}
}
#pragma mark -获取订单详情、查询促销信息
- (void)getOrderDetailsData:(void(^)())finish
{
dispatch_group_t group = dispatch_group_create();
dispatch_group_enter(group);
[self CreateMBProgressHUDLoding];
......@@ -167,7 +169,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
}];
/// 查询促销信息
dispatch_group_enter(group);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(PROMOTIONAL),self.orderCode] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(PROMOTIONAL),self.orderCode] WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
[weakSelf RemoveMBProgressHUDLoding];
......@@ -697,12 +699,22 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
NSString *server = [NSString stringWithFormat:SERVERREQUESTURL(ORDERDETAILSURL),[Shoppersmanager manager].Shoppers.employee.departid,self.orderCode];
NSString *newServer = [server stringByReplacingOccurrencesOfString:@"/app" withString:@""];
// /// 文件
// NSFileManager *fileManager = [NSFileManager defaultManager];
// NSString * htmlResponseStr=[NSString stringWithContentsOfURL:[NSURL URLWithString:newServer] encoding:NSUTF8StringEncoding error:Nil];
// NSString *resourcePath = [ [NSBundle mainBundle] resourcePath];
// [fileManager createDirectoryAtPath:[resourcePath stringByAppendingString:@"/Caches"] withIntermediateDirectories:YES attributes:nil error:nil];
// NSString * path=[resourcePath stringByAppendingString:[NSString stringWithFormat:@"/Caches/%ld.html",[newServer hash]]];
// [htmlResponseStr writeToFile:path atomically:YES encoding:NSUTF8StringEncoding error:nil];
[self callAirprintWithURL:[NSURL URLWithString:newServer] SuccessBlock:^{
[weakSelf SuccessMBProgressView:@"打印完成"];
} ErrorBlock:^{
[weakSelf ErrorMBProgressView:@"打印失败"];
}];
}
#pragma mark -预览订单、撤销订单
......
Lighting.xcodeproj/project.pbxproj
View file @ 968d8665
......@@ -1722,7 +1722,8 @@
TargetAttributes = {
29706DA01CD082980003C412 = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = 39XYE6VSP8;
DevelopmentTeam = W54V2VB863;
ProvisioningStyle = Automatic;
};
};
};
......@@ -2089,9 +2090,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
......@@ -2132,7 +2134,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_PNG_TEXT = NO;
TARGETED_DEVICE_FAMILY = 2;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......@@ -2146,9 +2149,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
......@@ -2189,7 +2193,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_PNG_TEXT = NO;
TARGETED_DEVICE_FAMILY = 2;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......
Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme
View file @ 968d8665
......@@ -63,8 +63,8 @@
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "NSZombieEnabled"
value = "YES"
key = "OS_ACTIVITY_MODE"
value = "Disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
......
Lighting/Info.plist
View file @ 968d8665
......@@ -4,6 +4,8 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>China(zh_CN)</string>
<key>CFBundleDisplayName</key>
<string>欧立方</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
......@@ -13,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>1.1.5</string>
<string>1.1.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
Lighting/StoryboardwithCYX.storyboard
View file @ 968d8665
......@@ -751,7 +751,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥25600" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bp3-LQ-5yj">
<rect key="frame" x="568" y="14" width="324" height="21"/>
<rect key="frame" x="568" y="14" width="429" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
......
Tools/CYConstManager.h
View file @ 968d8665
......@@ -223,6 +223,11 @@ extern NSString *const WITHDRAWALPROGRESSDETAILS;
*/
extern NSString *const PROMOTIONAL;
/**
* 查询历史促销信息
*/
extern NSString *const OLDPROMOTIONAL;
/**
* 查询我的卡劵信息
*/
......
Tools/CYConstManager.m
View file @ 968d8665
......@@ -218,10 +218,15 @@ NSString *const WITHDRAWALPROGRESS = @"/applybill/queryApplyBill";
NSString *const WITHDRAWALPROGRESSDETAILS = @"/applybill/getDetailState";
/**
* 查询促销信息
* 查询实时促销信息
*/
NSString *const PROMOTIONAL = @"/promotion/calc/%@";
/**
* 查询历史促销信息
*/
NSString *const OLDPROMOTIONAL = @"/orderpromotion/get/%@";
/**
* 查询我的卡劵信息
*/
......
Tools/PrefixHeader.pch
View file @ 968d8665
......@@ -115,12 +115,17 @@
/**
* 服务器开发地址
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://192.168.199.188:8081/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
///**
// * 服务器开发地址
// */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://192.168.199.188:8081/opple-web/app%@",URL]
/**
* 服务器测试地址
*/
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
///**
// * 服务器正式地址
......
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