Skip to content

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

修改项说明：

parent e2a3ea1d
Hide whitespace changes
Inline Side-by-side
Showing with 684 additions and 117 deletions
Class/BindingSuccessViewController.m
View file @ 82c2f09c
......@@ -36,7 +36,7 @@
[XBLoadingView showHUDViewWithDefault];
//发送验证码
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(SENDSMSBANK),self.bankEntity.phoneNumber,[Shoppersmanager manager].Shoppers.employee.userName];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:urlString WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[self returnUrlString:urlString] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[XBLoadingView showHUDViewWithSuccessText:@"发送成功" completeBlock:^{
......@@ -52,6 +52,12 @@
}];
}
#pragma mark -汉字转码
- (NSString *)returnUrlString:(NSString *)ChineseString
{
NSString* encodedString = [ChineseString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
return encodedString;
}
#pragma mark - 绑定
- (IBAction)nextButtonClickAction:(UIButton *)sender {
......
Class/Login/LoginViewController.m
View file @ 82c2f09c
......@@ -315,9 +315,8 @@
return;
}
[XBLoadingView showHUDViewWithDefault];
//发送验证码
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(SENDSMS),inputPhoneNumber,self.identityView.userName.text];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:urlString WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[self returnUrlString:urlString] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[XBLoadingView showHUDViewWithText:@"发送验证码成功"];
......@@ -334,6 +333,8 @@
}];
}
#pragma mark -倒计时
- (void)SendbuttonChangetitle
{
......@@ -455,6 +456,9 @@
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSDictionary *dict = returnValue[@"data"];
if (!dict) {
return;
}
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:[NSString stringWithFormat:@"发现新版本%@,快去更新吧!",dict[@"version"]] preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"我知道了" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:dict[@"url"]]];
......
Class/SettlementViewController.m
View file @ 82c2f09c
......@@ -508,12 +508,6 @@
return nil;
}
#pragma mark -汉字转码
- (NSString *)ReturnUrlString:(NSString *)ChineseString
{
NSString* encodedString = [ChineseString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
return encodedString;
}
#pragma mark -开始编辑
- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
......
Lighting/Info.plist
View file @ 82c2f09c
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>2.0.2</string>
<string>2.0.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
Lighting/OppleMain.storyboard
View file @ 82c2f09c
This source diff could not be displayed because it is too large. You can view the blob instead.
Packaging.sh
View file @ 82c2f09c
......@@ -4,7 +4,7 @@
# 工程名
APP_NAME="Lighting"
# 电脑用户名
USER_NAME="z"
USER_NAME="caoyunxiao"
# 证书
CODE_SIGN_DISTRIBUTION="iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
#描述文件名称
......@@ -34,7 +34,7 @@ archivePath="/Users/${USER_NAME}/Desktop/App_IOS/archive/${APP_NAME}.xcarchive"
ipa_path="/Users/${USER_NAME}/Desktop/App_IOS/archive/${IPANAME}"
#要上传的ipa文件路径
echo ${ipa_path}/"${APP_NAME}.ipa"> text.txt
echo ${ipa_path}".ipa"> text.txt
echo "=================clean================="
xcodebuild -workspace "${APP_NAME}.xcworkspace" -scheme "${APP_NAME}" -configuration 'Release' clean
......
Release-iphoneos/AliyunOSSiOS/OSSClient.h
View file @ 82c2f09c
......@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
初始化OSSClient，使用默认的本地设置
@endpoint 指明Bucket所在的Region域名
@endpoint 指明Bucket所在的Region域名，2017年以后苹果要求APP符合ATS政策，这里要写https的endpoint，如 "https://oss-cn-hangzhou.aliyuncs.com"
@credentialProvider 需要实现的签名器
*/
- (instancetype)initWithEndpoint:(NSString *)endpoint
......@@ -75,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
初始化OSSClient，使用自定义设置
@endpoint 指明Bucket所在的Region域名
@endpoint 指明Bucket所在的Region域名，2017年以后苹果要求APP符合ATS政策，这里要写https的endpoint，如 "https://oss-cn-hangzhou.aliyuncs.com"
@credentialProvider 需要实现的签名器
@conf 可以设置一些本地参数如重试次数、超时时间等
*/
......
Release-iphoneos/AliyunOSSiOS/OSSDefine.h
View file @ 82c2f09c
......@@ -12,7 +12,7 @@
#define OSSDefine_h
#define OSSUAPrefix @"aliyun-sdk-ios"
#define OSSSDKVersion @"2.5.4"
#define OSSSDKVersion @"2.6.0"
#define OSSListBucketResultXMLTOKEN @"ListBucketResult"
#define OSSNameXMLTOKEN @"Name"
......
Release-iphoneos/AliyunOSSiOS/OSSIPv6Adapter.h
View file @ 82c2f09c
......@@ -13,7 +13,7 @@
* terms of an Apple operating system software license agreement.
*
* Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this file.
* https://www.opensource.apple.com/apsl/ and read it before using this file.
*
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
......
Release-iphoneos/AliyunOSSiOS/OSSModel.h
View file @ 82c2f09c
......@@ -136,6 +136,10 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
@interface OSSCustomSignerCredentialProvider : NSObject <OSSCredentialProvider>
@property (nonatomic, copy) NSString * (^signContent)(NSString *, NSError **);
/**
任务执行时，这个方法会被调用，进行加签
会在任务执行的后台线程被调用，而非UI线程
*/
- (instancetype)initWithImplementedSigner:(OSSCustomSignContentBlock)signContent;
@end
......@@ -146,6 +150,10 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
@property (nonatomic, strong) OSSFederationToken * cachedToken;
@property (nonatomic, copy) OSSFederationToken * (^federationTokenGetter)();
/**
任务执行时，这个方法会被调用，获取新的ststoken
会在任务执行的后台线程被调用，而非UI线程
*/
- (instancetype)initWithFederationTokenGetter:(OSSGetFederationTokenBlock)federationTokenGetter;
- (OSSFederationToken *)getToken:(NSError **)error;
@end
......@@ -595,11 +603,13 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
/**
回调下载进度
会在任务执行的后台线程被回调，而非UI线程
*/
@property (nonatomic, copy) OSSNetworkingDownloadProgressBlock downloadProgress;
/**
Object下载过程中，会在接收每一段数据后回调这个Block
会在任务执行的后台线程被回调，而非UI线程
*/
@property (nonatomic, copy) OSSNetworkingOnRecieveDataBlock onRecieveData;
@end
......@@ -720,7 +730,8 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
@property (nonatomic, strong) NSDictionary * objectMeta;
/**
上传进度回调
上传进度回调，
会在任务执行的后台线程被回调，而非UI线程
*/
@property (nonatomic, copy) OSSNetworkingUploadProgressBlock uploadProgress;
@end
......@@ -814,6 +825,7 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
/**
上传进度回调
会在任务执行的后台线程被回调，而非UI线程
*/
@property (nonatomic, copy) OSSNetworkingUploadProgressBlock uploadProgress;
@end
......@@ -1014,6 +1026,7 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
/**
上传进度回调
会在任务执行的后台线程被回调，而非UI线程
*/
@property (nonatomic, copy) OSSNetworkingUploadProgressBlock uploadPartProgress;
@end
......@@ -1235,6 +1248,7 @@ typedef OSSFederationToken * (^OSSGetFederationTokenBlock) ();
/**
上传进度
会在任务执行的后台线程被回调，而非UI线程
*/
@property (nonatomic, copy) OSSNetworkingUploadProgressBlock uploadProgress;
......
Release-iphoneos/AliyunOSSiOS/OSSService.h
View file @ 82c2f09c
......@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#define OSS_IOS_SDK_VERSION 2.5.4
#define OSS_IOS_SDK_VERSION OSSSDKVersion
#import "OSSDefine.h"
#import "OSSNetworking.h"
......
Tools/BaseViewController.h
View file @ 82c2f09c
......@@ -195,7 +195,12 @@
*/
- (NSString *)timeFormatted:(NSInteger)totalSeconds;
/**
url转码
@param ChineseString 带中文的字符串
*/
- (NSString *)returnUrlString:(NSString *)ChineseString;
@end
Tools/BaseViewController.m
View file @ 82c2f09c
......@@ -637,6 +637,13 @@
}
#pragma mark -汉字转码
- (NSString *)returnUrlString:(NSString *)ChineseString
{
NSString* encodedString = [ChineseString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
return encodedString;
}
- (void)dealloc
{
NSLog(@"释放%@控制器",self);
......
Tools/NetworkRequestClassManager.m
View file @ 82c2f09c
......@@ -48,7 +48,7 @@ static NetworkRequestClassManager *manager = nil;
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer = [AFJSONResponseSerializer serializer];
manager.requestSerializer = [AFJSONRequestSerializer serializer];
manager.requestSerializer.timeoutInterval = 10.0f;
manager.requestSerializer.timeoutInterval = 30.0f;
[manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
[manager.requestSerializer setValue:[[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleShortVersionString"] forHTTPHeaderField: @"version"];
......
Tools/PrefixHeader.pch
View file @ 82c2f09c
......@@ -172,13 +172,13 @@
/**
* 服务器开发地址
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
*///http://139.196.195.30:8090
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/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]
//**
// * 服务器正式地址
......
UploadToPGYER.sh
View file @ 82c2f09c
#蒲公英上的User Key
uKey="a6283ec42bbaf9efc5b6f01a750299f3"
uKey="02794c3c6f78cbfda696f807d4cb1da0"
#蒲公英上的API Key
apiKey="f9aefb343ecc7959f8e216ed08db1c83"
apiKey="1c1acff227f9dea3eafd531ba369680d"
#要上传的ipa文件路径
IPA_PATH=$(cat text.txt)
rm -rf text.txt
#执行上传至蒲公英的命令
echo "++++++++++++++upload+++++++++++++"
curl -F "file=@${IPA_PATH}" -F "uKey=${uKey}" -F "_api_key=${apiKey}" http://www.pgyer.com/apiv1/app/upload
rm -rf text.txt
text.txt
View file @ 82c2f09c
/Users/caoyunxiao/Desktop/App_IOS/archive/Lighting_V1.2.9_/Lighting.ipa
/Users/caoyunxiao/Desktop/App_IOS/archive/Lighting_V2.0.4_.ipa
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